@abtnode/auth 1.8.69-beta-650a290b → 1.16.0-beta-b16cb035

package/lib/auth.js

@@ -308,10 +308,11 @@ const getRandomMessage = (len = 16) => {
   return hex.replace(/^0x/, '').toUpperCase();
 };
 
-const getTeamInfo = async ({ node, nodeInfo, teamDid }) => {
+const getApplicationInfo = async ({ node, nodeInfo, teamDid }) => {
   let type;
   let name;
   let wallet;
+  let permanentWallet;
   let description;
   let passportColor;
   let owner;
@@ -320,7 +321,9 @@ const getTeamInfo = async ({ node, nodeInfo, teamDid }) => {
   if (teamDid === nodeInfo.did) {
     name = nodeInfo.name;
     description = nodeInfo.description;
-    wallet = getNodeWallet(nodeInfo.sk);
+    const _wallet = getNodeWallet(nodeInfo.sk);
+    wallet = _wallet;
+    permanentWallet = _wallet;
     type = TEAM_TYPE.NODE;
     passportColor = 'default';
     owner = nodeInfo.nodeOwner;
@@ -331,6 +334,7 @@ const getTeamInfo = async ({ node, nodeInfo, teamDid }) => {
     name = blockletInfo.name;
     description = blockletInfo.description;
     wallet = blockletInfo.wallet;
+    permanentWallet = blockletInfo.permanentWallet;
     passportColor = blockletInfo.passportColor;
     type = TEAM_TYPE.BLOCKLET;
     owner = get(blocklet, 'settings.owner');
@@ -342,8 +346,8 @@ const getTeamInfo = async ({ node, nodeInfo, teamDid }) => {
     name,
     description,
     wallet,
+    permanentWallet,
     passportColor,
-    did: teamDid,
     owner,
     dataDir,
   };
@@ -423,7 +427,11 @@ const createInvitationRequest = async ({ node, nodeInfo, teamDid, inviteId, loca
     throw new Error('The invitation does not exist or has been used');
   }
 
-  const { name: issuerName, wallet: issuerWallet, passportColor } = await getTeamInfo({ node, nodeInfo, teamDid });
+  const {
+    name: issuerName,
+    wallet: issuerWallet,
+    passportColor,
+  } = await getApplicationInfo({ node, nodeInfo, teamDid });
 
   const passport = await createPassport({
     name: inviteInfo.role,
@@ -507,7 +515,7 @@ const handleInvitationResponse = async ({
     type: issuerType,
     passportColor,
     dataDir,
-  } = await getTeamInfo({ node, nodeInfo, teamDid });
+  } = await getApplicationInfo({ node, nodeInfo, teamDid });
 
   const { remark } = inviteInfo;
 
@@ -670,7 +678,7 @@ const createIssuePassportRequest = async ({ node, nodeInfo, teamDid, id, locale
     passportColor,
     owner: teamOwner,
     dataDir,
-  } = await getTeamInfo({ node, nodeInfo, teamDid });
+  } = await getApplicationInfo({ node, nodeInfo, teamDid });
 
   if (issuanceInfo.name === ROLES.OWNER && !!teamOwner) {
     throw new Error('Cannot receive owner passport because the owner already exists');
@@ -742,7 +750,7 @@ const handleIssuePassportResponse = async ({
     passportColor,
     owner: teamOwner,
     dataDir,
-  } = await getTeamInfo({ node, nodeInfo, teamDid });
+  } = await getApplicationInfo({ node, nodeInfo, teamDid });
 
   // get issuanceInfo from session
   const list = await node.getPassportIssuances({ teamDid });
@@ -894,7 +902,11 @@ const checkWalletVersion = ({ didwallet, locale = 'en' }) => {
 
 const getPassportStatus = async ({ node, teamDid, userDid, vcId, locale = 'en' }) => {
   const nodeInfo = await node.getNodeInfo();
-  const { wallet: issuerWallet, name: issuerName, type: issuerType } = await getTeamInfo({ node, nodeInfo, teamDid });
+  const {
+    wallet: issuerWallet,
+    name: issuerName,
+    type: issuerType,
+  } = await getApplicationInfo({ node, nodeInfo, teamDid });
 
   const actionLabel = {
     open: {
@@ -1031,7 +1043,7 @@ const setUserInfoHeaders = (req) => {
 
 module.exports = {
   getUser,
-  getTeamInfo,
+  getApplicationInfo,
   createAuthToken,
   createAuthTokenByOwnershipNFT,
   beforeInvitationRequest,

package/lib/lost-passport.js

@@ -29,7 +29,7 @@ const TEAM_TYPES = {
   NODE: 'node',
 };
 
-const getTeamInfo = async ({ type, node, req }) => {
+const getApplicationInfo = async ({ type, node, req }) => {
   let teamDid;
   let issuerDid;
   let issuerDidList;
@@ -100,7 +100,7 @@ const createLostPassportListRoute = ({ node, type }) => ({
   onAuth: async ({ userDid, extraParams, updateSession, req }) => {
     const { locale } = extraParams;
 
-    const { teamDid, issuerDidList, dataDir } = await getTeamInfo({ node, req, type });
+    const { teamDid, issuerDidList, dataDir } = await getApplicationInfo({ node, req, type });
 
     // check user approved
     const user = await getUser(node, teamDid, userDid);
@@ -161,7 +161,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
         const { locale, passportName, receiverDid } = extraParams;
         checkWalletVersion({ didwallet, locale });
 
-        const { teamDid, issuerDid, issuerName, passportColor, dataDir } = await getTeamInfo({
+        const { teamDid, issuerDid, issuerName, passportColor, dataDir } = await getApplicationInfo({
           node,
           req: request,
           type,
@@ -198,7 +198,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
   onAuth: async ({ claims, userDid, userPk, extraParams, updateSession, baseUrl, req }) => {
     const { locale = 'en', receiverDid, passportName } = extraParams;
 
-    const { teamDid, issuerDidList, issuerName, issuerWallet, passportColor, dataDir } = await getTeamInfo({
+    const { teamDid, issuerDidList, issuerName, issuerWallet, passportColor, dataDir } = await getApplicationInfo({
       node,
       req,
       type,

package/lib/server.js

@@ -367,7 +367,7 @@ const getRotateKeyPairClaims = (node) => {
         return {
           chainInfo,
           description: description[locale] || description.en,
-          target: blocklet.appPid,
+          target: blocklet.appDid,
         };
       },
     },
@@ -684,9 +684,14 @@ const createRotateKeyPairHandler =
       throw new Error(messages.invalidBlocklet[locale]);
     }
 
-    // Only the blocklet owner(identified by appPid) can rotate key pair
-    if (blocklet.appPid !== userDid) {
-      throw new Error(messages.notAllowed[locale]);
+    // Only the blocklet owner(identified by appDid) can rotate key pair
+    if (blocklet.appDid !== userDid) {
+      throw new Error(
+        {
+          zh: `只有 应用DID 所有者（${blocklet.appDid}）可以修改钥匙对. 当前用户：${userDid}`,
+          en: `Only the owner of AppDID (${blocklet.appDid}) can rotate key pair. Current User: ${userDid}`,
+        }[locale]
+      );
     }
 
     await node.configBlocklet(

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.69-beta-650a290b",
+  "version": "1.16.0-beta-b16cb035",
   "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": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.8.69-beta-650a290b",
-    "@abtnode/logger": "1.8.69-beta-650a290b",
-    "@abtnode/util": "1.8.69-beta-650a290b",
+    "@abtnode/constant": "1.16.0-beta-b16cb035",
+    "@abtnode/logger": "1.16.0-beta-b16cb035",
+    "@abtnode/util": "1.16.0-beta-b16cb035",
     "@arcblock/did": "1.18.59",
     "@arcblock/jwt": "^1.18.59",
     "@arcblock/vc": "1.18.59",
-    "@blocklet/constant": "1.8.69-beta-650a290b",
-    "@blocklet/meta": "1.8.69-beta-650a290b",
+    "@blocklet/constant": "1.16.0-beta-b16cb035",
+    "@blocklet/meta": "1.16.0-beta-b16cb035",
     "@ocap/client": "1.18.59",
     "@ocap/mcrypto": "1.18.59",
     "@ocap/util": "1.18.59",
@@ -43,5 +43,5 @@
   "devDependencies": {
     "jest": "^27.5.1"
   },
-  "gitHead": "a33c9ce6a52b8d522d13860e85809dcbba236712"
+  "gitHead": "138bd91aee5a35b28c2de4e1e924c44932efaf3a"
 }