@abtnode/auth 1.16.21-beta-93c6e42b → 1.16.21-beta-da3f852a

package/lib/auth.js

@@ -26,6 +26,7 @@ const { LOGIN_PROVIDER } = require('@blocklet/constant');
 
 const logger = require('./logger');
 const verifySignature = require('./util/verify-signature');
+const { getLocaleMap } = require('../locales');
 const {
   createPassport,
   createPassportVC,
@@ -37,274 +38,142 @@ const {
 const createPassportSvg = require('./util/create-passport-svg');
 
 const messages = {
-  description: {
-    en: 'Connect your DID Wallet',
-    zh: '连接 DID 钱包',
-  },
-  requestProfile: {
-    en: 'Please provide following information to continue',
-    zh: '请提供如下信息以继续',
-  },
-  requestNFT: {
-    en: 'Please present NFT to exchange for passport',
-    zh: '请提供 NFT 以换取通行证',
-  },
-  requestCredential: {
-    en: 'Please provide credential',
-    zh: '请提供凭证',
-  },
-  requestPassport: {
-    en: 'Please provide passport',
-    zh: '请提供通行证',
-  },
-  requestOwnerPassport: {
-    en: 'Please provide owner passport',
-    zh: '请提供节点的所有者通行证',
-  },
-  requestBlockletNft: {
-    en: 'Please provide Blocklet Purchase NFT',
-    zh: '请提供 Blocklet Purchase NFT',
-  },
-  receivePassport: {
-    en: 'Please sign the text to get passport',
-    ah: '请对文本签名以获取通行证',
-  },
+  description: getLocaleMap('description'),
+  requestProfile: getLocaleMap('requestProfile'),
+  requestNFT: getLocaleMap('requestNFT'),
+  requestCredential: getLocaleMap('requestCredential'),
+  requestPassport: getLocaleMap('requestPassport'),
+  requestOwnerPassport: getLocaleMap('requestOwnerPassport'),
+  requestBlockletNft: getLocaleMap('requestBlockletNft'),
+  receivePassport: getLocaleMap('receivePassport'),
 
   // error
-  actionForbidden: {
-    en: 'You are not allowed perform this action',
-    zh: '你没有权限执行此操作',
-  },
+  actionForbidden: getLocaleMap('actionForbidden'),
+
+  notInitialized: getLocaleMap('notInitialized'),
+  appNotInitialized: getLocaleMap('appNotInitialized'),
+  alreadyInitiated: getLocaleMap('alreadyInitiated'),
+  notAllowed: getLocaleMap('notAllowed'),
+  notAppOwner: getLocaleMap('notAppOwner'),
+  notSupported: getLocaleMap('notSupported'),
+  missingCredentialClaim: getLocaleMap('missingCredentialClaim'),
+  missingBlockletCredentialClaim: getLocaleMap('missingBlockletCredentialClaim'),
+  missingChallenge: getLocaleMap('missingChallenge'),
+  invalidCredentialHolder: getLocaleMap('invalidCredentialHolder'),
+  invalidCredentialProof: getLocaleMap('invalidCredentialProof'),
+  notOwner: getLocaleMap('notOwner'),
+  userMismatch: getLocaleMap('userMismatch'),
+  lowVersion: getLocaleMap('lowVersion'),
+
+  unKnownStatus: getLocaleMap('unKnownStatus'),
+  statusNotFound: getLocaleMap('statusNotFound'),
+  statusLabel: getLocaleMap('statusLabel'),
+  passportNotFound: getLocaleMap('passportNotFound'),
+  userNotFound: getLocaleMap('userNotFound'),
+  notAuthorized: getLocaleMap('notAuthorized'),
+  invalidParams: getLocaleMap('invalidParams'),
+  missingKeyPair: getLocaleMap('missingKeyPair'),
+  missingBlockletUrl: getLocaleMap('missingBlockletUrl'),
+  missingBlockletDid: getLocaleMap('missingBlockletDid'),
+  missingChainHost: getLocaleMap('missingChainHost'),
+  missingLauncherSession: getLocaleMap('missingLauncherSession'),
+  invalidBlocklet: getLocaleMap('invalidBlocklet'),
+  blockletExists: getLocaleMap('blockletExists'),
+  invalidBlockletVc: getLocaleMap('invalidBlockletVc'),
+  invalidAppVersion: getLocaleMap('invalidAppVersion'),
 
-  notInitialized: {
-    en: 'This node is not initialized, login is disabled',
-    zh: '节点初始化未完成，禁止任何 DID 登录',
-  },
-  appNotInitialized: {
-    en: 'This application is not initialized',
-    zh: '应用未初始化未完成',
-  },
-  alreadyInitiated: {
-    en: 'This Node already have an owner verified',
-    zh: '该节点已经绑定所有者',
-  },
-  notAllowed: {
-    en: 'You are not allowed to login to this node',
-    zh: '你没有权限登录该节点',
-  },
-  notAppOwner: {
-    en: 'You are not the owner of this application',
-    zh: '你不是该应用的所有者',
-  },
-  notSupported: {
-    en: 'This application is not supported on this server',
-    zh: '此应用不支持在当前节点安装',
-  },
-  missingCredentialClaim: {
-    en: 'Credential is not provided',
-    zh: '请提供凭证',
-  },
-  missingBlockletCredentialClaim: {
-    en: 'Blocklet credential is not provided',
-    zh: '请提供 Blocklet 凭证',
-  },
-  missingChallenge: {
-    en: 'Credential presentation does not include valid challenge',
-    zh: '凭证中缺少正确的随机因子',
-  },
+  // NFT related
+  missingProfileClaim: getLocaleMap('missingProfileClaim'),
+  invalidNftClaim: getLocaleMap('invalidNftClaim'),
+  invalidNft: getLocaleMap('invalidNft'),
+  invalidNftHolder: getLocaleMap('invalidNftHolder'),
+  invalidNftProof: getLocaleMap('invalidNftProof'),
+  invalidNftIssuer: getLocaleMap('invalidNftIssuer'),
+  invalidNftParent: getLocaleMap('invalidNftParent'),
+  tagNotMatch: getLocaleMap('tagNotMatch'),
+  requestBlockletSpaceNFT: getLocaleMap('requestBlockletSpaceNFT'),
+  blockletSpaceNftIdRequired: getLocaleMap('blockletSpaceNftIdRequired'),
+  nftAlreadyConsumed: getLocaleMap('nftAlreadyConsumed'),
+  sessionAlreadyConsumed: getLocaleMap('sessionAlreadyConsumed'),
+  nftAlreadyExpired: getLocaleMap('nftAlreadyExpired'),
+  nftAlreadyUsed: getLocaleMap('nftAlreadyUsed'),
+  missingNftClaim: getLocaleMap('missingNftClaim'),
+  noNft: getLocaleMap('noNft'),
+  noTag: getLocaleMap('noTag'),
+  noChainHost: getLocaleMap('noChainHost'),
+  alreadyTransferred: getLocaleMap('alreadyTransferred'),
+  delegateTransferOwnerNFT: getLocaleMap('delegateTransferOwnerNFT'),
+  notAllowedTransferToSelf: getLocaleMap('notAllowedTransferToSelf'),
+  tagRequired: getLocaleMap('tagRequired'),
+  appIsInProgress: getLocaleMap('appIsInProgress'),
+  // 以后新增的文本尽量使用 `hello {name}` 的模版方式, 而不是函数
   invalidCredentialType: {
+    ar: (types) => `نوع الاعتماد غير صالح ، يتوقع ${types.join(' أو ')}`,
+    de: (types) => `Ungültiger Anmeldeinformationstyp, erwarte ${types.join(' oder ')}`,
+    es: (types) => `Tipo de credencial no válido, espera ${types.join(' o ')}`,
     en: (types) => `Invalid credential type, expect ${types.join(' or ')}`,
+    fr: (types) => `Type de justificatif invalide, attendre ${types.join(' ou ')}`,
+    hi: (types) => `अमान्य प्रमाणीकरण प्रकार, ${types.join(' या ')}`,
+    id: (types) => `Jenis kredensial tidak valid, harap ${types.join(' atau ')}`,
+    ja: (types) => `無効な資格情報タイプ、${types.join(' または ')}`,
+    ko: (types) => `잘못된 자격 증명 유형, ${types.join(' 또는 ')}`,
+    pt: (types) => `Tipo de credencial inválido, espera ${types.join(' ou ')}`,
+    ru: (types) => `Неверный тип учетных данных, ожидается ${types.join(' или ')}`,
+    th: (types) => `ประเภทข้อมูลประจำตัวไม่ถูกต้อง ต้องการ ${types.join(' หรือ ')}`,
+    vi: (types) => `Loại chứng chỉ không hợp lệ, mong đợi ${types.join(' hoặc ')}`,
     zh: (types) => `无效的凭证类型，必须是 ${types.join(' 或 ')}`,
+    'zh-TW': (types) => `無效的憑證類型，必須是 ${types.join(' 或 ')}`,
   },
   invalidCredentialId: {
+    ar: (ids) => `المعرف غير صالح: ${[].concat(ids).join(' أو ')}`,
+    de: (ids) => `Ungültige ID: ${[].concat(ids).join(' oder ')}`,
     en: (ids) => `Invalid credential type, expect ${[].concat(ids).join(' or ')}`,
+    es: (ids) => `ID no válida: ${[].concat(ids).join(' o ')}`,
+    fr: (ids) => `ID non valide: ${[].concat(ids).join(' ou ')}`,
+    hi: (ids) => `अमान्य परिचय: ${[].concat(ids).join(' या ')}`,
+    id: (ids) => `ID tidak valid: ${[].concat(ids).join(' atau ')}`,
+    ja: (ids) => `無効なID：${[].concat(ids).join('または')}`,
+    ko: (ids) => `잘못된 ID: ${[].concat(ids).join(' 또는 ')}`,
+    pt: (ids) => `ID inválido: ${[].concat(ids).join(' ou ')}`,
+    ru: (ids) => `Неверный идентификатор: ${[].concat(ids).join(' или ')}`,
+    th: (ids) => `รหัสไม่ถูกต้อง: ${[].concat(ids).join(' หรือ ')}`,
+    vi: (ids) => `ID không hợp lệ: ${[].concat(ids).join(' hoặc ')}`,
     zh: (ids) => `无效的凭证，ID 必须是 ${[].concat(ids).join(' 或 ')}`,
-  },
-  invalidCredentialHolder: {
-    en: 'Invalid credential holder',
-    zh: '无效的凭证持有者',
-  },
-  invalidCredentialProof: {
-    en: 'Invalid credential signature proof',
-    zh: '无效的凭证签名',
+    'zh-TW': (ids) => `無效的憑證，ID 必須是 ${[].concat(ids).join(' 或 ')}`,
   },
   passportRevoked: {
+    ar: (title, issuer) => `تم إلغاء جواز السفر ${title} من قبل ${issuer ? ' ' : ''}${issuer || ''}`,
+    de: (title, issuer) => `Pass ${title} wurde von ${issuer ? ' ' : ''}${issuer || ''} widerrufen`,
+    es: (title, issuer) => `Pasaporte ${title} ha sido revocado por ${issuer ? ' ' : ''}${issuer || ''}`,
     en: (title, issuer) => `Passport ${title} has been revoked${issuer ? ' by ' : ''}${issuer || ''}`,
+    fr: (title, issuer) => `Le passeport ${title} a été révoqué par ${issuer ? ' ' : ''}${issuer || ''}`,
+    hi: (title, issuer) => `पासपोर्ट ${title} को ${issuer ? ' ' : ''}${issuer || ''} द्वारा रद्द कर दिया गया है`,
+    id: (title, issuer) => `Paspor ${title} telah dicabut oleh ${issuer ? ' ' : ''}${issuer || ''}`,
+    ja: (title, issuer) => `パスポート ${title} は ${issuer ? ' ' : ''}${issuer || ''} によって取り消されました`,
+    ko: (title, issuer) => `여권 ${title} 은 ${issuer ? ' ' : ''}${issuer || ''} 에 의해 취소되었습니다`,
+    pt: (title, issuer) => `O passaporte ${title} foi revogado por ${issuer ? ' ' : ''}${issuer || ''}`,
+    ru: (title, issuer) => `Паспорт ${title} был отозван ${issuer ? ' ' : ''}${issuer || ''}`,
+    th: (title, issuer) => `หนังสือเดินทาง ${title} ถูกยกเลิกโดย ${issuer ? ' ' : ''}${issuer || ''}`,
+    vi: (title, issuer) => `Hộ chiếu ${title} đã bị thu hồi bởi ${issuer ? ' ' : ''}${issuer || ''}`,
     zh: (title, issuer) => `通行证 ${title} 已被${issuer ? ' ' : ''}${issuer || ''}${issuer ? ' ' : ''}吊销`,
-  },
-  notOwner: {
-    en: 'The account does not match the owner account of this passport, please use the DID wallet that contains the owner account of this passport to receive.',
-    zh: '该账号与此通行证的所有者账号不匹配，请使用包含此通行证所有者账号的 DID 钱包领取。',
-  },
-  userMismatch: {
-    en: 'User mismatch, please use connected DID wallet to continue.',
-    zh: '用户不匹配，请使用当前会话连接的钱包操作',
-  },
-  lowVersion: {
-    en: 'Your DID wallet version is too low, please upgrade to the latest version',
-    zh: '你的 DID 钱包版本过低，请升级至最新版本',
+    'zh-TW': (title, issuer) => `通行證 ${title} 已被${issuer ? ' ' : ''}${issuer || ''}${issuer ? ' ' : ''}吊銷`,
   },
   passportStatusCheckFailed: {
+    ar: (message) => `فشلت عملية التحقق من حالة جواز السفر: ${message}`,
+    de: (message) => `Passport-Statusprüfung fehlgeschlagen: ${message}`,
+    es: (message) => `Error al verificar el estado del pasaporte: ${message}`,
     en: (message) => `Passport status check failed: ${message}`,
+    fr: (message) => `Échec de la vérification du statut du passeport: ${message}`,
+    hi: (message) => `पासपोर्ट स्थिति जांच विफल: ${message}`,
+    id: (message) => `Pemeriksaan status paspor gagal: ${message}`,
+    ja: (message) => `パスポートのステータスチェックに失敗しました：${message}`,
+    ko: (message) => `여권 상태 확인 실패 : ${message}`,
+    pt: (message) => `Falha na verificação do status do passaporte: ${message}`,
+    ru: (message) => `Ошибка проверки статуса паспорта: ${message}`,
+    th: (message) => `การตรวจสอบสถานะหนังสือเดินทางล้มเหลว: ${message}`,
+    vi: (message) => `Kiểm tra trạng thái hộ chiếu không thành công: ${message}`,
     zh: (message) => `通行证状态检测失败：${message}`,
-  },
-  unKnownStatus: {
-    en: 'unknown status',
-    zh: '未知的状态',
-  },
-  statusNotFound: {
-    en: 'status not found',
-    zh: '未找到状态',
-  },
-  statusLabel: {
-    en: 'Status',
-    zh: '状态',
-  },
-  passportNotFound: {
-    en: 'Passport not found',
-    zh: '未找到通行证',
-  },
-  userNotFound: {
-    en: 'User not found',
-    zh: '用户不存在',
-  },
-  notAuthorized: {
-    en: '没有执行此操作的权限',
-    zh: 'No permission to perform this operation',
-  },
-  invalidParams: {
-    en: 'Invalid Params',
-    zh: '无效的参数',
-  },
-  missingKeyPair: {
-    en: 'Missing app key pair',
-    zh: '缺少应用钥匙对',
-  },
-  missingBlockletUrl: {
-    en: 'Missing blocklet url',
-    zh: '缺少应用下载地址',
-  },
-  missingBlockletDid: {
-    en: 'Missing blocklet did',
-    zh: '缺少应用 DID',
-  },
-  missingChainHost: {
-    en: 'Missing chain host',
-    zh: '缺少链的端点地址',
-  },
-  missingLauncherSession: {
-    en: 'Missing launcherUrl and launcherSessionId',
-    zh: '缺少启动器会话参数',
-  },
-  invalidBlocklet: {
-    en: 'Invalid Blocklet',
-    zh: '无效的 Blocklet',
-  },
-  blockletExists: {
-    en: 'The blocklet already exists',
-    zh: '应用已安装',
-  },
-  invalidBlockletVc: {
-    en: 'Invalid Blocklet VC',
-    zh: '无效的 Blocklet VC',
-  },
-  invalidAppVersion: {
-    en: 'App key-pair rotating can only be performed on the latest version',
-    zh: '只有最新版应用可以变更钥匙对',
-  },
-
-  // NFT related
-  missingProfileClaim: {
-    en: 'Owner profile not provided',
-    zh: '节点所有者信息必须提供',
-  },
-  invalidNftClaim: {
-    en: 'Invalid Asset Claim: ownerPk, ownerDid and ownerProof are required',
-    zh: '无效的 NFT Claim：ownerPk、ownerDid、ownerProof 是必填的',
-  },
-  invalidNft: {
-    en: 'Invalid server ownership NFT state',
-    zh: '无效的节点所有权 NFT',
-  },
-  invalidNftHolder: {
-    en: 'Invalid server ownership NFT holder',
-    zh: '无效的节点所有权 NFT 持有者',
-  },
-  invalidNftProof: {
-    en: 'Invalid server ownership NFT signature proof',
-    zh: '无效的节点所有权 NFT 签名',
-  },
-  invalidNftIssuer: {
-    en: 'Invalid server ownership NFT issuer',
-    zh: '无效的节点所有权 NFT 颁发者',
-  },
-  invalidNftParent: {
-    en: 'Unexpected NFT Collection',
-    zh: '无效的 NFT 集合',
-  },
-  tagNotMatch: {
-    en: 'This NFT is for another blocklet server',
-    zh: '您所提供的所有权 NFT 不属于当前节点',
-  },
-  requestBlockletSpaceNFT: {
-    en: 'Please provide Blocklet Space NFT',
-    zh: '请提供应用空间 NFT',
-  },
-  blockletSpaceNftIdRequired: {
-    en: 'Blocklet Space NFT ID is required',
-    zh: '应用空间 NFT ID 是必须的',
-  },
-  nftAlreadyConsumed: {
-    en: 'This NFT has already been used',
-    zh: '该 NFT 已经被使用过了',
-  },
-  sessionAlreadyConsumed: {
-    en: 'This session has already been used',
-    zh: '该会话已经被使用过了',
-  },
-  nftAlreadyExpired: {
-    en: 'This NFT has expired',
-    zh: '该 NFT 已经过期',
-  },
-  nftAlreadyUsed: {
-    en: 'This NFT has already been connected to another user',
-    zh: '该 NFT 已经被起它用户使用过',
-  },
-  missingNftClaim: {
-    en: 'Ownership NFT not provided',
-    zh: '节点所有权 NFT 必须提供',
-  },
-  noNft: {
-    en: 'This server is not initialized to accept ownership NFT',
-    zh: '该节点不能用这种方式成为管理员',
-  },
-  noTag: {
-    en: 'Tag not found from server launcher info',
-    zh: '节点初始化信息异常：缺少标签',
-  },
-  noChainHost: {
-    en: 'chainHost not found from server launcher info',
-    zh: '节点初始化信息异常：缺少链地址',
-  },
-  alreadyTransferred: {
-    en: 'The Blocklet Server already belongs to {owner}',
-    zh: '该节点已经属于 {owner}',
-  },
-  delegateTransferOwnerNFT: {
-    en: 'Sign the delegation transaction to authorize blocklet server to transfer your ownership NFT to new owner when he/she claims the transfer.',
-    zh: '签名下面的交易以授权节点转移所有权以及代表所有权的 NFT。',
-  },
-  notAllowedTransferToSelf: {
-    en: 'Not allowed to transfer the Server to yourself',
-    zh: '不能将节点转移给自己',
-  },
-  tagRequired: {
-    en: 'tag is required',
-    zh: 'tag 不能为空',
-  },
-  appIsInProgress: {
-    en: 'The application is in progress, please wait for it to finish',
-    zh: '应用正在进行中，请等待完成',
+    'zh-TW': (message) => `通行證狀態檢測失敗：${message}`,
   },
 };
 

package/lib/auth.test.js

@@ -0,0 +1,27 @@
+const { messages } = require('./auth');
+
+const funcKeys = {
+  invalidCredentialType: 1,
+  invalidCredentialId: 1,
+  passportRevoked: 1,
+  passportStatusCheckFailed: 1,
+};
+
+describe('auth messages has key', () => {
+  const keys = Object.keys(messages);
+  // ensure all keys have values
+  test('auth messages has key', () => {
+    keys.forEach((key) => {
+      const localMap = messages[key];
+      expect(localMap).toBeDefined();
+      ['en', 'zh', 'ja'].forEach((language) => {
+        if (funcKeys[key]) {
+          expect(typeof localMap[language]).toEqual('function');
+        } else {
+          expect(typeof localMap[language]).toEqual('string');
+          expect(localMap[language].length > 0).toBeTruthy();
+        }
+      });
+    });
+  });
+});

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.21-beta-93c6e42b",
+  "version": "1.16.21-beta-da3f852a",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,17 +20,18 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.21-beta-93c6e42b",
-    "@abtnode/logger": "1.16.21-beta-93c6e42b",
-    "@abtnode/util": "1.16.21-beta-93c6e42b",
-    "@arcblock/did": "1.18.107",
-    "@arcblock/nft-display": "2.8.23",
-    "@arcblock/vc": "1.18.107",
-    "@blocklet/constant": "1.16.21-beta-93c6e42b",
-    "@blocklet/meta": "1.16.21-beta-93c6e42b",
-    "@ocap/mcrypto": "1.18.107",
-    "@ocap/util": "1.18.107",
-    "@ocap/wallet": "1.18.107",
+    "@abtnode/constant": "1.16.21-beta-da3f852a",
+    "@abtnode/logger": "1.16.21-beta-da3f852a",
+    "@abtnode/util": "1.16.21-beta-da3f852a",
+    "@arcblock/did": "1.18.108",
+    "@arcblock/nft-display": "2.9.2",
+    "@arcblock/vc": "1.18.108",
+    "@blocklet/constant": "1.16.21-beta-da3f852a",
+    "@blocklet/meta": "1.16.21-beta-da3f852a",
+    "@ocap/mcrypto": "1.18.108",
+    "@ocap/util": "1.18.108",
+    "@ocap/wallet": "1.18.108",
+    "flat": "^5.0.2",
     "fs-extra": "^10.1.0",
     "joi": "17.11.0",
     "jsonwebtoken": "^9.0.0",
@@ -43,5 +44,5 @@
   "devDependencies": {
     "jest": "^27.5.1"
   },
-  "gitHead": "80619ce49f5a9224d3d817e5faea4422072b0553"
+  "gitHead": "57b315bdb59f2125c5f0595d5cb21c92196710ba"
 }