@abtnode/auth 1.16.28-beta-8acda0e6 → 1.16.28-next-5a717317

package/lib/auth.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const jwt = require('jsonwebtoken');
 const semver = require('semver');
-const { joinURL, withQuery } = require('ufo');
+const joinUrl = require('url-join');
 const get = require('lodash/get');
 const { verifyPresentation, createCredentialList } = require('@arcblock/vc');
 const formatContext = require('@abtnode/util/lib/format-context');
@@ -198,10 +198,7 @@ const getPassportStatusEndpoint = ({ baseUrl, userDid, teamDid }) => {
     return null;
   }
 
-  return withQuery(joinURL(baseUrl, '/api/passport/status'), {
-    userDid,
-    teamDid,
-  });
+  return joinUrl(baseUrl, `/api/passport/status?userDid=${userDid}&teamDid=${teamDid}`);
 };
 
 const getRandomMessage = (len = 16) => {
@@ -959,7 +956,7 @@ const getPassportStatus = async ({ node, teamDid, userDid, vcId, locale = 'en' }
     const { name } = passport;
     if ([ROLES.OWNER, ROLES.ADMIN].includes(name) && issuerType === TEAM_TYPE.BLOCKLET) {
       claims.push({
-        id: joinURL(passport.endpoint, WELLKNOWN_BLOCKLET_ADMIN_PATH),
+        id: joinUrl(passport.endpoint, WELLKNOWN_BLOCKLET_ADMIN_PATH),
         type: 'navigate',
         name: 'open-blocklet-admin',
         scope: 'public',

package/lib/invitation.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const omit = require('lodash/omit');
-const { joinURL } = require('ufo');
+const joinUrl = require('url-join');
 const { WELLKNOWN_SERVICE_PATH_PREFIX, NODE_DATA_DIR_NAME } = require('@abtnode/constant');
 const { BLOCKLET_CONFIGURABLE_KEY } = require('@blocklet/constant');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
@@ -134,7 +134,7 @@ module.exports = {
             url: blockletInfo.environmentObj[BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_URL],
             name: getDisplayName(blockletInfo),
             version: blockletInfo.meta.version,
-            logo: joinURL(groupPathPrefix, WELLKNOWN_SERVICE_PATH_PREFIX, '/blocklet/logo'),
+            logo: joinUrl(groupPathPrefix, WELLKNOWN_SERVICE_PATH_PREFIX, '/blocklet/logo'),
             chainHost: blockletInfo.configObj.CHAIN_HOST,
             passportColor: blockletInfo.configObj[BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_PASSPORT_COLOR],
             description: blockletInfo.meta.description,

package/lib/lost-passport.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const { joinURL } = require('ufo');
+const joinUrl = require('url-join');
 const uniqBy = require('lodash/uniqBy');
 const uniq = require('lodash/uniq');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
@@ -88,7 +88,7 @@ const getApplicationInfo = async ({ type, node, req, baseUrl = '' }) => {
 
 const getStatusEndpointBaseUrl = (type, baseUrl, authServicePrefix) => {
   if (type === TEAM_TYPES.BLOCKLET) {
-    return joinURL(baseUrl, authServicePrefix);
+    return joinUrl(baseUrl, authServicePrefix);
   }
 
   return baseUrl;

package/lib/passport.js

@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 
 const Joi = require('joi');
-const { joinURL } = require('ufo');
+const joinUrl = require('url-join');
 const pick = require('lodash/pick');
 const { create: createVC } = require('@arcblock/vc');
 const {
@@ -181,7 +181,7 @@ const createUserPassport = (vc, { status = PASSPORT_STATUS.VALID, role = ROLES.G
 };
 
 const getPassportClaimUrl = (baseUrl, prefix = '') =>
-  baseUrl ? joinURL(new URL(baseUrl).origin, prefix, WELLKNOWN_SERVICE_PATH_PREFIX, '/lost-passport') : '';
+  baseUrl ? joinUrl(new URL(baseUrl).origin, prefix, WELLKNOWN_SERVICE_PATH_PREFIX, '/lost-passport') : '';
 
 module.exports = {
   validatePassport,

package/lib/util/federated.js

@@ -1,7 +1,7 @@
 const { WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_URL_PREFIX, USER_AVATAR_PATH_PREFIX } = require('@abtnode/constant');
 const pRetry = require('p-retry');
 const { signV2 } = require('@arcblock/jwt');
-const { joinURL } = require('ufo');
+const joinUrl = require('url-join');
 
 const request = require('./request');
 
@@ -12,10 +12,10 @@ function isMaster(site) {
 function getUserAvatarUrl(avatar, blocklet) {
   let avatarUrl = avatar;
   if (avatar && avatar.startsWith(USER_AVATAR_URL_PREFIX)) {
-    avatarUrl = joinURL(WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_PATH_PREFIX, avatarUrl.split('/').slice(-1)[0]);
+    avatarUrl = joinUrl(WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_PATH_PREFIX, avatarUrl.split('/').slice(-1)[0]);
 
     const appUrl = blocklet.environmentObj.BLOCKLET_APP_URL;
-    avatarUrl = joinURL(appUrl, avatarUrl);
+    avatarUrl = joinUrl(appUrl, avatarUrl);
   }
   return avatarUrl;
 }
@@ -43,7 +43,7 @@ function findFederatedSite(blocklet, targetAppPid) {
 
 async function callFederated({ site, permanentWallet, data, action }) {
   const url = new URL(site.appUrl);
-  url.pathname = joinURL(WELLKNOWN_SERVICE_PATH_PREFIX, `/api/federated/${action}`);
+  url.pathname = joinUrl(WELLKNOWN_SERVICE_PATH_PREFIX, `/api/federated/${action}`);
   const result = await pRetry(
     () =>
       request.post(url.href, {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.28-beta-8acda0e6",
+  "version": "1.16.28-next-5a717317",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,22 +20,22 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.28-beta-8acda0e6",
-    "@abtnode/logger": "1.16.28-beta-8acda0e6",
-    "@abtnode/util": "1.16.28-beta-8acda0e6",
+    "@abtnode/constant": "1.16.28-next-5a717317",
+    "@abtnode/logger": "1.16.28-next-5a717317",
+    "@abtnode/util": "1.16.28-next-5a717317",
     "@arcblock/did": "1.18.123",
     "@arcblock/jwt": "^1.18.123",
-    "@arcblock/nft-display": "^2.10.0",
+    "@arcblock/nft-display": "^2.9.90",
     "@arcblock/validator": "^1.18.123",
     "@arcblock/vc": "1.18.123",
-    "@blocklet/constant": "1.16.28-beta-8acda0e6",
-    "@blocklet/meta": "1.16.28-beta-8acda0e6",
-    "@blocklet/sdk": "1.16.28-beta-8acda0e6",
+    "@blocklet/constant": "1.16.28-next-5a717317",
+    "@blocklet/meta": "1.16.28-next-5a717317",
+    "@blocklet/sdk": "1.16.28-next-5a717317",
     "@ocap/client": "^1.18.123",
     "@ocap/mcrypto": "1.18.123",
     "@ocap/util": "1.18.123",
     "@ocap/wallet": "1.18.123",
-    "axios": "^1.7.2",
+    "axios": "^0.27.2",
     "flat": "^5.0.2",
     "fs-extra": "^11.2.0",
     "is-url": "^1.2.4",
@@ -45,10 +45,11 @@
     "p-retry": "4.6.1",
     "semver": "^7.3.8",
     "transliteration": "^2.3.5",
-    "ufo": "^1.5.3"
+    "ufo": "^1.3.2",
+    "url-join": "^4.0.1"
   },
   "devDependencies": {
     "jest": "^29.7.0"
   },
-  "gitHead": "a1a896a7d34abc6a1f24b855524c228c0b0a3ade"
+  "gitHead": "3624967f9549de3a25a87ed6b20f82519ddb4757"
 }