@abtnode/auth 1.16.14-beta-d802cd3c → 1.16.14-beta-dc99d0a2

package/lib/auth.js

@@ -1134,11 +1134,13 @@ const setUserInfoHeaders = (req) => {
     req.headers['x-user-did'] = req.user.did;
     req.headers['x-user-fullname'] = encodeURIComponent(req.user.fullName);
     req.headers['x-user-role'] = req.user.role;
+    req.headers['x-user-provider'] = req.user.provider || LOGIN_PROVIDER.WALLET;
     req.headers['x-connected-did'] = req.user.did;
   } else {
     delete req.headers['x-user-did'];
     delete req.headers['x-user-fullname'];
     delete req.headers['x-user-role'];
+    delete req.headers['x-user-provider'];
 
     if (req.cookies && req.cookies.connected_did) {
       req.headers['x-connected-did'] = req.cookies.connected_did;

package/lib/passport.js

@@ -180,8 +180,8 @@ const createUserPassport = (vc, { status = PASSPORT_STATUS.VALID, role = ROLES.G
   return x;
 };
 
-const getPassportClaimUrl = (baseUrl) =>
-  baseUrl ? joinUrl(new URL(baseUrl).origin, WELLKNOWN_SERVICE_PATH_PREFIX, '/lost-passport') : '';
+const getPassportClaimUrl = (baseUrl, prefix = '') =>
+  baseUrl ? joinUrl(new URL(baseUrl).origin, prefix, WELLKNOWN_SERVICE_PATH_PREFIX, '/lost-passport') : '';
 
 module.exports = {
   validatePassport,

package/lib/server.js

@@ -286,7 +286,7 @@ const authenticateBySession = async ({ node, userDid, locale, allowedRoles = ['o
 };
 
 const getAuthVcClaim =
-  ({ node, launchBlocklet, blocklet, options }) =>
+  ({ node, launchBlocklet, blocklet, options, source = 'blocklet' }) =>
   async ({ extraParams: { locale, passportId }, context: { didwallet, baseUrl } }) => {
     checkWalletVersion({ didwallet, locale });
 
@@ -321,7 +321,7 @@ const getAuthVcClaim =
       ...baseClaim,
       trustedIssuers,
       ...(options || {}),
-      claimUrl: getPassportClaimUrl(baseUrl),
+      claimUrl: getPassportClaimUrl(baseUrl, source === 'server' ? info.routing.adminPath : ''),
     };
   };
 

package/lib/util/create-passport-svg.js

@@ -46,7 +46,8 @@ const createPassportSvg = ({
     width,
     height,
 
-    revoked,
+    tag: revoked ? 'revoked' : '',
+    tagVariant: revoked ? 'error' : 'info',
 
     color,
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.14-beta-d802cd3c",
+  "version": "1.16.14-beta-dc99d0a2",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,14 +20,14 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.14-beta-d802cd3c",
-    "@abtnode/logger": "1.16.14-beta-d802cd3c",
-    "@abtnode/util": "1.16.14-beta-d802cd3c",
+    "@abtnode/constant": "1.16.14-beta-dc99d0a2",
+    "@abtnode/logger": "1.16.14-beta-dc99d0a2",
+    "@abtnode/util": "1.16.14-beta-dc99d0a2",
     "@arcblock/did": "1.18.87",
-    "@arcblock/nft-display": "2.5.60",
+    "@arcblock/nft-display": "2.5.65",
     "@arcblock/vc": "1.18.87",
-    "@blocklet/constant": "1.16.14-beta-d802cd3c",
-    "@blocklet/meta": "1.16.14-beta-d802cd3c",
+    "@blocklet/constant": "1.16.14-beta-dc99d0a2",
+    "@blocklet/meta": "1.16.14-beta-dc99d0a2",
     "@ocap/mcrypto": "1.18.87",
     "@ocap/util": "1.18.87",
     "@ocap/wallet": "1.18.87",
@@ -43,5 +43,5 @@
   "devDependencies": {
     "jest": "^27.5.1"
   },
-  "gitHead": "f8e2dcefd8d6876e5dedee833ac976b4a0496b20"
+  "gitHead": "a00766d660ede97e2036f3a785f4f5cfb2e6d870"
 }