@abtnode/blocklet-services 1.16.0 → 1.16.1-beta-cd775909

package/api/libs/connect/session.js

@@ -31,7 +31,7 @@ const {
   createPassport,
   upsertToPassports,
 } = require('@abtnode/auth/lib/passport');
-const { getKeyPairClaim } = require('@abtnode/auth/lib/server');
+const { getKeyPairClaim, getAuthPrincipalForMigrateAppToV2 } = require('@abtnode/auth/lib/server');
 const sortBy = require('lodash/sortBy');
 const last = require('lodash/last');
 const merge = require('lodash/merge');
@@ -699,24 +699,30 @@ module.exports = {
   },
 
   migrateToStructV2: {
-    getClaims: ({ node }) => ({
-      verifiableCredential: async ({ extraParams: { locale }, context: { request } }) => {
-        const blocklet = await request.getBlocklet();
-        const { wallet } = await request.getBlockletInfo();
-
-        const trustedPassports = (blocklet.trustedPassports || []).map((x) => x.issuerDid);
-        const trustedIssuers = [wallet.address, ...trustedPassports].filter(Boolean);
-
-        return {
-          type: 'verifiableCredential',
-          description: messages.requestPassport[locale],
-          item: vcTypes,
-          trustedIssuers,
-          optional: false,
-        };
+    authPrincipal: false,
+    getClaims: ({ node }) => [
+      {
+        authPrincipal: getAuthPrincipalForMigrateAppToV2(node),
+      },
+      {
+        verifiableCredential: async ({ extraParams: { locale }, context: { request } }) => {
+          const blocklet = await request.getBlocklet();
+          const { wallet } = await request.getBlockletInfo();
+
+          const trustedPassports = (blocklet.trustedPassports || []).map((x) => x.issuerDid);
+          const trustedIssuers = [wallet.address, ...trustedPassports].filter(Boolean);
+
+          return {
+            type: 'verifiableCredential',
+            description: messages.requestPassport[locale],
+            item: vcTypes,
+            trustedIssuers,
+            optional: false,
+          };
+        },
+        keyPair: getKeyPairClaim(node, false),
       },
-      keyPair: getKeyPairClaim({ node }),
-    }),
+    ],
 
     onAuth: async ({ claims, challenge, userDid, extraParams: { locale }, req, node }) => {
       const blocklet = await req.getBlocklet();

package/api/services/auth/connect/migrate-app-to-struct-v2.js

@@ -7,13 +7,15 @@ const { AUTH_CERT_TYPE } = require('@abtnode/constant');
 
 const { migrateToStructV2 } = require('../../../libs/connect/session');
 
-const { getClaims, onAuth } = migrateToStructV2;
+const { getClaims, onAuth, authPrincipal } = migrateToStructV2;
 
 module.exports = function createRoutes(node, options) {
   return {
     action: 'migrate-app-to-struct-v2',
 
-    claims: getClaims(node),
+    authPrincipal,
+
+    claims: getClaims({ node }),
 
     onAuth: async ({ claims, challenge, userDid, extraParams: { locale }, req }) => {
       try {

package/build/asset-manifest.json

@@ -1,14 +1,14 @@
 {
   "files": {
     "main.css": "/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css",
-    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.442ab08d.js",
+    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.528ceb09.js",
     "static/js/716.e1534c42.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/716.e1534c42.chunk.js",
     "static/js/255.279b1bca.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/255.279b1bca.chunk.js",
     "static/js/371.88127b62.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/371.88127b62.chunk.js",
     "static/js/737.ed53dec5.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/737.ed53dec5.chunk.js",
     "static/js/460.97b02ba6.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/460.97b02ba6.chunk.js",
     "static/js/868.f2fac071.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/868.f2fac071.chunk.js",
-    "static/js/343.4f9f63d5.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/343.4f9f63d5.chunk.js",
+    "static/js/343.d32e3136.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/343.d32e3136.chunk.js",
     "static/js/682.c64ae291.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/682.c64ae291.chunk.js",
     "static/js/711.6c22b7c7.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/711.6c22b7c7.chunk.js",
     "static/js/437.d815f0c0.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/437.d815f0c0.chunk.js",
@@ -42,14 +42,14 @@
     "router-template-styles/styles.css": "/.blocklet/proxy/blocklet-service/router-template-styles/styles.css",
     "index.html": "/.blocklet/proxy/blocklet-service/index.html",
     "main.632501d5.css.map": "/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css.map",
-    "main.442ab08d.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.442ab08d.js.map",
+    "main.528ceb09.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.528ceb09.js.map",
     "716.e1534c42.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/716.e1534c42.chunk.js.map",
     "255.279b1bca.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/255.279b1bca.chunk.js.map",
     "371.88127b62.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/371.88127b62.chunk.js.map",
     "737.ed53dec5.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/737.ed53dec5.chunk.js.map",
     "460.97b02ba6.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/460.97b02ba6.chunk.js.map",
     "868.f2fac071.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/868.f2fac071.chunk.js.map",
-    "343.4f9f63d5.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/343.4f9f63d5.chunk.js.map",
+    "343.d32e3136.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/343.d32e3136.chunk.js.map",
     "682.c64ae291.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/682.c64ae291.chunk.js.map",
     "711.6c22b7c7.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/711.6c22b7c7.chunk.js.map",
     "437.d815f0c0.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/437.d815f0c0.chunk.js.map",
@@ -64,6 +64,6 @@
   },
   "entrypoints": [
     "static/css/main.632501d5.css",
-    "static/js/main.442ab08d.js"
+    "static/js/main.528ceb09.js"
   ]
 }

package/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/><meta name="theme-color" content="#000000"/><title>Blocklet Service</title><script src=".well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.blocklet/proxy/blocklet-service/static/js/main.442ab08d.js"></script><link href="/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/><meta name="theme-color" content="#000000"/><title>Blocklet Service</title><script src=".well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.blocklet/proxy/blocklet-service/static/js/main.528ceb09.js"></script><link href="/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>