@abtnode/core 1.16.30-beta-e7a90fb2 → 1.16.31-beta-52250475

package/lib/states/user.js

@@ -206,17 +206,19 @@ class User extends ExtendBase {
       }
     }
 
+    const replacements = {};
+
     if (role && role !== '$all' && !where.did) {
+      replacements.status = PASSPORT_STATUS.VALID;
       if (role === '$none') {
         where.did = {
-          [Op.notIn]: Sequelize.literal(
-            `(SELECT DISTINCT userDid FROM passports WHERE status = '${PASSPORT_STATUS.VALID}')`
-          ),
+          [Op.notIn]: Sequelize.literal('(SELECT DISTINCT userDid FROM passports WHERE status = :status)'),
         };
       } else {
+        replacements.role = role;
         where.did = {
           [Op.in]: Sequelize.literal(
-            `(SELECT DISTINCT userDid FROM passports WHERE name = '${role}' AND status = '${PASSPORT_STATUS.VALID}')`
+            '(SELECT DISTINCT userDid FROM passports WHERE name = :role AND status = :status)'
           ),
         };
       }
@@ -246,7 +248,8 @@ class User extends ExtendBase {
         required: false,
       });
     }
-    const result = await this.paginate({ where, include }, sorting, paging);
+
+    const result = await this.paginate({ where, include, replacements }, sorting, paging);
     return result;
   }
 
@@ -287,11 +290,10 @@ class User extends ExtendBase {
       return this.count({
         where: {
           did: {
-            [Op.notIn]: Sequelize.literal(
-              `(SELECT DISTINCT userDid FROM passports WHERE status = '${PASSPORT_STATUS.VALID}')`
-            ),
+            [Op.notIn]: Sequelize.literal('(SELECT DISTINCT userDid FROM passports WHERE status = :status)'),
           },
         },
+        replacements: { status: PASSPORT_STATUS.VALID },
       });
     }
 
@@ -305,10 +307,11 @@ class User extends ExtendBase {
       where: {
         did: {
           [Op.in]: Sequelize.literal(
-            `(SELECT DISTINCT userDid FROM passports WHERE name = '${name}' AND status = '${status}')`
+            '(SELECT DISTINCT userDid FROM passports WHERE name = :name AND status = :status)'
           ),
         },
       },
+      replacements: { name, status },
     });
   }
 

package/lib/util/index.js

@@ -354,7 +354,7 @@ const getStateCrons = (states) => [
     options: { runOnInit: false },
     fn: async () => {
       const removed = await states.auditLog.remove({
-        createdAt: { $lt: new Date(Date.now() - 1000 * 60 * 60 * 24 * 90) },
+        createdAt: { $lt: new Date(Date.now() - 1000 * 60 * 60 * 24 * 365) },
       });
       logger.info(`Removed ${removed} audit logs`);
     },

package/lib/util/launcher.js

@@ -311,7 +311,7 @@ const setupAppOwner = async ({ node, sessionId, justCreate = false, context }) =
   logger.info('Create owner for blocklet', { appDid, ownerDid, sessionId });
 
   // create owner login token that can be used to login on blocklet site
-  const appSecret = Hasher.SHA3.hash256(Buffer.concat([wallet.secretKey, wallet.address].map(Buffer.from)));
+  const appSecret = Hasher.SHA3.hash256(Buffer.concat([wallet.secretKey, wallet.address].map((v) => Buffer.from(v))));
   const setupToken = createAuthToken({
     did: ownerDid,
     passport,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.30-beta-e7a90fb2",
+  "version": "1.16.31-beta-52250475",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.30-beta-e7a90fb2",
-    "@abtnode/auth": "1.16.30-beta-e7a90fb2",
-    "@abtnode/certificate-manager": "1.16.30-beta-e7a90fb2",
-    "@abtnode/constant": "1.16.30-beta-e7a90fb2",
-    "@abtnode/cron": "1.16.30-beta-e7a90fb2",
-    "@abtnode/logger": "1.16.30-beta-e7a90fb2",
-    "@abtnode/models": "1.16.30-beta-e7a90fb2",
-    "@abtnode/queue": "1.16.30-beta-e7a90fb2",
-    "@abtnode/rbac": "1.16.30-beta-e7a90fb2",
-    "@abtnode/router-provider": "1.16.30-beta-e7a90fb2",
-    "@abtnode/static-server": "1.16.30-beta-e7a90fb2",
-    "@abtnode/timemachine": "1.16.30-beta-e7a90fb2",
-    "@abtnode/util": "1.16.30-beta-e7a90fb2",
+    "@abtnode/analytics": "1.16.31-beta-52250475",
+    "@abtnode/auth": "1.16.31-beta-52250475",
+    "@abtnode/certificate-manager": "1.16.31-beta-52250475",
+    "@abtnode/constant": "1.16.31-beta-52250475",
+    "@abtnode/cron": "1.16.31-beta-52250475",
+    "@abtnode/logger": "1.16.31-beta-52250475",
+    "@abtnode/models": "1.16.31-beta-52250475",
+    "@abtnode/queue": "1.16.31-beta-52250475",
+    "@abtnode/rbac": "1.16.31-beta-52250475",
+    "@abtnode/router-provider": "1.16.31-beta-52250475",
+    "@abtnode/static-server": "1.16.31-beta-52250475",
+    "@abtnode/timemachine": "1.16.31-beta-52250475",
+    "@abtnode/util": "1.16.31-beta-52250475",
     "@arcblock/did": "1.18.132",
     "@arcblock/did-auth": "1.18.132",
     "@arcblock/did-ext": "^1.18.132",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.132",
     "@arcblock/vc": "1.18.132",
-    "@blocklet/constant": "1.16.30-beta-e7a90fb2",
-    "@blocklet/env": "1.16.30-beta-e7a90fb2",
-    "@blocklet/meta": "1.16.30-beta-e7a90fb2",
-    "@blocklet/resolver": "1.16.30-beta-e7a90fb2",
-    "@blocklet/sdk": "1.16.30-beta-e7a90fb2",
-    "@blocklet/store": "1.16.30-beta-e7a90fb2",
+    "@blocklet/constant": "1.16.31-beta-52250475",
+    "@blocklet/env": "1.16.31-beta-52250475",
+    "@blocklet/meta": "1.16.31-beta-52250475",
+    "@blocklet/resolver": "1.16.31-beta-52250475",
+    "@blocklet/sdk": "1.16.31-beta-52250475",
+    "@blocklet/store": "1.16.31-beta-52250475",
     "@did-space/client": "^0.5.28",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.132",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "c97ba97d694f553afc9f5336c9f3ddfae73cf955"
+  "gitHead": "26155b86f103f9e64fd8a23b7fffdb279c71209c"
 }