@abtnode/auth 1.16.19-beta-e6aac665 → 1.16.19-beta-7b2db880

package/lib/server.js

@@ -325,21 +325,6 @@ const getAuthVcClaim =
     };
   };
 
-const getAuthNFTClaim =
-  ({ node }) =>
-  ({ extraParams: { locale, launchType, nftId }, context: { didwallet } }) => {
-    checkWalletVersion({ didwallet, locale });
-    if (launchType === 'serverless') {
-      if (!nftId) {
-        throw new Error(messages.blockletSpaceNftIdRequired[locale]);
-      }
-
-      return getServerlessNFTClaim(nftId, locale);
-    }
-
-    return getOwnershipNFTClaim(node, locale);
-  };
-
 const getAuthPrincipalForMigrateAppToV2 = (node) => async (param) => {
   const {
     extraParams: { locale, appDid },
@@ -498,22 +483,6 @@ const getRotateKeyPairClaims = (node) => {
   ];
 };
 
-const getLaunchBlockletClaims = (node, authMethod) => {
-  const claims = {
-    blockletAppKeypair: ['keyPair', getKeyPairClaim(node)],
-  };
-
-  if (authMethod === 'vc') {
-    claims.serverPassport = ['verifiableCredential', getAuthVcClaim({ node, launchBlocklet: true })];
-  }
-
-  if (authMethod === 'nft') {
-    claims.serverNFT = ['asset', getAuthNFTClaim({ node })];
-  }
-
-  return claims;
-};
-
 const getAppDidOwnerClaims = () => {
   const description = {
     en: 'Sign following message to prove that you are the owner of the app',
@@ -572,6 +541,37 @@ const getServerlessNFTClaim = (nftId, locale) => {
   };
 };
 
+const getAuthNFTClaim =
+  ({ node }) =>
+  ({ extraParams: { locale, launchType, nftId }, context: { didwallet } }) => {
+    checkWalletVersion({ didwallet, locale });
+    if (launchType === 'serverless') {
+      if (!nftId) {
+        throw new Error(messages.blockletSpaceNftIdRequired[locale]);
+      }
+
+      return getServerlessNFTClaim(nftId, locale);
+    }
+
+    return getOwnershipNFTClaim(node, locale);
+  };
+
+const getLaunchBlockletClaims = (node, authMethod) => {
+  const claims = {
+    blockletAppKeypair: ['keyPair', getKeyPairClaim(node)],
+  };
+
+  if (authMethod === 'vc') {
+    claims.serverPassport = ['verifiableCredential', getAuthVcClaim({ node, launchBlocklet: true })];
+  }
+
+  if (authMethod === 'nft') {
+    claims.serverNFT = ['asset', getAuthNFTClaim({ node })];
+  }
+
+  return claims;
+};
+
 const ensureBlockletPermission = async ({
   authMethod,
   node,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.19-beta-e6aac665",
+  "version": "1.16.19-beta-7b2db880",
   "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.19-beta-e6aac665",
-    "@abtnode/logger": "1.16.19-beta-e6aac665",
-    "@abtnode/util": "1.16.19-beta-e6aac665",
+    "@abtnode/constant": "1.16.19-beta-7b2db880",
+    "@abtnode/logger": "1.16.19-beta-7b2db880",
+    "@abtnode/util": "1.16.19-beta-7b2db880",
     "@arcblock/did": "1.18.95",
     "@arcblock/nft-display": "2.8.14",
     "@arcblock/vc": "1.18.95",
-    "@blocklet/constant": "1.16.19-beta-e6aac665",
-    "@blocklet/meta": "1.16.19-beta-e6aac665",
+    "@blocklet/constant": "1.16.19-beta-7b2db880",
+    "@blocklet/meta": "1.16.19-beta-7b2db880",
     "@ocap/mcrypto": "1.18.95",
     "@ocap/util": "1.18.95",
     "@ocap/wallet": "1.18.95",
@@ -43,5 +43,5 @@
   "devDependencies": {
     "jest": "^27.5.1"
   },
-  "gitHead": "09b0172831521ef73f7879940b977c2696b5b247"
+  "gitHead": "598b576b97dd7accbfa1bb509b75e423ad27e5e2"
 }