@abtnode/auth 1.16.3 → 1.16.4-beta-8682e092

package/lib/auth.js

@@ -16,7 +16,6 @@ const {
   NODE_DATA_DIR_NAME,
   AUTH_CERT_TYPE,
   WELLKNOWN_BLOCKLET_ADMIN_PATH,
-  USER_TYPE,
 } = require('@abtnode/constant');
 const axios = require('@abtnode/util/lib/axios');
 const { extractUserAvatar, parseUserAvatar } = require('@abtnode/util/lib/user-avatar');
@@ -436,7 +435,6 @@ const handleInvitationReceive = async ({
   inviteId,
   userDid,
   userPk,
-  userSource = USER_TYPE.WALLET,
   newNftOwner,
   statusEndpointBaseUrl,
   endpoint,
@@ -546,7 +544,6 @@ const handleInvitationReceive = async ({
       user: {
         ...profile,
         avatar,
-        source: userSource,
         did: userDid,
         pk: userPk,
         locale,
@@ -570,7 +567,6 @@ const handleInvitationReceive = async ({
       teamDid,
       user: {
         ...profile,
-        source: userSource,
         avatar,
         did: userDid,
         pk: userPk,

package/lib/server.js

@@ -11,10 +11,10 @@ const { fromPublicKey } = require('@ocap/wallet');
 const { types } = require('@ocap/mcrypto');
 const { fromBase58, toAddress, toHex } = require('@ocap/util');
 const { toTypeInfo, isFromPublicKey, DidType, isEthereumType } = require('@arcblock/did');
-const urlFriendly = require('@blocklet/meta/lib/url-friendly').default;
+const urlPathFriendly = require('@blocklet/meta/lib/url-path-friendly').default;
 const getApplicationWallet = require('@blocklet/meta/lib/wallet');
 const { slugify } = require('transliteration');
-const { getBlockletChainInfo } = require('@blocklet/meta/lib/util');
+const { getBlockletChainInfo, isInProgress, isRunning } = require('@blocklet/meta/lib/util');
 
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const formatContext = require('@abtnode/util/lib/format-context');
@@ -416,7 +416,7 @@ const getKeyPairClaim =
     const result = {
       mfa: !process.env.DID_CONNECT_MFA_DISABLED,
       description: description[locale] || description.en,
-      moniker: (urlFriendly(slugify(appName)) || 'application').toLowerCase(),
+      moniker: (urlPathFriendly(slugify(appName)) || 'application').toLowerCase(),
       declare: !!declare,
       migrateFrom: declare ? migrateFrom : '',
       chainInfo,
@@ -450,6 +450,15 @@ const getRotateKeyPairClaims = (node) => {
         if (!blocklet) {
           throw new Error(messages.invalidBlocklet[locale]);
         }
+
+        if (isInProgress(blocklet.status)) {
+          throw new Error('Blocklet is in progress, please wait for it to finish');
+        }
+
+        if (isRunning(blocklet.status)) {
+          throw new Error('Blocklet is running, please stop it first');
+        }
+
         if (blocklet.structVersion !== APP_STRUCT_VERSION) {
           throw new Error(messages.invalidAppVersion[locale]);
         }
@@ -605,7 +614,7 @@ const ensureBlockletPermission = async ({
 
 const createLaunchBlockletHandler =
   (node, authMethod) =>
-  async ({ claims, challenge, userDid, updateSession, req, extraParams }) => {
+  async ({ claims, challenge, userDid, updateSession, req, didwallet, extraParams }) => {
     const { locale, blockletMetaUrl, title, description, chainHost } = extraParams;
     logger.info('createLaunchBlockletHandler', extraParams);
 
@@ -721,6 +730,7 @@ const createLaunchBlockletHandler =
         title,
         description,
         appSk,
+        skSource: didwallet?.version ? `${didwallet.os}-wallet-v${didwallet.version}` : '',
         delay: 1000 * 4, // delay 4 seconds to download, wait for ws connection from frontend
         downloadTokenList: extraParams?.previousWorkflowData?.downloadTokenList,
         controller: role === SERVER_ROLES.EXTERNAL_BLOCKLET_CONTROLLER ? controller : null,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.3",
+  "version": "1.16.4-beta-8682e092",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,18 +20,18 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.16.3",
-    "@abtnode/logger": "1.16.3",
-    "@abtnode/util": "1.16.3",
-    "@arcblock/did": "1.18.65",
-    "@arcblock/jwt": "^1.18.65",
-    "@arcblock/vc": "1.18.65",
-    "@blocklet/constant": "1.16.3",
-    "@blocklet/meta": "1.16.3",
-    "@ocap/client": "1.18.65",
-    "@ocap/mcrypto": "1.18.65",
-    "@ocap/util": "1.18.65",
-    "@ocap/wallet": "1.18.65",
+    "@abtnode/constant": "1.16.4-beta-8682e092",
+    "@abtnode/logger": "1.16.4-beta-8682e092",
+    "@abtnode/util": "1.16.4-beta-8682e092",
+    "@arcblock/did": "1.18.67",
+    "@arcblock/jwt": "^1.18.67",
+    "@arcblock/vc": "1.18.67",
+    "@blocklet/constant": "1.16.4-beta-8682e092",
+    "@blocklet/meta": "1.16.4-beta-8682e092",
+    "@ocap/client": "1.18.67",
+    "@ocap/mcrypto": "1.18.67",
+    "@ocap/util": "1.18.67",
+    "@ocap/wallet": "1.18.67",
     "axios": "^0.27.2",
     "joi": "17.7.0",
     "jsonwebtoken": "^9.0.0",
@@ -44,5 +44,5 @@
   "devDependencies": {
     "jest": "^27.5.1"
   },
-  "gitHead": "a21d48225c6f89963796871f404a2318a335701d"
+  "gitHead": "ab6fc7aeaec32f14ec2153976f2121aa893486b5"
 }