@abtnode/auth 1.7.5 → 1.7.8

package/lib/auth.js

@@ -642,8 +642,8 @@ const getVCFromClaims = async ({ claims, challenge, trustedIssuers, vcTypes, loc
   };
 };
 
-const checkWalletVersion = ({ abtwallet, locale = 'en' }) => {
-  const { os, version } = abtwallet;
+const checkWalletVersion = ({ didwallet, locale = 'en' }) => {
+  const { os, version } = didwallet;
 
   const defaultExpected = '3.0.0';
 

package/lib/lost-passport.js

@@ -85,7 +85,7 @@ const createLostPassportListRoute = ({ node, type }) => ({
     },
   },
 
-  onAuth: async ({ userDid, extraParams, token, storage, req }) => {
+  onAuth: async ({ userDid, extraParams, updateSession, req }) => {
     const { locale } = extraParams;
 
     const { teamDid, issuerDid } = await getTeamInfo({ node, req, type });
@@ -125,9 +125,7 @@ const createLostPassportListRoute = ({ node, type }) => ({
 
     logger.info('get passport type list', { userDid });
 
-    await storage.update(token, {
-      user,
-    });
+    await updateSession({ user });
   },
 });
 
@@ -149,9 +147,9 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
       },
     },
     {
-      signature: async ({ extraParams, context: { request, abtwallet } }) => {
+      signature: async ({ extraParams, context: { request, didwallet } }) => {
         const { locale, passportName, receiverDid } = extraParams;
-        checkWalletVersion({ abtwallet, locale });
+        checkWalletVersion({ didwallet, locale });
 
         const { teamDid, issuerDid, issuerName, passportColor } = await getTeamInfo({ node, req: request, type });
         const user = await getUser(node, teamDid, receiverDid);

package/lib/server.js

@@ -164,8 +164,8 @@ const authenticateByNFT = async ({ node, claims, userDid, challenge, locale }) =
 
 const getAuthVcClaim =
   (node) =>
-  async ({ extraParams: { locale }, context: { abtwallet } }) => {
-    checkWalletVersion({ abtwallet, locale });
+  async ({ extraParams: { locale }, context: { didwallet } }) => {
+    checkWalletVersion({ didwallet, locale });
     const info = await node.getNodeInfo();
     const trustedPassports = (info.trustedPassports || []).map((x) => x.issuerDid);
     const trustedIssuers = [info.did, ...trustedPassports].filter(Boolean);
@@ -187,8 +187,8 @@ const getLaunchFreeBlockletClaims = (node, authMethod) => {
   return {
     serverNFT: [
       'asset',
-      async ({ extraParams: { locale }, context: { abtwallet } }) => {
-        checkWalletVersion({ abtwallet, locale });
+      async ({ extraParams: { locale }, context: { didwallet } }) => {
+        checkWalletVersion({ didwallet, locale });
         return getOwnershipNFTClaim(node, locale);
       },
     ],
@@ -200,8 +200,8 @@ const getLaunchPaidBlockletClaims = (node, authMethod) => {
 
   claims.blockletPurchaseNft = [
     'verifiableCredential',
-    async ({ extraParams: { locale, blockletMetaUrl }, context: { abtwallet } }) => {
-      checkWalletVersion({ abtwallet, locale });
+    async ({ extraParams: { locale, blockletMetaUrl }, context: { didwallet } }) => {
+      checkWalletVersion({ didwallet, locale });
       const registryUrl = new URL(blockletMetaUrl).origin;
       const [registry, { meta }] = await Promise.all([
         node.getRegistryMeta(registryUrl),
@@ -274,7 +274,7 @@ const ensureBlockletPermission = async ({ authMethod, node, userDid, claims, cha
 
 const createLaunchBlockletHandler =
   (node, authMethod) =>
-  async ({ claims, challenge, userDid, token, storage, extraParams: { locale, blockletMetaUrl } }) => {
+  async ({ claims, challenge, userDid, updateSession, extraParams: { locale, blockletMetaUrl } }) => {
     if (!blockletMetaUrl) {
       throw new Error(messages.invalidParams[locale]);
     }
@@ -332,11 +332,10 @@ const createLaunchBlockletHandler =
 
     // 检查是否已安装，这里不做升级的处理
     const existedBlocklet = await node.getBlocklet({ did });
+    await updateSession({ sessionToken }, true);
+
     if (existedBlocklet) {
-      const storageData = {
-        did: userDid,
-        sessionToken,
-      };
+      const storageData = { did: userDid };
 
       if (semver.gt(result.meta.version, existedBlocklet.meta.version)) {
         const appDidEnv = existedBlocklet.environments.find((e) => e.key === 'BLOCKLET_APP_ID');
@@ -348,14 +347,11 @@ const createLaunchBlockletHandler =
         };
       }
 
-      await storage.update(token, storageData);
-
+      await updateSession(storageData);
       logger.info('blocklet already exists', { did });
       return;
     }
 
-    await storage.update(token, { did: userDid, sessionToken });
-
     const context = {};
     if (typeof blockletPurchaseVerified !== 'undefined') {
       context.blockletPurchaseVerified = blockletPurchaseVerified;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.5",
+  "version": "1.7.8",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,17 +20,17 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.7.5",
-    "@abtnode/logger": "1.7.5",
-    "@abtnode/util": "1.7.5",
-    "@arcblock/did": "^1.15.7",
-    "@arcblock/vc": "^1.15.7",
-    "@blocklet/meta": "1.7.5",
-    "@ocap/client": "1.15.7",
-    "@ocap/mcrypto": "^1.15.7",
-    "@ocap/util": "^1.15.7",
-    "@ocap/wallet": "^1.15.7",
-    "axios": "^0.25.0",
+    "@abtnode/constant": "1.7.8",
+    "@abtnode/logger": "1.7.8",
+    "@abtnode/util": "1.7.8",
+    "@arcblock/did": "^1.16.3",
+    "@arcblock/vc": "^1.16.3",
+    "@blocklet/meta": "1.7.8",
+    "@ocap/client": "1.16.3",
+    "@ocap/mcrypto": "^1.16.3",
+    "@ocap/util": "^1.16.3",
+    "@ocap/wallet": "^1.16.3",
+    "axios": "^0.26.1",
     "joi": "^17.6.0",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
@@ -40,5 +40,5 @@
   "devDependencies": {
     "jest": "^27.4.5"
   },
-  "gitHead": "b17d83773e5a4c06bae390fc70398d49d6dd86b3"
+  "gitHead": "ae75dd20b4750a31dc53c88b75ed1d95c8f15397"
 }