@abtnode/auth 1.7.14 → 1.7.17

package/lib/auth.js

@@ -561,6 +561,7 @@ const handleIssuePassportResponse = async ({
   locale = 'en',
   claims,
   statusEndpointBaseUrl,
+  updateSession,
   endpoint,
 }) => {
   // verify signature
@@ -656,6 +657,8 @@ const handleIssuePassportResponse = async ({
     await node.setBlockletInitialized({ did: teamDid, owner: { did: userDid, pk: userPk } });
   }
 
+  await updateSession({ passportId: vc.id });
+
   return {
     disposition: 'attachment',
     type: 'VerifiableCredential',

package/lib/lost-passport.js

@@ -182,7 +182,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
     },
   ],
 
-  onAuth: async ({ claims, userDid, userPk, extraParams, baseUrl, req }) => {
+  onAuth: async ({ claims, userDid, userPk, extraParams, updateSession, baseUrl, req }) => {
     const { locale = 'en', receiverDid, passportName } = extraParams;
 
     const { teamDid, issuerDid, issuerName, issuerWallet, passportColor } = await getTeamInfo({ node, req, type });
@@ -276,6 +276,8 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
       node
     );
 
+    await updateSession({ passportId: vc.id });
+
     return {
       disposition: 'attachment',
       type: 'VerifiableCredential',

package/lib/server.js

@@ -147,7 +147,7 @@ const authenticateByNFT = async ({ node, claims, userDid, challenge, locale }) =
   if (!state) {
     throw new Error(messages.invalidNft[locale]);
   }
-  if (state.owner !== ownerDid || state.owner !== info.ownerNft.holder) {
+  if (state.owner !== ownerDid) {
     throw new Error(messages.invalidNftHolder[locale]);
   }
   if (state.issuer !== info.launcher.did) {
@@ -165,17 +165,23 @@ const authenticateByNFT = async ({ node, claims, userDid, challenge, locale }) =
 
 const getAuthVcClaim =
   (node) =>
-  async ({ extraParams: { locale }, context: { didwallet } }) => {
+  async ({ extraParams: { locale, passportId = '' }, 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);
-    return {
+    const claim = {
       description: messages.requestPassport[locale],
       optional: false,
       item: abtnodeVcTypes,
       trustedIssuers,
     };
+
+    if (passportId) {
+      claim.target = passportId;
+    }
+
+    return claim;
   };
 
 const getLaunchFreeBlockletClaims = (node, authMethod) => {
@@ -223,7 +229,7 @@ const getLaunchPaidBlockletClaims = (node, authMethod) => {
 
 const getOwnershipNFTClaim = async (node, locale) => {
   const info = await node.getNodeInfo();
-  if (!info.ownerNft && !info.ownerNft.holder && !info.ownerNft.issuer) {
+  if (!info.ownerNft && !info.ownerNft.issuer) {
     throw new Error(messages.noNft[locale]);
   }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.14",
+  "version": "1.7.17",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,16 +20,16 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.7.14",
-    "@abtnode/logger": "1.7.14",
-    "@abtnode/util": "1.7.14",
-    "@arcblock/did": "^1.16.6",
-    "@arcblock/vc": "^1.16.6",
-    "@blocklet/meta": "1.7.14",
-    "@ocap/client": "1.16.6",
-    "@ocap/mcrypto": "^1.16.6",
-    "@ocap/util": "^1.16.6",
-    "@ocap/wallet": "^1.16.6",
+    "@abtnode/constant": "1.7.17",
+    "@abtnode/logger": "1.7.17",
+    "@abtnode/util": "1.7.17",
+    "@arcblock/did": "^1.16.9",
+    "@arcblock/vc": "^1.16.9",
+    "@blocklet/meta": "1.7.17",
+    "@ocap/client": "1.16.9",
+    "@ocap/mcrypto": "^1.16.9",
+    "@ocap/util": "^1.16.9",
+    "@ocap/wallet": "^1.16.9",
     "axios": "^0.26.1",
     "joi": "^17.6.0",
     "jsonwebtoken": "^8.5.1",
@@ -40,5 +40,5 @@
   "devDependencies": {
     "jest": "^27.4.5"
   },
-  "gitHead": "1f3855e6dc8b6d6c91526264e2f63215df6b962c"
+  "gitHead": "142a5b1e83ea03647ef9bea8de9bb269c9c82928"
 }