@blocklet/sdk 1.16.16-beta-740ea329 → 1.16.16-beta-d6c5ed65

package/lib/connect/shared.js

@@ -8,7 +8,6 @@ const url_join_1 = __importDefault(require("url-join"));
 const jwt_1 = require("@arcblock/jwt");
 const util_1 = require("@blocklet/meta/lib/util");
 const wallet_1 = require("@ocap/wallet");
-const constant_1 = require("@blocklet/constant");
 const mcrypto_1 = require("@ocap/mcrypto");
 const get_1 = __importDefault(require("lodash/get"));
 const constants_1 = require("../util/constants");
@@ -62,9 +61,9 @@ const getAuthenticatorProps = (options = {}) => ({
         const { request, baseUrl } = args[0];
         const groupPathPrefix = request.headers['x-group-path-prefix'] || '/';
         let agentDid;
-        const provider = (0, login_1.getLoginProvider)(request);
+        const sourceAppPid = (0, login_1.getSourceAppPid)(request);
         // federated 登录模式下，需要告知原有的 blocklet-did
-        if (provider === constant_1.LOGIN_PROVIDER.FEDERATED) {
+        if (sourceAppPid) {
             // 对于 ux 来说， 要展示的始终是 pid，所以这个给 agentDid 的赋值也需要是 pid
             agentDid = process.env.BLOCKLET_APP_PID;
         }
@@ -81,8 +80,8 @@ const getAuthenticatorProps = (options = {}) => ({
         };
     },
     async delegator({ request }) {
-        const provider = (0, login_1.getLoginProvider)(request);
-        if (provider === constant_1.LOGIN_PROVIDER.FEDERATED) {
+        const sourceAppPid = (0, login_1.getSourceAppPid)(request);
+        if (sourceAppPid) {
             let blocklet;
             try {
                 ({ blocklet } = await this.authClient.getBlocklet());
@@ -108,8 +107,8 @@ const getAuthenticatorProps = (options = {}) => ({
         return delegator;
     },
     async delegation({ request }) {
-        const provider = (0, login_1.getLoginProvider)(request);
-        if (provider === constant_1.LOGIN_PROVIDER.FEDERATED) {
+        const sourceAppPid = (0, login_1.getSourceAppPid)(request);
+        if (sourceAppPid) {
             let blocklet;
             try {
                 ({ blocklet } = await this.authClient.getBlocklet());

package/lib/util/login.d.ts

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

package/lib/util/login.js

@@ -1,27 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLoginProvider = void 0;
+exports.getSourceAppPid = exports.getLoginProvider = void 0;
 /* eslint-disable import/prefer-default-export */
 const constant_1 = require("@blocklet/constant");
 function getLoginProvider(request) {
-    let provider;
     const extraParams = request?.context?.store?.extraParams || request.query || {};
-    // NOTICE: 某些情况下，需要优先读取参数中的 provider，其余情况均以当前登录用户的 provider 来决定
-    if (extraParams.providerMode === 'paramsFirst') {
-        provider = extraParams.provider;
-    }
-    else {
-        // 1. 优先读取当前登录用户的 provider
-        provider = request.user?.provider;
-        if (!provider) {
-            // 2. 读取在 headers 中指定的 provider
-            provider = request.headers['x-user-provider'];
-        }
-        if (!provider) {
-            // 3. 读取在 extraParams 中指定的 provider
-            provider = extraParams.provider;
-        }
-    }
-    return provider || constant_1.LOGIN_PROVIDER.WALLET;
+    return extraParams.provider || constant_1.LOGIN_PROVIDER.WALLET;
 }
 exports.getLoginProvider = getLoginProvider;
+function getSourceAppPid(request) {
+    const extraParams = request?.context?.store?.extraParams || request.query || {};
+    return extraParams?.sourceAppPid;
+}
+exports.getSourceAppPid = getSourceAppPid;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.16-beta-740ea329",
+  "version": "1.16.16-beta-d6c5ed65",
   "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.16-beta-740ea329",
-    "@abtnode/constant": "1.16.16-beta-740ea329",
+    "@abtnode/client": "1.16.16-beta-d6c5ed65",
+    "@abtnode/constant": "1.16.16-beta-d6c5ed65",
     "@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.16-beta-740ea329",
-    "@blocklet/env": "1.16.16-beta-740ea329",
-    "@blocklet/meta": "1.16.16-beta-740ea329",
+    "@blocklet/constant": "1.16.16-beta-d6c5ed65",
+    "@blocklet/env": "1.16.16-beta-d6c5ed65",
+    "@blocklet/meta": "1.16.16-beta-d6c5ed65",
     "@did-connect/authenticator": "^2.2.0",
     "@did-connect/handler": "^2.2.0",
     "@nedb/core": "^2.1.5",
@@ -74,5 +74,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "6abb5a7319ad1093f1e2d04d76215d4a127b538d"
+  "gitHead": "16f5632a7b86283381fa49acc4d2553c65cd2aa3"
 }