@blocklet/sdk 1.8.42 → 1.8.43

package/lib/service/auth.d.ts

@@ -1,9 +1,31 @@
 import Client from '@abtnode/client';
-declare type $TSFixMe = any;
-declare class AuthService extends Client {
-    _blockletDid: string;
-    setAuthAccessKey: $TSFixMe;
-    constructor(httpEndpoint: string);
-    _getAuthHeaders(): any;
+declare type PartialDeep<T> = {
+    [K in keyof T]?: T[K] extends object ? PartialDeep<T[K]> : T[K];
+};
+declare type OmitTeamDid<T> = PartialDeep<Omit<T, 'teamDid'>>;
+declare class AuthService {
+    constructor(httpEndpoint?: string);
+}
+interface AuthService {
+    getUser(did: string): Promise<Client.ResponseUser>;
+    getUsers(args?: OmitTeamDid<Client.RequestUsersInput>): Promise<Client.ResponseUsers>;
+    getOwner(): Promise<Client.ResponseUser>;
+    updateUserApproval(did: string, approved: boolean): Promise<Client.ResponseUser>;
+    issuePassportToUser(args: OmitTeamDid<Client.RequestIssuePassportToUserInput>): Promise<Client.ResponseUser>;
+    enableUserPassport(args: OmitTeamDid<Client.RequestRevokeUserPassportInput>): Promise<Client.ResponseUser>;
+    revokeUserPassport(args: OmitTeamDid<Client.RequestRevokeUserPassportInput>): Promise<Client.ResponseUser>;
+    getPermissionsByRole(role: string): Promise<Client.ResponsePermissions>;
+    getRoles(): Promise<Client.ResponseRoles>;
+    createRole(args: OmitTeamDid<Client.RequestCreateRoleInput>): Promise<Client.ResponseRole>;
+    updateRole(name: string, updates: Pick<Client.RoleInput, 'title' | 'description'>): Promise<Client.ResponseRole>;
+    deleteRole(name: string): Promise<Client.GeneralResponse>;
+    grantPermissionForRole(role: string, permission: string): Promise<Client.GeneralResponse>;
+    revokePermissionFromRole(role: string, permission: string): Promise<Client.GeneralResponse>;
+    updatePermissionsForRole(role: string, permissions: string): Promise<Client.ResponseRole>;
+    hasPermission(role: string, permission: string): Promise<ABTNodeClient.BooleanResponse>;
+    getPermissions(): Promise<Client.ResponsePermissions>;
+    createPermission(args: OmitTeamDid<Client.RequestCreatePermissionInput>): Promise<Client.ResponsePermission>;
+    updatePermission(args: OmitTeamDid<Client.PermissionInput>): Promise<Client.ResponsePermission>;
+    deletePermission(name: string): Promise<Client.GeneralResponse>;
 }
 export = AuthService;

package/lib/service/auth.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+/* eslint-disable max-classes-per-file */
 /* eslint-disable @typescript-eslint/indent */
 const pickBy_1 = __importDefault(require("lodash/pickBy"));
 const url_join_1 = __importDefault(require("url-join"));
@@ -22,10 +23,6 @@ const check_blocklet_env_1 = __importDefault(require("../util/check-blocklet-env
 const version_1 = require("../version");
 const { NODE_SERVICES, WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_URL_PREFIX, USER_AVATAR_PATH_PREFIX } = constant_1.default;
 const VERSION = version_1.version; // version of notification sdk
-// Auth 相关的功能 API 都在这里
-// core/state/lib/api/team.js L42
-// 所有可配置调用的函数在这里，如果需要额外增加，则需要在这里新增对应的函数
-// core/gql/lib/config.js L25
 const isNotNullOrUndefined = (x) => ![null, undefined].includes(x);
 const type = process.env.BLOCKLET_WALLET_TYPE !== 'eth'
     ? (0, wallet_1.WalletType)({ role: mcrypto_1.types.RoleType.ROLE_APPLICATION, pk: mcrypto_1.types.KeyType.ED25519, hash: mcrypto_1.types.HashType.SHA3 })
@@ -37,26 +34,39 @@ const fixAvatar = (user) => {
     }
     return user;
 };
-// FIXME: types from @abtnode/types
-class AuthService extends client_1.default {
+class AuthClient extends client_1.default {
     constructor(httpEndpoint) {
         (0, check_blocklet_env_1.default)();
-        // @ts-expect-error TS(2554) FIXME: Expected 1 arguments, but got 2.
         super(httpEndpoint || `http://127.0.0.1:${process.env.ABT_NODE_PORT}/api/gql`.trim(), `BlockletSDK/${VERSION}`);
         this.setAuthAccessKey({
             accessKeyId: process.env.BLOCKLET_APP_ID,
             accessKeySecret: process.env.BLOCKLET_APP_SK,
             type,
         });
-        this._blockletDid = process.env.BLOCKLET_DID;
+    }
+    _getAuthHeaders() {
+        const headers = super._getAuthHeaders();
+        headers['x-access-blocklet'] = process.env.BLOCKLET_DID;
+        // x-access-service is not used since 1.8.35
+        headers['x-access-service'] = NODE_SERVICES.AUTH_SERVICE;
+        return headers;
+    }
+}
+// Auth 相关的功能 API 都在这里
+// core/state/lib/api/team.js L42
+// 所有可配置调用的函数在这里，如果需要额外增加，则需要在这里新增对应的函数
+// core/gql/lib/config.js L25
+class AuthService {
+    constructor(httpEndpoint) {
+        const client = new AuthClient(httpEndpoint);
         const apiList = [
             // user
             'getUsers',
             'getUser',
             'getOwner',
             // 'removeUser',
-            'updateUserRole',
-            // 'updateUserApproval',
+            // 'updateUserRole',
+            'updateUserApproval',
             // invitation
             // 'getInvitations',
             // 'createMemberInvitation',
@@ -86,9 +96,9 @@ class AuthService extends client_1.default {
             // disabled in current
             // 'configTrustedPassports',
         ];
-        const teamDid = this._blockletDid;
+        const teamDid = process.env.BLOCKLET_DID;
         const apiFallback = (fn) => (params = {}, ...args) => fn(Object.assign({ input: Object.assign(Object.assign({}, params), { teamDid }) }, args));
-        const apiConvertDid = (fn) => (did) => fn({ input: { user: { did }, teamDid } });
+        // const apiConvertDid = (fn: Function) => (did: string) => fn({ input: { user: { did }, teamDid } });
         const apiFnMap = {
             getUser: (fn) => (did) => __awaiter(this, void 0, void 0, function* () {
                 const res = yield fn({ input: { user: { did }, teamDid } });
@@ -100,8 +110,8 @@ class AuthService extends client_1.default {
                 (res.users || []).forEach(fixAvatar);
                 return res;
             }),
-            removeUser: apiConvertDid,
-            updateUserRole: (fn) => (did, role) => fn({ input: { user: { did, role }, teamDid } }),
+            // removeUser: apiConvertDid,
+            // updateUserRole: (fn: Function) => (did: string, role: string) => fn({ input: { user: { did, role }, teamDid } }),
             updateUserApproval: (fn) => (did, approved) => fn({ input: { user: { did, approved }, teamDid } }),
             getPermissionsByRole: (fn) => (name) => fn({ input: { role: { name }, teamDid } }),
             createRole: (fn) => ({ name, title, description }) => fn({ input: Object.assign(Object.assign({}, (0, pickBy_1.default)({ name, title, description }, isNotNullOrUndefined)), { teamDid }) }),
@@ -116,13 +126,12 @@ class AuthService extends client_1.default {
             hasPermission: (fn) => (role, permission) => fn({ input: { teamDid, role, permission } }),
         };
         apiList.forEach((api) => {
-            const fn = this[api];
+            const fn = client[api];
             this[api] = apiFnMap[api] ? apiFnMap[api](fn) : apiFallback(fn);
         });
         // eslint-disable-next-line no-constructor-return
         return new Proxy(this, {
             get(target, propKey) {
-                // @ts-expect-error TS(2345) FIXME: Argument of type 'string | symbol' is not assignab... Remove this comment to see the full error message
                 if (!apiList.includes(propKey)) {
                     return undefined;
                 }
@@ -130,13 +139,5 @@ class AuthService extends client_1.default {
             },
         });
     }
-    _getAuthHeaders() {
-        // @ts-expect-error TS(2339) FIXME: Property '_getAuthHeaders' does not exist on type ... Remove this comment to see the full error message
-        const headers = super._getAuthHeaders();
-        headers['x-access-blocklet'] = this._blockletDid;
-        // x-access-service is not used since 1.8.35
-        headers['x-access-service'] = NODE_SERVICES.AUTH_SERVICE;
-        return headers;
-    }
 }
 module.exports = AuthService;

package/lib/version.d.ts

@@ -1,4 +1,4 @@
-declare const version = "1.8.42";
+declare const version = "1.8.43";
 export { version };
 declare const _default: {
     version: string;

package/lib/version.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
-const version = '1.8.42';
+const version = '1.8.43';
 exports.version = version;
 exports.default = { version };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.42",
+  "version": "1.8.43",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,21 +26,21 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.8.42",
-    "@abtnode/constant": "1.8.42",
-    "@arcblock/did-auth": "1.18.26",
-    "@arcblock/jwt": "1.18.26",
-    "@arcblock/ws": "1.18.26",
-    "@blocklet/constant": "1.8.42",
-    "@blocklet/meta": "1.8.42",
-    "@did-connect/authenticator": "^2.1.26",
-    "@did-connect/handler": "^2.1.26",
+    "@abtnode/client": "1.8.43",
+    "@abtnode/constant": "1.8.43",
+    "@arcblock/did-auth": "1.18.30",
+    "@arcblock/jwt": "1.18.30",
+    "@arcblock/ws": "1.18.30",
+    "@blocklet/constant": "1.8.43",
+    "@blocklet/meta": "1.8.43",
+    "@did-connect/authenticator": "^2.1.29",
+    "@did-connect/handler": "^2.1.29",
     "@nedb/core": "^2.0.5",
-    "@ocap/mcrypto": "1.18.26",
-    "@ocap/wallet": "1.18.26",
+    "@ocap/mcrypto": "1.18.30",
+    "@ocap/wallet": "1.18.30",
     "axios": "^0.27.2",
     "fs-extra": "^10.1.0",
-    "joi": "17.6.3",
+    "joi": "17.7.0",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
@@ -69,5 +69,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "04771ed44e11deb3f214b637be6e3b78ca2b9245"
+  "gitHead": "5c6b7b09f6252a83523594aead6c722bf4ba0d0c"
 }