@abtnode/auth 1.16.25-next-1e779575 → 1.16.25-next-3d78a4cb

package/lib/auth.js

@@ -100,7 +100,8 @@ const messages = {
   nftAlreadyUsed: getLocaleMap('nftAlreadyUsed'),
   missingNftClaim: getLocaleMap('missingNftClaim'),
   noNft: getLocaleMap('noNft'),
-  noTag: getLocaleMap('noTag'),
+  noLauncherDid: getLocaleMap('noLauncherDid'),
+  noNftDid: getLocaleMap('noNftDid'),
   noChainHost: getLocaleMap('noChainHost'),
   alreadyTransferred: getLocaleMap('alreadyTransferred'),
   delegateTransferOwnerNFT: getLocaleMap('delegateTransferOwnerNFT'),
@@ -176,6 +177,12 @@ const messages = {
     zh: (message) => `通行证状态检测失败：${message}`,
     'zh-TW': (message) => `通行證狀態檢測失敗：${message}`,
   },
+  /**
+   *
+   * @param {Parameters<typeof getLocaleMap>[1]} data
+   * @returns
+   */
+  cannotImportFromDidSpace: (data) => getLocaleMap('cannotImportFromDidSpace', data),
 };
 
 const PASSPORT_STATUS_KEY = 'passport-status';

package/lib/server.js

@@ -520,19 +520,25 @@ const getOwnershipNFTClaim = async (node, locale) => {
     throw new Error(messages.noNft[locale]);
   }
 
-  const tag = get(info, 'launcher.tag', '');
+  const launcherDid = get(info, 'launcher.did', '');
+  const nftDid = get(info, 'launcher.nftDid', '');
   const chainHost = get(info, 'launcher.chainHost', '');
-  if (!tag) {
-    throw new Error(messages.noTag[locale]);
+  if (!launcherDid) {
+    throw new Error(messages.noLauncherDid[locale]);
   }
+
+  if (!nftDid) {
+    throw new Error(messages.noNftDid[locale]);
+  }
+
   if (!chainHost) {
     throw new Error(messages.noChainHost[locale]);
   }
 
   return {
     description: messages.requestBlockletSpaceNFT[locale],
-    trustedIssuers: [info.ownerNft.issuer],
-    address: info.ownerNft.did,
+    trustedIssuers: [launcherDid],
+    address: nftDid,
   };
 };
 
@@ -960,7 +966,8 @@ const createServerlessInstallGuard = (node) => {
     }
 
     // check if launcher session consumed
-    if (launcherUrl && launcherSessionId) {
+    // 只在 launch serverless 时校验 launch session 的合法性
+    if (launcherUrl && launcherSessionId && info.mode === NODE_MODES.SERVERLESS) {
       if (await node.isLauncherSessionConsumed({ launcherUrl, launcherSessionId })) {
         throw new Error(messages.sessionAlreadyConsumed[locale]);
       }

package/lib/util/get-auth-method.js

@@ -1,7 +1,24 @@
 const get = require('lodash/get');
 
+const isServerLaunchedByLauncher = (info) =>
+  get(info, 'ownerNft.holder') &&
+  get(info, 'ownerNft.issuer') &&
+  get(info, 'launcher.tag') &&
+  get(info, 'launcher.chainHost') &&
+  get(info, 'launcher.did') === get(info, 'ownerNft.issuer');
+
 const getServerAuthMethod = (info, type, launcherSessionId = '', authorized = false) => {
   if (launcherSessionId) {
+    /*
+     * 需要用户提供 Ownership NFT 的情况:
+     * - 通过 Blocklet Launcher Launch
+     * - Server 是通过 Blocklet Launcher Launch 的
+     * - Server 没有初始化
+     */
+    if (isServerLaunchedByLauncher(info) && !info.initialized && type !== 'serverless') {
+      return 'nft';
+    }
+
     return 'launcher';
   }
 
@@ -17,13 +34,13 @@ const getServerAuthMethod = (info, type, launcherSessionId = '', authorized = fa
     return 'vc';
   }
 
-  if (
-    get(info, 'ownerNft.holder') &&
-    get(info, 'ownerNft.issuer') &&
-    get(info, 'launcher.tag') &&
-    get(info, 'launcher.chainHost') &&
-    get(info, 'launcher.did') === get(info, 'ownerNft.issuer')
-  ) {
+  /*
+   * 下面的情况也需要提供 NFT
+   * - 没有 launcherSessionId
+   * - Blocklet Server 没有初始化
+   * - Blocklet Server 是通过 Blocklet Launcher Launch
+   */
+  if (isServerLaunchedByLauncher(info)) {
     return 'nft';
   }
 

package/locales/ar.js

@@ -65,4 +65,7 @@ module.exports = {
   tagRequired: 'العلامة مطلوبة',
   appIsInProgress: 'التطبيق قيد التقدم، يرجى الانتظار حتى الانتهاء.',
   requestDidSpace: 'يرجى تفويض مساحة DID للاستمرار',
+  cannotImportFromDidSpace: 'غير قادر على إيجاد بيانات من الفضاء({spaceName}) التي يمكن استيرادها',
+  noLauncherDid: 'لم يتم العثور على المشغّل من معلومات مشغّل الخادم',
+  noNftDid: 'لم يتم العثور على NFT من معلومات مشغل الخادم',
 };

package/locales/de.js

@@ -65,4 +65,7 @@ module.exports = {
   tagRequired: 'Es ist ein Pflichtfeld',
   appIsInProgress: 'Die Anwendung befindet sich in Bearbeitung. Bitte warten Sie, bis sie abgeschlossen ist.',
   requestDidSpace: 'Bitte autorisieren Sie DID Space, um fortzufahren',
+  cannotImportFromDidSpace: 'Kann keine Daten aus dem Bereich({spaceName}) finden, die importiert werden können',
+  noLauncherDid: 'Launcher wurde nicht von der Server Launcher Info gefunden',
+  noNftDid: 'NFT wurde in den Server-Launcher-Informationen nicht gefunden',
 };

package/locales/en.js

@@ -57,7 +57,8 @@ module.exports = {
   nftAlreadyUsed: 'This NFT has already been connected to another user',
   missingNftClaim: 'Ownership NFT not provided',
   noNft: 'This server is not initialized to accept ownership NFT',
-  noTag: 'Tag not found from server launcher info',
+  noLauncherDid: 'Launcher DID not found from server launcher info',
+  noNftDid: 'NFT DID not found from server launcher info',
   noChainHost: 'chainHost not found from server launcher info',
   alreadyTransferred: 'The Blocklet Server already belongs to {owner}',
   delegateTransferOwnerNFT:
@@ -65,4 +66,5 @@ module.exports = {
   notAllowedTransferToSelf: 'Not allowed to transfer the Server to yourself',
   tagRequired: 'tag is required',
   appIsInProgress: 'The application is in progress, please wait for it to finish',
+  cannotImportFromDidSpace: 'Unable to find data from space({spaceName}) that can be imported',
 };

package/locales/es.js

@@ -65,4 +65,7 @@ module.exports = {
   tagRequired: 'La etiqueta es requerida',
   appIsInProgress: 'La aplicación está en progreso, por favor espere a que termine',
   requestDidSpace: 'Por favor, autoriza a DID Space para continuar',
+  cannotImportFromDidSpace: 'No se pueden encontrar datos para importar desde el espacio ({spaceName})',
+  noLauncherDid: 'El lanzador NO fue encontrado en la información del lanzador del servidor',
+  noNftDid: 'NFT DID no encontrada en el lanzador del servidor',
 };

package/locales/fr.js

@@ -66,4 +66,7 @@ module.exports = {
   tagRequired: 'Les balises sont obligatoires',
   appIsInProgress: "L'application est en cours, veuillez attendre qu'elle se termine.",
   requestDidSpace: 'Veuillez autoriser DID Space à continuer',
+  cannotImportFromDidSpace: "Impossible de trouver des données de l'espace({spaceName}) pouvant être importées",
+  noLauncherDid: "Launcher n'a pas été trouvé depuis les informations du serveur Launcher",
+  noNftDid: 'Aucun NFT trouvé dans les informations du lanceur de serveur',
 };

package/locales/hi.js

@@ -65,4 +65,7 @@ module.exports = {
   tagRequired: 'टैग आवश्यक है',
   appIsInProgress: 'ऐप्लीकेशन प्रगति में है, कृपया पूरा होने तक प्रतीक्षा करें।',
   requestDidSpace: 'कृपया DID स्थान की प्राधिकरणदिये जारी रखें',
+  cannotImportFromDidSpace: 'डेटास्पेस({spaceName}) से आयात किए जा सकने वाले डेटा को खोजने में असमर्थ',
+  noLauncherDid: 'Launcher सर्वर लॉन्चर जानकारी से नहीं मिला',
+  noNftDid: 'NFT सर्वर लॉन्चर जानकारी से नहीं मिला',
 };

package/locales/id.js

@@ -65,4 +65,7 @@ module.exports = {
   tagRequired: 'Tag diperlukan',
   appIsInProgress: 'Aplikasi ini sedang berjalan, mohon tunggu hingga selesai',
   requestDidSpace: 'Silakan otorisasi DID Space untuk melanjutkan',
+  cannotImportFromDidSpace: 'Tidak dapat menemukan data dari ruang({spaceName}) yang dapat diimport',
+  noLauncherDid: 'Launcher TIDAK ditemukan dari info launcher server',
+  noNftDid: 'NFT DID tidak ditemukan dari info peluncur server',
 };

package/locales/ja.js

@@ -65,4 +65,7 @@ module.exports = {
   tagRequired: 'タグは必須です',
   appIsInProgress: 'アプリケーションは進行中です。完了するまでお待ちください',
   requestDidSpace: '続行するためにDID Spaceへの承認をお願いします',
+  cannotImportFromDidSpace: 'スペース ({spaceName}) からインポートできるデータが見つかりません',
+  noLauncherDid: 'ランチャーがサーバーランチャー情報から見つかりませんでした',
+  noNftDid: 'NFT DID がサーバーランチャー情報から見つかりませんでした',
 };

package/locales/ko.js

@@ -65,4 +65,7 @@ module.exports = {
   tagRequired: '태그가 필요합니다',
   appIsInProgress: '애플리케이션 진행 중입니다. 완료될 때까지 기다려주세요',
   requestDidSpace: '계속하려면 DID Space를 인증해주세요',
+  cannotImportFromDidSpace: '공간({spaceName})에서 가져올 수 있는 데이터를 찾을 수 없습니다.',
+  noLauncherDid: '서버 런처 정보에서 런처를 찾지 못했습니다',
+  noNftDid: '서버 런처 정보에서 NFT DID를 찾지 못했습니다',
 };

package/locales/pt.js

@@ -65,4 +65,7 @@ module.exports = {
   tagRequired: 'A tag é necessária',
   appIsInProgress: 'O aplicativo está em progresso, por favor, aguarde até que ele termine',
   requestDidSpace: 'Por favor, autorize o DID Space a continuar',
+  cannotImportFromDidSpace: 'Não é possível encontrar dados do espaço({spaceName}) que podem ser importados',
+  noLauncherDid: 'Launcher NÃO foi encontrado nas informações do Launcher do servidor',
+  noNftDid: 'NFT DID não encontrado nas informações do iniciador do servidor',
 };

package/locales/ru.js

@@ -65,4 +65,7 @@ module.exports = {
   tagRequired: 'Требуется тег',
   appIsInProgress: 'Приложение находится в процессе, пожалуйста, подождите, пока оно закончится.',
   requestDidSpace: 'Пожалуйста, авторизуйте DID Space для продолжения',
+  cannotImportFromDidSpace: 'Не удалось найти данные в пространстве({spaceName}), которые можно импортировать',
+  noLauncherDid: 'Laucnher не был найден в информации о запуске сервера',
+  noNftDid: 'NFT не найден в информации о запускающем сервере',
 };

package/locales/th.js

@@ -65,4 +65,7 @@ module.exports = {
   tagRequired: 'ต้องใส่แท็ก',
   appIsInProgress: 'แอปพลิเคชันกำลังดำเนินการ โปรดรอให้เสร็จสิ้น',
   requestDidSpace: 'โปรดอนุญาตให้ DID Space ดำเนินการต่อ',
+  cannotImportFromDidSpace: 'ไม่สามารถค้นหาข้อมูลจากพื้นที่({spaceName}) ที่สามารถนำเข้า',
+  noLauncherDid: 'Launcher หาไม่พบจากข้อมูล launcher ของ server',
+  noNftDid: 'ไม่พบ NFT DID จากข้อมูลตัวเปิดใช้เซิร์ฟเวอร์',
 };

package/locales/vi.js

@@ -65,4 +65,7 @@ module.exports = {
   tagRequired: 'Tag là bắt buộc',
   appIsInProgress: 'Ứng dụng đang tiến hành, vui lòng đợi cho đến khi nó hoàn thành',
   requestDidSpace: 'Vui lòng cho phép DID Space tiếp tục',
+  cannotImportFromDidSpace: 'Không tìm thấy dữ liệu từ khoảng không({spaceName}) có thể nhập',
+  noLauncherDid: 'Launcher KHÔNG tìm thấy từ thông tin launcher của máy chủ',
+  noNftDid: 'NFT DID không tìm thấy từ thông tin trình khởi chạy máy chủ',
 };

package/locales/zh-tw.js

@@ -63,4 +63,7 @@ module.exports = {
   tagRequired: '需要標籤',
   appIsInProgress: '應用程式正在進行中，請等待完成',
   requestDidSpace: '請授權DID Space繼續',
+  cannotImportFromDidSpace: '無法找到可從空間 ({spaceName}) 匯入的資料',
+  noLauncherDid: '從伺服器啟動器資訊中沒有發現啟動器',
+  noNftDid: 'NFT DID 沒有在伺服器啟動程式資訊中找到',
 };

package/locales/zh.js

@@ -63,4 +63,7 @@ module.exports = {
   notAllowedTransferToSelf: '不能将节点转移给自己',
   tagRequired: 'tag 不能为空',
   appIsInProgress: '应用正在进行中，请等待完成',
+  cannotImportFromDidSpace: '无法从 DID Space({spaceName}) 中找到可以导入的数据',
+  noLauncherDid: '从服务器启动器信息中没有发现启动器',
+  noNftDid: 'NFT DID 没有在服务器启动程序信息中找到',
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.25-next-1e779575",
+  "version": "1.16.25-next-3d78a4cb",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,17 +20,17 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.25-next-1e779575",
-    "@abtnode/logger": "1.16.25-next-1e779575",
-    "@abtnode/util": "1.16.25-next-1e779575",
+    "@abtnode/constant": "1.16.25-next-3d78a4cb",
+    "@abtnode/logger": "1.16.25-next-3d78a4cb",
+    "@abtnode/util": "1.16.25-next-3d78a4cb",
     "@arcblock/did": "1.18.113",
     "@arcblock/jwt": "^1.18.113",
-    "@arcblock/nft-display": "^2.9.54",
+    "@arcblock/nft-display": "^2.9.60",
     "@arcblock/validator": "^1.18.113",
     "@arcblock/vc": "1.18.113",
-    "@blocklet/constant": "1.16.25-next-1e779575",
-    "@blocklet/meta": "1.16.25-next-1e779575",
-    "@blocklet/sdk": "1.16.25-next-1e779575",
+    "@blocklet/constant": "1.16.25-next-3d78a4cb",
+    "@blocklet/meta": "1.16.25-next-3d78a4cb",
+    "@blocklet/sdk": "1.16.25-next-3d78a4cb",
     "@ocap/client": "^1.18.113",
     "@ocap/mcrypto": "1.18.113",
     "@ocap/util": "1.18.113",
@@ -51,5 +51,5 @@
   "devDependencies": {
     "jest": "^29.7.0"
   },
-  "gitHead": "a850cb40b003798c7bf6dbbf7546e2feabd85243"
+  "gitHead": "26b43891e46756b142bcd6b62c57357c7c23cf2f"
 }