@blocklet/sdk 1.16.14-beta-963cb583 → 1.16.14-beta-a2de000a

package/lib/connect/shared.js

@@ -13,6 +13,7 @@ const mcrypto_1 = require("@ocap/mcrypto");
 const get_1 = __importDefault(require("lodash/get"));
 const constants_1 = require("../util/constants");
 const wallet_2 = __importDefault(require("../wallet"));
+const login_1 = require("../util/login");
 // wraps value in closure or returns closure
 const closure = (value) => (typeof value === 'function' ? value : () => value);
 const getDelegator = () => {
@@ -53,9 +54,6 @@ const getDelegation = (delegator, delegatee) => {
     });
 };
 exports.getDelegation = getDelegation;
-function getProvider(request) {
-    return request.headers['x-user-provider'] || constant_1.LOGIN_PROVIDER.WALLET;
-}
 const getAuthenticatorProps = (options = {}) => ({
     chainInfo: () => (0, util_1.getChainInfo)(process.env),
     ...options,
@@ -64,7 +62,7 @@ const getAuthenticatorProps = (options = {}) => ({
         const { request, baseUrl } = args[0];
         const groupPathPrefix = request.headers['x-group-path-prefix'] || '/';
         let agentDid;
-        const provider = getProvider(request);
+        const provider = (0, login_1.getLoginProvider)(request);
         // federated 登录模式下，需要告知原有的 blocklet-did
         if (provider === constant_1.LOGIN_PROVIDER.FEDERATED) {
             // 对于 ux 来说， 要展示的始终是 pid，所以这个给 agentDid 的赋值也需要是 pid
@@ -83,7 +81,7 @@ const getAuthenticatorProps = (options = {}) => ({
         };
     },
     async delegator({ request }) {
-        const provider = getProvider(request);
+        const provider = (0, login_1.getLoginProvider)(request);
         if (provider === constant_1.LOGIN_PROVIDER.FEDERATED) {
             let blocklet;
             try {
@@ -110,7 +108,7 @@ const getAuthenticatorProps = (options = {}) => ({
         return delegator;
     },
     async delegation({ request }) {
-        const provider = getProvider(request);
+        const provider = (0, login_1.getLoginProvider)(request);
         if (provider === constant_1.LOGIN_PROVIDER.FEDERATED) {
             let blocklet;
             try {

package/lib/util/login.d.ts

@@ -0,0 +1 @@
+export declare function getLoginProvider(request: any): any;

package/lib/util/login.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLoginProvider = void 0;
+/* eslint-disable import/prefer-default-export */
+const constant_1 = require("@blocklet/constant");
+function getLoginProvider(request) {
+    let provider;
+    // 1. 优先读取当前登录用户的 provider
+    ({ provider } = request.user || {});
+    if (!provider) {
+        // 2. 读取在 headers 中指定的 provider
+        provider = request.headers['x-user-provider'];
+    }
+    if (!provider) {
+        // 3. 读取在 extraParams 中指定的 provider
+        ({ provider } = request?.context?.store?.extraParams || {});
+    }
+    return provider || constant_1.LOGIN_PROVIDER.WALLET;
+}
+exports.getLoginProvider = getLoginProvider;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.14-beta-963cb583",
+  "version": "1.16.14-beta-a2de000a",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,15 +26,15 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/client": "1.16.14-beta-963cb583",
-    "@abtnode/constant": "1.16.14-beta-963cb583",
+    "@abtnode/client": "1.16.14-beta-a2de000a",
+    "@abtnode/constant": "1.16.14-beta-a2de000a",
     "@arcblock/did": "1.18.89",
     "@arcblock/did-auth": "1.18.89",
     "@arcblock/jwt": "1.18.89",
     "@arcblock/ws": "1.18.89",
-    "@blocklet/constant": "1.16.14-beta-963cb583",
-    "@blocklet/env": "1.16.14-beta-963cb583",
-    "@blocklet/meta": "1.16.14-beta-963cb583",
+    "@blocklet/constant": "1.16.14-beta-a2de000a",
+    "@blocklet/env": "1.16.14-beta-a2de000a",
+    "@blocklet/meta": "1.16.14-beta-a2de000a",
     "@did-connect/authenticator": "^2.2.0",
     "@did-connect/handler": "^2.2.0",
     "@nedb/core": "^2.1.5",
@@ -73,5 +73,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "82bae80cd584a096719d6985740e13f15b4f46bf"
+  "gitHead": "ed1336f2b7d3e6a4d5eeafd3816e6573c53ad543"
 }