@blocklet/sdk 1.16.6-beta-4ea1eb90 → 1.16.6-beta-7c9b42cc

package/lib/did.js

@@ -18,21 +18,9 @@ async function getUserInfo(userDid, { authClient = undefined } = {}) {
         // eslint-disable-next-line no-param-reassign
         authClient = new auth_1.default();
     }
-    let { user } = await authClient.getUser(userDid);
-    if (!user) {
-        const { users } = await authClient.getUsers({
-            query: {
-                connectedDid: userDid,
-            },
-        });
-        if (users.length > 1) {
-            throw new Error('User is invalid');
-        }
-        [user] = users;
-    }
-    else if (user.extraConfigs?.bindDid) {
-        ({ user } = await authClient.getUser(user.extraConfigs.bindDid));
-    }
+    const { user } = await authClient.getUser(userDid, {
+        enableConnectedAccout: true,
+    });
     return user;
 }
 exports.getUserInfo = getUserInfo;

package/lib/service/auth.d.ts

@@ -7,7 +7,11 @@ declare class AuthService {
     constructor(httpEndpoint?: string);
 }
 interface AuthService {
-    getUser(did: string): Promise<Client.ResponseUser>;
+    getUser(did: string, options: {
+        enableConnectedAccout?: boolean;
+        enableNormalize?: boolean;
+        blockletSk?: string;
+    }): Promise<Client.ResponseUser>;
     getUsers(args?: OmitTeamDid<Client.RequestUsersInput>): Promise<Client.ResponseUsers>;
     getOwner(): Promise<Client.ResponseUser>;
     updateUserApproval(did: string, approved: boolean): Promise<Client.ResponseUser>;

package/lib/service/auth.js

@@ -95,8 +95,8 @@ class AuthService {
         const apiFallback = (fn) => (params = {}, ...args) => fn({ input: { ...params, teamDid }, ...args });
         // const apiConvertDid = (fn: Function) => (did: string) => fn({ input: { user: { did }, teamDid } });
         const apiFnMap = {
-            getUser: (fn) => async (did) => {
-                const res = await fn({ input: { user: { did }, teamDid } });
+            getUser: (fn) => async (did, options) => {
+                const res = await fn({ input: { user: { did }, options, teamDid } });
                 fixAvatar(res.user);
                 return res;
             },

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.6-beta-4ea1eb90",
+  "version": "1.16.6-beta-7c9b42cc",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,20 +26,20 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.16.6-beta-4ea1eb90",
-    "@abtnode/constant": "1.16.6-beta-4ea1eb90",
-    "@arcblock/did": "1.18.72",
-    "@arcblock/did-auth": "1.18.72",
-    "@arcblock/jwt": "1.18.72",
-    "@arcblock/ws": "1.18.72",
-    "@blocklet/constant": "1.16.6-beta-4ea1eb90",
-    "@blocklet/env": "1.16.6-beta-4ea1eb90",
-    "@blocklet/meta": "1.16.6-beta-4ea1eb90",
-    "@did-connect/authenticator": "^2.1.51",
-    "@did-connect/handler": "^2.1.51",
+    "@abtnode/client": "1.16.6-beta-7c9b42cc",
+    "@abtnode/constant": "1.16.6-beta-7c9b42cc",
+    "@arcblock/did": "1.18.75",
+    "@arcblock/did-auth": "1.18.75",
+    "@arcblock/jwt": "1.18.75",
+    "@arcblock/ws": "1.18.75",
+    "@blocklet/constant": "1.16.6-beta-7c9b42cc",
+    "@blocklet/env": "1.16.6-beta-7c9b42cc",
+    "@blocklet/meta": "1.16.6-beta-7c9b42cc",
+    "@did-connect/authenticator": "^2.1.52",
+    "@did-connect/handler": "^2.1.52",
     "@nedb/core": "^2.1.5",
-    "@ocap/mcrypto": "1.18.72",
-    "@ocap/wallet": "1.18.72",
+    "@ocap/mcrypto": "1.18.75",
+    "@ocap/wallet": "1.18.75",
     "axios": "^0.27.2",
     "cheerio": "^1.0.0-rc.12",
     "fs-extra": "^10.1.0",
@@ -72,5 +72,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "0f0f63b552a88343a3f8e0d434b47c3bca6a75b9"
+  "gitHead": "113a82e948a779a050f1b06f5667c43c96315054"
 }