@abtnode/auth 1.7.10 → 1.7.13

package/lib/auth.js

@@ -3,6 +3,7 @@ const semver = require('semver');
 const joinUrl = require('url-join');
 const get = require('lodash/get');
 const { verifyPresentation, createCredentialList } = require('@arcblock/vc');
+const formatContext = require('@abtnode/util/lib/format-context');
 const Mcrypto = require('@ocap/mcrypto');
 const { fromSecretKey, WalletType } = require('@ocap/wallet');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
@@ -360,6 +361,7 @@ const createInvitationRequest = async ({ node, nodeInfo, teamDid, inviteId, loca
 };
 
 const handleInvitationResponse = async ({
+  req = {},
   node,
   nodeInfo,
   teamDid,
@@ -423,7 +425,7 @@ const handleInvitationResponse = async ({
   const user = await getUser(node, teamDid, userDid);
 
   if (user) {
-    await node.updateUser({
+    const doc = await node.updateUser({
       teamDid,
       user: {
         ...profile,
@@ -435,8 +437,17 @@ const handleInvitationResponse = async ({
         remark,
       },
     });
+    await node.createAuditLog(
+      {
+        action: 'updateUser',
+        args: { teamDid, userDid, passport, inviteId, reason: 'accepted invitation' },
+        context: formatContext(Object.assign(req, { user })),
+        result: doc,
+      },
+      node
+    );
   } else {
-    await node.addUser({
+    const doc = await node.addUser({
       teamDid,
       user: {
         ...profile,
@@ -450,6 +461,15 @@ const handleInvitationResponse = async ({
         remark,
       },
     });
+    await node.createAuditLog(
+      {
+        action: 'addUser',
+        args: { teamDid, userDid, passport, inviteId, reason: 'accepted invitation' },
+        context: formatContext(Object.assign(req, { user: doc })),
+        result: doc,
+      },
+      node
+    );
   }
 
   logger.info('login.success', { userDid });
@@ -531,6 +551,7 @@ const createIssuePassportRequest = async ({ node, nodeInfo, teamDid, id, locale
  * @param {string} statusEndpointBaseUrl passport status endpoint base url
  */
 const handleIssuePassportResponse = async ({
+  req = {},
   node,
   nodeInfo,
   teamDid,
@@ -619,7 +640,16 @@ const handleIssuePassportResponse = async ({
   }
 
   // delete session
-  await node.processPassportIssuance({ teamDid, sessionId: id });
+  const result = await node.processPassportIssuance({ teamDid, sessionId: id });
+  await node.createAuditLog(
+    {
+      action: 'processPassportIssuance',
+      args: { teamDid, userDid, ...result, sessionId: id, reason: 'claimed passport' },
+      context: formatContext(Object.assign(req, { user })),
+      result,
+    },
+    node
+  );
 
   if (name === ROLES.OWNER && issuerType === 'blocklet') {
     logger.info('Bind owner for blocklet', { teamDid, userDid });

package/lib/lost-passport.js

@@ -1,6 +1,7 @@
 const joinUrl = require('url-join');
 const uniqBy = require('lodash/uniqBy');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
+const formatContext = require('@abtnode/util/lib/format-context');
 const getRandomMessage = require('@abtnode/util/lib/get-random-message');
 const getNodeWallet = require('@abtnode/util/lib/get-app-wallet');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
@@ -255,15 +256,25 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
     const vc = createPassportVC(vcParams);
 
     const role = getRoleFromLocalPassport(get(vc, 'credentialSubject.passport'));
+    const passport = createUserPassport(vc, { role });
 
-    await node.updateUser({
+    const result = await node.updateUser({
       teamDid,
       user: {
         did: userDid,
         pk: userPk,
-        passports: upsertToPassports(user.passports || [], createUserPassport(vc, { role })),
+        passports: upsertToPassports(user.passports || [], passport),
       },
     });
+    await node.createAuditLog(
+      {
+        action: 'updateUser',
+        args: { teamDid, userDid, passport, reason: 'recovered passport' },
+        context: formatContext(Object.assign(req, { user })),
+        result,
+      },
+      node
+    );
 
     return {
       disposition: 'attachment',

package/lib/server.js

@@ -4,6 +4,7 @@ const Client = require('@ocap/client');
 const { fromPublicKey } = require('@ocap/wallet');
 const { fromBase58, toAddress } = require('@ocap/util');
 const { toTypeInfo, isFromPublicKey } = require('@arcblock/did');
+const formatContext = require('@abtnode/util/lib/format-context');
 const semver = require('semver');
 const {
   ROLES,
@@ -274,12 +275,19 @@ const ensureBlockletPermission = async ({ authMethod, node, userDid, claims, cha
 
 const createLaunchBlockletHandler =
   (node, authMethod) =>
-  async ({ claims, challenge, userDid, updateSession, extraParams: { locale, blockletMetaUrl } }) => {
+  async ({ claims, challenge, userDid, updateSession, req, extraParams: { locale, blockletMetaUrl } }) => {
     if (!blockletMetaUrl) {
       throw new Error(messages.invalidParams[locale]);
     }
 
-    const { role, passport } = await ensureBlockletPermission({ authMethod, node, userDid, claims, challenge, locale });
+    const { role, passport, user } = await ensureBlockletPermission({
+      authMethod,
+      node,
+      userDid,
+      claims,
+      challenge,
+      locale,
+    });
 
     const result = await node.getBlockletMetaFromUrl({ url: blockletMetaUrl, checkPrice: true });
     if (!result.meta) {
@@ -357,7 +365,16 @@ const createLaunchBlockletHandler =
       context.blockletPurchaseVerified = blockletPurchaseVerified;
     }
 
-    await node.installBlocklet({ url: blockletMetaUrl }, context);
+    const tmp = await node.installBlocklet({ url: blockletMetaUrl }, context);
+    await node.createAuditLog(
+      {
+        action: 'installBlocklet',
+        args: { url: blockletMetaUrl },
+        context: formatContext(Object.assign(req, { user })),
+        result: tmp,
+      },
+      node
+    );
     logger.info('start install blocklet', { did });
   };
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.10",
+  "version": "1.7.13",
   "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.10",
-    "@abtnode/logger": "1.7.10",
-    "@abtnode/util": "1.7.10",
-    "@arcblock/did": "^1.16.5",
-    "@arcblock/vc": "^1.16.5",
-    "@blocklet/meta": "1.7.10",
-    "@ocap/client": "1.16.5",
-    "@ocap/mcrypto": "^1.16.5",
-    "@ocap/util": "^1.16.5",
-    "@ocap/wallet": "^1.16.5",
+    "@abtnode/constant": "1.7.13",
+    "@abtnode/logger": "1.7.13",
+    "@abtnode/util": "1.7.13",
+    "@arcblock/did": "^1.16.6",
+    "@arcblock/vc": "^1.16.6",
+    "@blocklet/meta": "1.7.13",
+    "@ocap/client": "1.16.6",
+    "@ocap/mcrypto": "^1.16.6",
+    "@ocap/util": "^1.16.6",
+    "@ocap/wallet": "^1.16.6",
     "axios": "^0.26.1",
     "joi": "^17.6.0",
     "jsonwebtoken": "^8.5.1",
@@ -40,5 +40,5 @@
   "devDependencies": {
     "jest": "^27.4.5"
   },
-  "gitHead": "8eab10fd39b6183a2fa4d2706f52e8b2ecaa059a"
+  "gitHead": "c35c485417df0e023c06c09557644b46a6c8c655"
 }