kauth-sdk-node - npm Package Compare versions

Comparing version 2.0.11-alpha.0 to 2.0.12-alpha.0

dist/authenticator/authenticator.d.ts

@@ -11,3 +11,3 @@ import { KauthApi } from '../common/http/kauth';
     constructor(kauthApi: KauthApi);
-    authenticate(token: string, redirectUri: string): Promise<AuthenticationInformation>;
+    authenticate(token: string, redirectUri: string, preAuthorizationToken?: string): Promise<AuthenticationInformation>;
     bind(userId: number, token: string, redirectUri: string): Promise<void>;
@@ -19,3 +19,3 @@ authorizeURL(callback: string, state: string, prompt?: string): Promise<string>;
     constructor(kauthApi: KauthApi);
-    authenticate(token: string, redirectUri: string): Promise<AuthenticationInformation>;
+    authenticate(token: string, redirectUri: string, preAuthorizationToken?: string): Promise<AuthenticationInformation>;
     bind(userId: number, token: string, redirectUri: string): Promise<void>;
@@ -27,3 +27,3 @@ authorizeURL(callback: string, state: string, prompt?: string): Promise<string>;
     constructor(kauthApi: KauthApi);
-    authenticate(token: string, redirectUri: string): Promise<AuthenticationInformation>;
+    authenticate(token: string, redirectUri: string, preAuthorizationToken?: string): Promise<AuthenticationInformation>;
     bind(userId: number, token: string, redirectUri: string): Promise<void>;
@@ -30,0 +30,0 @@ authorizeURL(callback: string, state: string, prompt?: string): Promise<string>;

dist/authenticator/authenticator.js

@@ -11,6 +11,7 @@ "use strict";
     }
-    async authenticate(token, redirectUri) {
+    async authenticate(token, redirectUri, preAuthorizationToken) {
         const request = {
             code: token,
             redirect_uri: redirectUri,
+            pre_authorization_token: preAuthorizationToken,
         };
@@ -40,6 +41,7 @@ const result = await this.kauthApi.googleAuthenticate(request);
     }
-    async authenticate(token, redirectUri) {
+    async authenticate(token, redirectUri, preAuthorizationToken) {
         const request = {
             code: token,
             redirect_uri: redirectUri,
+            pre_authorization_token: preAuthorizationToken,
         };
@@ -69,6 +71,7 @@ const result = await this.kauthApi.moziAuthenticate(request);
     }
-    async authenticate(token, redirectUri) {
+    async authenticate(token, redirectUri, preAuthorizationToken) {
         const request = {
             code: token,
             redirect_uri: redirectUri,
+            pre_authorization_token: preAuthorizationToken,
         };
@@ -75,0 +78,0 @@ const result = await this.kauthApi.miniprogramAuthenticate(request);

dist/common/constant/http.d.ts

@@ -40,2 +40,7 @@ export declare const MoziAuthorizeUri = "/api/authenticator/mozi/authorizeUrl";
 export declare const BindRoleWithUsersUri = "/api/backend/bindRoleWithUsers";
+export declare const CreatePreAuthorizationUri = "/api/backend/createPreAuthorization";
+export declare const GetPreAuthorizationUri = "/api/backend/getPreAuthorization";
+export declare const RefreshPreAuthorizationUri = "/api/backend/refreshPreAuthorization";
+export declare const ProcessPreAuthorizationUri = "/api/backend/processPreAuthorization";
+export declare const CommitPreAuthorizationUri = "/api/backend/commitPreAuthorization";
 export declare const ProcessUri = "/api/kflow/process";
@@ -42,0 +47,0 @@ export declare const ServiceTaskUri = "/api/kflow/serviceTask";

dist/common/constant/http.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CompleteGraphServiceTaskUri = exports.GetGraphStateMachineSnapshotUri = exports.StartGraphProcessUri = exports.GetProcinstUserUri = exports.InstanceUri = exports.ServiceTaskUri = exports.ProcessUri = exports.BindRoleWithUsersUri = exports.BindRoleByPermissionsUri = exports.BindUsersByRoleNameAndExtendValueUri = exports.BindUserByRolesAndExtendValueUri = exports.BindUserByRoleNamesAndExtendValueUri = exports.BindUserByRolesUri = exports.CreatePermissionUri = exports.ListPermissionsByUserIdUri = exports.ListPermissionsUri = exports.UpdateRolesWithPermissionsUri = exports.CreateRolesByUsersAndPermissionsUri = exports.CreateRoleUri = exports.ListRolesByNamesAndExtendValueUri = exports.ListRolesByUserIdUri = exports.ListRolesByExtendValueUri = exports.ListRolesUri = exports.GetRoleWithUsersUri = exports.ListUsersByPermissionNameAndExtendValueUri = exports.ListUsersByPermissionIdUri = exports.ListUsersByRoleNameAndExtendValueUri = exports.ListUsersByRoleIdUri = exports.ListUsersWithUserAccountsAndRolesByRoleExtendValueUri = exports.ListUsersWithUserAccountsAndRolesUri = exports.ListUsersUri = exports.SearchUsersWithUserAccountsAndRolesUri = 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;
+exports.CompleteGraphServiceTaskUri = exports.GetGraphStateMachineSnapshotUri = exports.StartGraphProcessUri = exports.GetProcinstUserUri = exports.InstanceUri = exports.ServiceTaskUri = exports.ProcessUri = exports.CommitPreAuthorizationUri = exports.ProcessPreAuthorizationUri = exports.RefreshPreAuthorizationUri = exports.GetPreAuthorizationUri = exports.CreatePreAuthorizationUri = exports.BindRoleWithUsersUri = exports.BindRoleByPermissionsUri = exports.BindUsersByRoleNameAndExtendValueUri = exports.BindUserByRolesAndExtendValueUri = exports.BindUserByRoleNamesAndExtendValueUri = exports.BindUserByRolesUri = exports.CreatePermissionUri = exports.ListPermissionsByUserIdUri = exports.ListPermissionsUri = exports.UpdateRolesWithPermissionsUri = exports.CreateRolesByUsersAndPermissionsUri = exports.CreateRoleUri = exports.ListRolesByNamesAndExtendValueUri = exports.ListRolesByUserIdUri = exports.ListRolesByExtendValueUri = exports.ListRolesUri = exports.GetRoleWithUsersUri = exports.ListUsersByPermissionNameAndExtendValueUri = exports.ListUsersByPermissionIdUri = exports.ListUsersByRoleNameAndExtendValueUri = exports.ListUsersByRoleIdUri = exports.ListUsersWithUserAccountsAndRolesByRoleExtendValueUri = exports.ListUsersWithUserAccountsAndRolesUri = exports.ListUsersUri = exports.SearchUsersWithUserAccountsAndRolesUri = 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
@@ -44,2 +44,7 @@ exports.MoziAuthorizeUri = '/api/authenticator/mozi/authorizeUrl';
 exports.BindRoleWithUsersUri = '/api/backend/bindRoleWithUsers';
+exports.CreatePreAuthorizationUri = '/api/backend/createPreAuthorization';
+exports.GetPreAuthorizationUri = '/api/backend/getPreAuthorization';
+exports.RefreshPreAuthorizationUri = '/api/backend/refreshPreAuthorization';
+exports.ProcessPreAuthorizationUri = '/api/backend/processPreAuthorization';
+exports.CommitPreAuthorizationUri = '/api/backend/commitPreAuthorization';
 // kflow
@@ -46,0 +51,0 @@ exports.ProcessUri = '/api/kflow/process';

dist/common/http/kauth.d.ts

 import { KauthConfig } from '../config/config';
-import { KauthAuthenticateRequest, KauthCreatePermissionRequest, KauthCreateRoleRequest, KauthCreateRolesByPermissionsAndUsersRequest, KauthBindUsersByRoleNameAndExtendValueRequest, KauthBindRequest, KauthBindRoleByPermissionsRequest, KauthBindUserByRolesRequest, KauthBindUserByRolesAndExtendValueRequest, KauthUpdateRolesWithPermissionsRequest, KauthBindRoleWithUsersRequest, KauthBindUserByRoleNamesAndExtendValueRequest, KauthSearchUsersWithUserAccountsAndRoleRequest } from './request/kauth';
-import { KauthMoziAuthenticationInformation, KauthGoogleAuthenticationInformation, KauthPermission, KauthMiniprogramAuthenticationInformation, KauthRole, KauthUser, KauthPagable } from './response/kauth';
+import { KauthAuthenticateRequest, KauthCreatePermissionRequest, KauthCreateRoleRequest, KauthCreateRolesByPermissionsAndUsersRequest, KauthBindUsersByRoleNameAndExtendValueRequest, KauthBindRequest, KauthBindRoleByPermissionsRequest, KauthBindUserByRolesRequest, KauthBindUserByRolesAndExtendValueRequest, KauthUpdateRolesWithPermissionsRequest, KauthBindRoleWithUsersRequest, KauthBindUserByRoleNamesAndExtendValueRequest, KauthSearchUsersWithUserAccountsAndRoleRequest, KauthCreatePreAuthorizationRequest, GetPreAuthorizationRequest, RefreshPreAuthorizatioRequest, ProcessPreAuthorizatioRequest } from './request/kauth';
+import { KauthMoziAuthenticationInformation, KauthGoogleAuthenticationInformation, KauthPermission, KauthMiniprogramAuthenticationInformation, KauthRole, KauthUser, KauthPagable, PreAuthorizationAllowed } from './response/kauth';
 export declare class KauthApi {
@@ -54,2 +54,7 @@ private marmotUtil;
     bindRoleWithUsers(data: KauthBindRoleWithUsersRequest): Promise<void>;
+    createPreAuthorization(data: KauthCreatePreAuthorizationRequest): Promise<void>;
+    getPreAuthorization(data: GetPreAuthorizationRequest): Promise<any>;
+    refreshPreAuthorization(data: RefreshPreAuthorizatioRequest): Promise<any>;
+    processPreAuthorization(data: ProcessPreAuthorizatioRequest): Promise<PreAuthorizationAllowed>;
+    commitPreAuthorization(data: ProcessPreAuthorizatioRequest): Promise<PreAuthorizationAllowed>;
 }

dist/common/http/kauth.js

@@ -188,3 +188,18 @@ "use strict";
     }
+    async createPreAuthorization(data) {
+        return this.marmotUtil.post(http_1.CreatePreAuthorizationUri, data);
+    }
+    async getPreAuthorization(data) {
+        return this.marmotUtil.get(http_1.GetPreAuthorizationUri, data);
+    }
+    async refreshPreAuthorization(data) {
+        return this.marmotUtil.post(http_1.RefreshPreAuthorizationUri, data);
+    }
+    async processPreAuthorization(data) {
+        return this.marmotUtil.post(http_1.ProcessPreAuthorizationUri, data);
+    }
+    async commitPreAuthorization(data) {
+        return this.marmotUtil.post(http_1.CommitPreAuthorizationUri, data);
+    }
 }
 exports.KauthApi = KauthApi;

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

@@ -98,1 +98,29 @@ /// <reference types="node" />
 }
+export interface KauthCreatePreAuthorizationRequest extends MarmotOptions {
+    authorizerId: number;
+    roleType: string;
+    roleName: string;
+    roleExtendValue: string;
+    callback: string;
+    authorizeeTargets?: Array<{
+        type: 'mozi' | 'google' | 'miniprogram';
+        target: string;
+    }>;
+    expiredAt?: Date;
+    count?: number;
+    oldTimeUserAllowed?: boolean;
+}
+export interface RefreshPreAuthorizatioRequest extends MarmotOptions {
+    id: number;
+}
+export interface GetPreAuthorizationRequest extends MarmotOptions {
+    roleType: string;
+    roleName: string;
+    roleExtendValue?: string;
+}
+export interface ProcessPreAuthorizatioRequest extends MarmotOptions {
+    token: string;
+    userId: number;
+    type: 'mozi' | 'google' | 'miniprogram';
+    target: string;
+}

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

 import { PrimaryPrincipal } from '../../../authenticator/base';
 import { MarmotPagination } from '../tool/marmot';
+export declare enum UserAccountType {
+    Mozi = "mozi",
+    Google = "google",
+    Miniprogram = "miniprogram"
+}
+export declare enum PreAuthorizationIsAllowedErrorCode {
+    UserNotFound = "userNotFound",
+    UserNotInWhitelist = "userNotInWhitelist",
+    TokenExpired = "tokenExpired",
+    TokenNotExisted = "tokenNotExisted",
+    TokenUsedUp = "tokenUsedUp"
+}
 export declare enum KauthPrincipalStatus {
@@ -29,2 +41,25 @@ Normal = 0,
 }
+export declare type KauthPreAuthorized = ({
+    allowed: true;
+} & {
+    processed: boolean;
+    id: number;
+    userId: number;
+    type: UserAccountType;
+    target: string;
+    token: string;
+    roleType: 'kauth' | string;
+    roleName: string;
+    roleExtendValue: string;
+    resolvedAuthorizeeTargets: Array<{
+        type: UserAccountType;
+        target: string;
+        id: number;
+    }>;
+}) | ({
+    allowed: false;
+} & {
+    code: PreAuthorizationIsAllowedErrorCode;
+    reason: string;
+});
 export interface KauthMoziAuthenticationInformation {
@@ -34,2 +69,3 @@ primaryPrincipal: KauthPrimaryPrincipal;
     credential: KauthMoziCredential;
+    preAuthorized?: KauthPreAuthorized;
 }
@@ -94,1 +130,37 @@ export interface KauthGooglePrincipal {
 }
+export interface PreAuthorizationAllowed {
+    allowed: true;
+    processed: boolean;
+    id: number;
+    userId: number;
+    roleType: 'kauth' | string;
+    roleName: string;
+    roleExtendValue: string;
+    resolvedAuthorizeeTargets: Array<{
+        type: 'mozi' | 'google' | 'miniprogram';
+        id: number;
+        target: string;
+    }>;
+}
+export interface PreAuthorization {
+    id: number;
+    tenantId: string;
+    token: string;
+    authorizerId: number;
+    authorizeeTargets?: Array<{
+        type: 'mozi' | 'google' | 'miniprogram';
+        target: string;
+    }>;
+    resolvedAuthorizeeTargets: Array<{
+        type: 'mozi' | 'google' | 'miniprogram';
+        id: number;
+        target: string;
+    }>;
+    expiredAt?: Date;
+    count?: number;
+    oldTimeUserAllowed?: boolean;
+    roleType: 'kauth' | string;
+    roleName: string;
+    roleExtendValue?: string;
+    callback: string;
+}

dist/common/http/response/kauth.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KauthPrincipalStatus = void 0;
+exports.KauthPrincipalStatus = exports.PreAuthorizationIsAllowedErrorCode = exports.UserAccountType = void 0;
+var UserAccountType;
+(function (UserAccountType) {
+    UserAccountType["Mozi"] = "mozi";
+    UserAccountType["Google"] = "google";
+    UserAccountType["Miniprogram"] = "miniprogram";
+})(UserAccountType = exports.UserAccountType || (exports.UserAccountType = {}));
+var PreAuthorizationIsAllowedErrorCode;
+(function (PreAuthorizationIsAllowedErrorCode) {
+    PreAuthorizationIsAllowedErrorCode["UserNotFound"] = "userNotFound";
+    PreAuthorizationIsAllowedErrorCode["UserNotInWhitelist"] = "userNotInWhitelist";
+    PreAuthorizationIsAllowedErrorCode["TokenExpired"] = "tokenExpired";
+    PreAuthorizationIsAllowedErrorCode["TokenNotExisted"] = "tokenNotExisted";
+    PreAuthorizationIsAllowedErrorCode["TokenUsedUp"] = "tokenUsedUp";
+})(PreAuthorizationIsAllowedErrorCode = exports.PreAuthorizationIsAllowedErrorCode || (exports.PreAuthorizationIsAllowedErrorCode = {}));
 var KauthPrincipalStatus;
@@ -5,0 +19,0 @@ (function (KauthPrincipalStatus) {

dist/common/http/tool/marmot.js

@@ -117,3 +117,2 @@ "use strict";
         headers.authorization = `Marmot ${this.accessKeyId}:${signature}`;
-        console.log('request headers', headers);
         return headers;
@@ -138,4 +137,3 @@ }
     formatTraceConsumers(traceConsumers) {
-        return Object
-            .keys(traceConsumers)
+        return Object.keys(traceConsumers)
             .map((k) => {
@@ -142,0 +140,0 @@ const v = this.traceConsumers[k];

package.json

 {
   "name": "kauth-sdk-node",
-  "version": "2.0.11-alpha.0",
+  "version": "2.0.12-alpha.0",
   "description": "",
@@ -16,5 +16,4 @@ "main": "dist/index.js",
     "lint": "npm run type-check && eslint . --fix --ext .ts",
-    "test": "mocha --recursive --require ts-node/register 'test/**/*.ts'",
-    "coverage": "nyc -t coverage npm run test",
-    "ci": "npm run lint && npm run coverage",
+    "test": "multi='spec=- mocha-junit-reporter=-' mocha  --reporter=mocha-multi --recursive --require ts-node/register 'test/**/*.ts'",
+    "ci": "nyc -t coverage --reporter=cobertura npm run test",
     "version": "conventional-changelog -p angular -i CHANGELOG.md -s && git add .",
@@ -46,2 +45,4 @@ "prepublishOnly": "rm -rf dist && npm run build"
     "mocha": "^8.0.1",
+    "mocha-junit-reporter": "^2.0.2",
+    "mocha-multi": "^1.1.6",
     "nyc": "^15.1.0",
@@ -48,0 +49,0 @@ "prettier": "^2.2.1",

No alert changes

Improved metrics

Total package byte prevSize

83136

increased by7.96%

Lines of code

1805

increased by8.87%

Worsened metrics

Dev dependency count

20

increased by11.11%

No dependency changes