kauth-sdk-node - npm Package Compare versions

Comparing version 0.1.0 to 0.1.1

CHANGELOG.md

@@ -0,1 +1,11 @@
+## [0.1.1](https://gitlab-ag.marmot-cloud.com/marmot/kauth-sdk-node/compare/v0.1.0...v0.1.1) (2020-09-27)
+
+
+### Features
+
+* rbac and connect ([0f75aac](https://gitlab-ag.marmot-cloud.com/marmot/kauth-sdk-node/commit/0f75aaca8b5f2418d677e6e2583f105b42b970b2))
+* reviewer robot ([c379ef4](https://gitlab-ag.marmot-cloud.com/marmot/kauth-sdk-node/commit/c379ef44b8fa2c21e3739d9eca88339ae4a4254b))
+
+
+
 # [0.1.0](https://gitlab-ag.marmot-cloud.com/marmot/kauth-sdk-node/compare/v0.0.16...v0.1.0) (2020-09-07)
@@ -2,0 +12,0 @@

dist/authenticator/authenticator.d.ts

@@ -0,6 +1,7 @@
+import { KauthApi } from '../common/http/kauth';
 import { AuthenticationInformation } from './base';
-import { KauthApi } from '../common/http/kauth';
 interface Authenticator {
+    authorizeURL(callback: string, state: string): Promise<string>;
     authenticate(token: string, redirectUri: string): Promise<AuthenticationInformation>;
-    authorizeURL(callback: string): Promise<string>;
+    bind(userId: number, token: string, redirectUri: string): Promise<void>;
 }
@@ -11,3 +12,4 @@ export declare class GoogleAuthenticator implements Authenticator {
     authenticate(token: string, redirectUri: string): Promise<AuthenticationInformation>;
-    authorizeURL(callback: string): Promise<string>;
+    bind(userId: number, token: string, redirectUri: string): Promise<void>;
+    authorizeURL(callback: string, state: string): Promise<string>;
 }
@@ -18,3 +20,4 @@ export declare class MoziAuthenticator implements Authenticator {
     authenticate(token: string, redirectUri: string): Promise<AuthenticationInformation>;
-    authorizeURL(callback: string): Promise<string>;
+    bind(userId: number, token: string, redirectUri: string): Promise<void>;
+    authorizeURL(callback: string, state: string): Promise<string>;
 }
@@ -25,4 +28,5 @@ export declare class MiniprogramAuthenticator implements Authenticator {
     authenticate(token: string, redirectUri: string): Promise<AuthenticationInformation>;
-    authorizeURL(callback: string): Promise<string>;
+    bind(userId: number, token: string, redirectUri: string): Promise<void>;
+    authorizeURL(callback: string, state: string): Promise<string>;
 }
 export {};

dist/authenticator/authenticator.js

@@ -23,5 +23,12 @@ "use strict";
     }
-    authorizeURL(callback) {
-        return this.kauthApi.googleAuthorizeURL(callback);
+    async bind(userId, token, redirectUri) {
+        return this.kauthApi.googleBind({
+            user_id: userId,
+            code: token,
+            redirect_uri: redirectUri,
+        });
     }
+    authorizeURL(callback, state) {
+        return this.kauthApi.googleAuthorizeURL(callback, state);
+    }
 }
@@ -45,5 +52,12 @@ exports.GoogleAuthenticator = GoogleAuthenticator;
     }
-    authorizeURL(callback) {
-        return this.kauthApi.moziAuthorizeURL(callback);
+    async bind(userId, token, redirectUri) {
+        return this.kauthApi.moziBind({
+            user_id: userId,
+            code: token,
+            redirect_uri: redirectUri,
+        });
     }
+    authorizeURL(callback, state) {
+        return this.kauthApi.moziAuthorizeURL(callback, state);
+    }
 }
@@ -67,6 +81,13 @@ exports.MoziAuthenticator = MoziAuthenticator;
     }
-    authorizeURL(callback) {
-        return this.kauthApi.miniprogramAuthorizeURL(callback);
+    async bind(userId, token, redirectUri) {
+        return this.kauthApi.miniprogramBind({
+            user_id: userId,
+            code: token,
+            redirect_uri: redirectUri,
+        });
     }
+    authorizeURL(callback, state) {
+        return this.kauthApi.miniprogramAuthorizeURL(callback, state);
+    }
 }
 exports.MiniprogramAuthenticator = MiniprogramAuthenticator;

dist/authenticator/provider.js

@@ -17,6 +17,7 @@ "use strict";
     }
-    verify(token) {
+    async verify(token) {
         try {
             const claims = jsonwebtoken_1.default.verify(token, this.secret);
-            return this.authenticationInfoManager.transform(claims);
+            const authenticationInformation = await this.authenticationInfoManager.transform(claims);
+            return authenticationInformation;
         }
@@ -23,0 +24,0 @@ catch (error) {

dist/common/config/config.d.ts

@@ -7,7 +7,12 @@ export interface KauthConfig {
     googleTokenUri: string;
+    googleBindUri: string;
     moziAuthorizeUri: string;
     moziTokenUri: string;
+    moziBindUri: string;
     miniprogramAuthorizeUri: string;
     miniprogramTokenUri: string;
+    miniprogramBindUri: string;
     loginRedirectUri: string;
+    unautorizedRedirectUri?: string;
+    marmotTenantId?: number;
     marmotAccessKeyId?: string;
@@ -14,0 +19,0 @@ marmotAccessKeySecret?: string;

dist/common/constant/http.d.ts

 export declare const MoziAuthorizeUri = "/api/authenticator/mozi/authorizeUrl";
 export declare const MoziAuthenticateUri = "/api/authenticator/mozi/authenticate";
+export declare const MoziBindUri = "/api/authenticator/mozi/bind/";
 export declare const MoziAuthenticationInformationUri = "/api/authenticator/mozi/authenticationInformation";
 export declare const GoogleAuthorizeUri = "/api/authenticator/google/authorizeUrl";
 export declare const GoogleAuthenticateUri = "/api/authenticator/google/authenticate";
+export declare const GoogleBindUri = "/api/authenticator/google/bind/";
 export declare const GoogleAuthenticationInformationUri = "/api/authenticator/google/authenticationInformation";
 export declare const MiniprogramAuthorizeUri = "/api/authenticator/miniprogram/authorizeUrl";
 export declare const MiniprogramAuthenticateUri = "/api/authenticator/miniprogram/authenticate";
+export declare const MiniprogramBindUri = "/api/authenticator/miniprogram/bind/";
 export declare const MiniprogramAuthenticationInformationUri = "/api/authenticator/miniprogram/authenticationInformation";
+export declare const UnbindUri = "/api/authenticator/unbind/";
+export declare const GetUserByIdUri = "/api/backend/getUserById";
+export declare const ListUsersUri = "/api/backend/listUsers";
+export declare const ListUsersByRoleIdUri = "/api/backend/listUsersByRoleId";
+export declare const ListUsersByPermissionIdUri = "/api/backend/listUsersByPermissionId";
+export declare const ListPermissionsUri = "/api/backend/listPermissions";
 export declare const ListPermissionsByUserIdUri = "/api/backend/listPermissionsByUserId";
+export declare const CreatePermissionUri = "/api/backend/createPermission";
+export declare const CreatePermissionByRoleUserUri = "/api/backend/createPermissionByRoleAndUsers";
+export declare const ListRolesUri = "/api/backend/listRoles";
+export declare const ListRolesByUserIdUri = "/api/backend/listRolesByUserId";
+export declare const CreateRoleUri = "/api/backend/createRole";
+export declare const BindUserByRoleUri = "/api/backend/bindUserByRole";
+export declare const BindRoleByPermissionUri = "/api/backend/bindRoleByPermission";
 export declare const ProcessUri = "/api/kflow/process";
 export declare const ServiceTaskUri = "/api/kflow/serviceTask";
 export declare const InstanceUri = "/api/kflow/stateMachine/instance/";

dist/common/constant/http.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InstanceUri = exports.ServiceTaskUri = exports.ProcessUri = exports.ListPermissionsByUserIdUri = exports.MiniprogramAuthenticationInformationUri = exports.MiniprogramAuthenticateUri = exports.MiniprogramAuthorizeUri = exports.GoogleAuthenticationInformationUri = exports.GoogleAuthenticateUri = exports.GoogleAuthorizeUri = exports.MoziAuthenticationInformationUri = exports.MoziAuthenticateUri = exports.MoziAuthorizeUri = void 0;
+exports.InstanceUri = exports.ServiceTaskUri = exports.ProcessUri = exports.BindRoleByPermissionUri = exports.BindUserByRoleUri = exports.CreateRoleUri = exports.ListRolesByUserIdUri = exports.ListRolesUri = exports.CreatePermissionByRoleUserUri = exports.CreatePermissionUri = exports.ListPermissionsByUserIdUri = exports.ListPermissionsUri = exports.ListUsersByPermissionIdUri = exports.ListUsersByRoleIdUri = exports.ListUsersUri = exports.GetUserByIdUri = exports.UnbindUri = exports.MiniprogramAuthenticationInformationUri = exports.MiniprogramBindUri = exports.MiniprogramAuthenticateUri = exports.MiniprogramAuthorizeUri = exports.GoogleAuthenticationInformationUri = exports.GoogleBindUri = exports.GoogleAuthenticateUri = exports.GoogleAuthorizeUri = exports.MoziAuthenticationInformationUri = exports.MoziBindUri = exports.MoziAuthenticateUri = exports.MoziAuthorizeUri = void 0;
 // kauth
 exports.MoziAuthorizeUri = '/api/authenticator/mozi/authorizeUrl';
 exports.MoziAuthenticateUri = '/api/authenticator/mozi/authenticate';
+exports.MoziBindUri = '/api/authenticator/mozi/bind/';
 exports.MoziAuthenticationInformationUri = '/api/authenticator/mozi/authenticationInformation';
 exports.GoogleAuthorizeUri = '/api/authenticator/google/authorizeUrl';
 exports.GoogleAuthenticateUri = '/api/authenticator/google/authenticate';
+exports.GoogleBindUri = '/api/authenticator/google/bind/';
 exports.GoogleAuthenticationInformationUri = '/api/authenticator/google/authenticationInformation';
 exports.MiniprogramAuthorizeUri = '/api/authenticator/miniprogram/authorizeUrl';
 exports.MiniprogramAuthenticateUri = '/api/authenticator/miniprogram/authenticate';
+exports.MiniprogramBindUri = '/api/authenticator/miniprogram/bind/';
 exports.MiniprogramAuthenticationInformationUri = '/api/authenticator/miniprogram/authenticationInformation';
+exports.UnbindUri = '/api/authenticator/unbind/';
+exports.GetUserByIdUri = '/api/backend/getUserById';
+exports.ListUsersUri = '/api/backend/listUsers';
+exports.ListUsersByRoleIdUri = '/api/backend/listUsersByRoleId';
+exports.ListUsersByPermissionIdUri = '/api/backend/listUsersByPermissionId';
+exports.ListPermissionsUri = '/api/backend/listPermissions';
 exports.ListPermissionsByUserIdUri = '/api/backend/listPermissionsByUserId';
+exports.CreatePermissionUri = '/api/backend/createPermission';
+exports.CreatePermissionByRoleUserUri = '/api/backend/createPermissionByRoleAndUsers';
+exports.ListRolesUri = '/api/backend/listRoles';
+exports.ListRolesByUserIdUri = '/api/backend/listRolesByUserId';
+exports.CreateRoleUri = '/api/backend/createRole';
+exports.BindUserByRoleUri = '/api/backend/bindUserByRole';
+exports.BindRoleByPermissionUri = '/api/backend/bindRoleByPermission';
 // kflow
@@ -16,0 +32,0 @@ exports.ProcessUri = '/api/kflow/process';

dist/common/http/kauth.d.ts

@@ -1,24 +0,33 @@
-/// <reference types="node" />
-import { ParsedUrlQueryInput } from 'querystring';
 import { KauthConfig } from '../config/config';
-import { KauthMoziAuthenticationInformation, KauthGoogleAuthenticationInformation, KauthPermission, KauthMiniprogramAuthenticationInformation } from './response/kauth';
-import { MarmotOptions } from './tool/marmot';
-interface AuthenticateParams extends ParsedUrlQueryInput, MarmotOptions {
-    code: string;
-    redirect_uri: string;
-}
+import { KauthAuthenticateRequest, KauthCreatePermissionRequest, KauthCreateRoleRequest, KauthBindUserByRoleRequest, KauthBindRoleByPermissionRequest, KauthCreatePermissionByRoleAndUsersRequest, KauthBindRequest } from './request/kauth';
+import { KauthMoziAuthenticationInformation, KauthGoogleAuthenticationInformation, KauthPermission, KauthMiniprogramAuthenticationInformation, KauthRole, KauthUser } from './response/kauth';
 export declare class KauthApi {
     private marmotUtil;
-    constructor({ kauthOrigin, marmotAccessKeyId, marmotAccessKeySecret, kauthServiceName, kauthServicePort }: KauthConfig);
-    moziAuthorizeURL(callback: string): Promise<string>;
-    moziAuthenticate(data: AuthenticateParams): Promise<KauthMoziAuthenticationInformation>;
+    constructor({ kauthOrigin, marmotTenantId, marmotAccessKeyId, marmotAccessKeySecret, kauthServiceName, kauthServicePort }: KauthConfig);
+    moziAuthorizeURL(callback: string, state: string): Promise<string>;
+    moziAuthenticate(data: KauthAuthenticateRequest): Promise<KauthMoziAuthenticationInformation>;
+    moziBind(data: KauthBindRequest): Promise<void>;
     getMoziAuthenticationInformation(id: number): Promise<KauthMoziAuthenticationInformation>;
-    googleAuthorizeURL(callback: string): Promise<string>;
-    googleAuthenticate(data: AuthenticateParams): Promise<KauthGoogleAuthenticationInformation>;
+    googleAuthorizeURL(callback: string, state: string): Promise<string>;
+    googleAuthenticate(data: KauthAuthenticateRequest): Promise<KauthGoogleAuthenticationInformation>;
+    googleBind(data: KauthBindRequest): Promise<void>;
     getGoogleAuthenticationInformation(id: number): Promise<KauthGoogleAuthenticationInformation>;
-    miniprogramAuthorizeURL(callback: string): Promise<string>;
-    miniprogramAuthenticate(data: AuthenticateParams): Promise<KauthMiniprogramAuthenticationInformation>;
+    miniprogramAuthorizeURL(callback: string, state: string): Promise<string>;
+    miniprogramAuthenticate(data: KauthAuthenticateRequest): Promise<KauthMiniprogramAuthenticationInformation>;
+    miniprogramBind(data: KauthBindRequest): Promise<void>;
     getMiniprogramAuthenticationInformation(id: number): Promise<KauthMiniprogramAuthenticationInformation>;
+    getUserById(id: number): Promise<KauthUser>;
+    listUsers(): Promise<KauthUser[]>;
+    listUsersByRoleId(roleId: number): Promise<KauthUser[]>;
+    listUsersByPermissionId(permissionId: number): Promise<KauthUser[]>;
+    listPermissions(): Promise<KauthPermission[]>;
     listPermissionsByUserId(id: number): Promise<KauthPermission[]>;
+    createPermission(data: KauthCreatePermissionRequest): Promise<unknown>;
+    createPermissionByRoleAndUsers(data: KauthCreatePermissionByRoleAndUsersRequest): Promise<unknown>;
+    listRoles(): Promise<KauthRole[]>;
+    listRolesByUserId(id: number): Promise<KauthRole[]>;
+    createRole(data: KauthCreateRoleRequest): Promise<unknown>;
+    bindUserByRole(data: KauthBindUserByRoleRequest): Promise<void>;
+    bindRoleByPermission(data: KauthBindRoleByPermissionRequest): Promise<void>;
+    unbind(userAccountId: number): Promise<void>;
 }
-export {};

dist/common/http/kauth.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KauthApi = void 0;
+const marmot_1 = require("./tool/marmot");
 const http_1 = require("../constant/http");
-const marmot_1 = require("./tool/marmot");
 class KauthApi {
-    constructor({ kauthOrigin, marmotAccessKeyId, marmotAccessKeySecret, kauthServiceName, kauthServicePort }) {
-        this.marmotUtil = new marmot_1.MarmotUtil(kauthOrigin, marmotAccessKeyId, marmotAccessKeySecret, kauthServiceName, kauthServicePort);
+    constructor({ kauthOrigin, marmotTenantId, marmotAccessKeyId, marmotAccessKeySecret, kauthServiceName, kauthServicePort }) {
+        this.marmotUtil = new marmot_1.MarmotUtil(kauthOrigin, marmotTenantId, marmotAccessKeyId, marmotAccessKeySecret, kauthServiceName, kauthServicePort);
     }
-    async moziAuthorizeURL(callback) {
-        return this.marmotUtil.get(http_1.MoziAuthorizeUri, { callback });
+    async moziAuthorizeURL(callback, state) {
+        return this.marmotUtil.get(http_1.MoziAuthorizeUri, { callback, state });
     }
@@ -16,7 +16,10 @@ async moziAuthenticate(data) {
     }
+    async moziBind(data) {
+        return this.marmotUtil.post(http_1.MoziBindUri + data.user_id, data);
+    }
     async getMoziAuthenticationInformation(id) {
         return this.marmotUtil.get(http_1.MoziAuthenticationInformationUri, { id });
     }
-    async googleAuthorizeURL(callback) {
-        return this.marmotUtil.get(http_1.GoogleAuthorizeUri, { callback });
+    async googleAuthorizeURL(callback, state) {
+        return this.marmotUtil.get(http_1.GoogleAuthorizeUri, { callback, state });
     }
@@ -26,7 +29,10 @@ async googleAuthenticate(data) {
     }
+    async googleBind(data) {
+        return this.marmotUtil.post(http_1.GoogleBindUri + data.user_id, data);
+    }
     async getGoogleAuthenticationInformation(id) {
         return this.marmotUtil.get(http_1.GoogleAuthenticationInformationUri, { id });
     }
-    async miniprogramAuthorizeURL(callback) {
-        return this.marmotUtil.get(http_1.MiniprogramAuthorizeUri, { callback });
+    async miniprogramAuthorizeURL(callback, state) {
+        return this.marmotUtil.get(http_1.MiniprogramAuthorizeUri, { callback, state });
     }
@@ -36,9 +42,51 @@ async miniprogramAuthenticate(data) {
     }
+    async miniprogramBind(data) {
+        return this.marmotUtil.post(http_1.MiniprogramBindUri + data.user_id, data);
+    }
     async getMiniprogramAuthenticationInformation(id) {
         return this.marmotUtil.get(http_1.MiniprogramAuthenticationInformationUri, { id });
     }
+    async getUserById(id) {
+        return this.marmotUtil.get(http_1.GetUserByIdUri, { id });
+    }
+    async listUsers() {
+        return this.marmotUtil.get(http_1.ListUsersUri);
+    }
+    async listUsersByRoleId(roleId) {
+        return this.marmotUtil.get(http_1.ListUsersByRoleIdUri, { roleId });
+    }
+    async listUsersByPermissionId(permissionId) {
+        return this.marmotUtil.get(http_1.ListUsersByPermissionIdUri, { permissionId });
+    }
+    async listPermissions() {
+        return this.marmotUtil.get(http_1.ListPermissionsUri);
+    }
     async listPermissionsByUserId(id) {
         return this.marmotUtil.get(http_1.ListPermissionsByUserIdUri, { id });
     }
+    async createPermission(data) {
+        return this.marmotUtil.post(http_1.CreatePermissionUri, data);
+    }
+    async createPermissionByRoleAndUsers(data) {
+        return this.marmotUtil.post(http_1.CreatePermissionByRoleUserUri, data);
+    }
+    async listRoles() {
+        return this.marmotUtil.get(http_1.ListRolesUri);
+    }
+    async listRolesByUserId(id) {
+        return this.marmotUtil.get(http_1.ListRolesByUserIdUri, { id });
+    }
+    async createRole(data) {
+        return this.marmotUtil.post(http_1.CreateRoleUri, data);
+    }
+    async bindUserByRole(data) {
+        return this.marmotUtil.post(http_1.BindUserByRoleUri, data);
+    }
+    async bindRoleByPermission(data) {
+        return this.marmotUtil.post(http_1.BindRoleByPermissionUri, data);
+    }
+    async unbind(userAccountId) {
+        return this.marmotUtil.post(http_1.UnbindUri + userAccountId);
+    }
 }
 exports.KauthApi = KauthApi;

dist/common/http/kflow.d.ts

@@ -6,3 +6,3 @@ import { KauthConfig } from "../config/config";
     private marmotUtil;
-    constructor({ kflowOrigin, marmotAccessKeyId, marmotAccessKeySecret, kflowServiceName, kflowServicePort }: KauthConfig);
+    constructor({ kflowOrigin, marmotTenantId, marmotAccessKeyId, marmotAccessKeySecret, kflowServiceName, kflowServicePort }: KauthConfig);
     startProcessInstanceByKey(body: KflowCreateProcessRequest): Promise<string>;
@@ -9,0 +9,0 @@ completeTaskService(userId: string, body: KflowCompleteTaskServiceRequest): Promise<void>;

dist/common/http/kflow.js

@@ -7,4 +7,4 @@ "use strict";
 class KflowApi {
-    constructor({ kflowOrigin, marmotAccessKeyId, marmotAccessKeySecret, kflowServiceName, kflowServicePort }) {
-        this.marmotUtil = new marmot_1.MarmotUtil(kflowOrigin, marmotAccessKeyId, marmotAccessKeySecret, kflowServiceName, kflowServicePort);
+    constructor({ kflowOrigin, marmotTenantId, marmotAccessKeyId, marmotAccessKeySecret, kflowServiceName, kflowServicePort }) {
+        this.marmotUtil = new marmot_1.MarmotUtil(kflowOrigin, marmotTenantId, marmotAccessKeyId, marmotAccessKeySecret, kflowServiceName, kflowServicePort);
     }
@@ -11,0 +11,0 @@ async startProcessInstanceByKey(body) {

dist/common/http/response/kauth.d.ts

@@ -69,3 +69,2 @@ import { PrimaryPrincipal } from "../../../authenticator/base";
     id: number;
-    tenantId: number;
     name: string;
@@ -76,1 +75,12 @@ type: number;
 }
+export interface KauthRole {
+    id: number;
+    name: string;
+}
+export interface KauthUser {
+    id: number;
+    name: string;
+    avatar: string;
+    email: string;
+    status: number;
+}

dist/common/http/tool/marmot.d.ts

@@ -21,2 +21,3 @@ /// <reference types="node" />
     private origin;
+    private tenantId?;
     private accessKeyId?;
@@ -27,3 +28,3 @@ private accessKeySecret?;
     private proxyMatched;
-    constructor(origin: string, accessKeyId?: string, accessKeySecret?: string, serviceName?: string, servicePort?: string);
+    constructor(origin: string, tenantId?: number, accessKeyId?: string, accessKeySecret?: string, serviceName?: string, servicePort?: string);
     get<RequestType extends ParsedUrlQueryInput | MarmotOptions, ResponseType>(path: string, params?: RequestType): Promise<ResponseType>;
@@ -38,4 +39,6 @@ post<RequestType extends MarmotOptions, ResponseType>(path: string, params?: RequestType): Promise<ResponseType>;
         authorization: string;
+        'x-gw-tenant-id'?: undefined;
     } | {
         'x-kauth-user-id': number;
+        'x-gw-tenant-id': number;
         'x-service-name'?: undefined;
@@ -42,0 +45,0 @@ 'x-service-port'?: undefined;

dist/common/http/tool/marmot.js

@@ -21,4 +21,5 @@ "use strict";
 class MarmotUtil {
-    constructor(origin, accessKeyId, accessKeySecret, serviceName, servicePort) {
+    constructor(origin, tenantId, accessKeyId, accessKeySecret, serviceName, servicePort) {
         this.origin = origin.replace(/\/+$/, '');
+        this.tenantId = tenantId;
         this.accessKeyId = accessKeyId;
@@ -76,2 +77,3 @@ this.accessKeySecret = accessKeySecret;
             'x-kauth-user-id': userId,
+            'x-gw-tenant-id': this.tenantId || 0,
         };
@@ -78,0 +80,0 @@ }

package.json

 {
   "name": "kauth-sdk-node",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

No alert changes

Improved metrics

Total package byte prevSize

57185

increased by18.24%

Number of package files

39

increased by5.41%

Lines of code

1110

increased by19.35%

No dependency changes