@abtnode/blocklet-services 1.16.32-beta-76103be3 → 1.16.32-beta-820e4cfa

package/api/libs/kyc.js

@@ -2,6 +2,7 @@ const get = require('lodash/get');
 const uniq = require('lodash/uniq');
 const pick = require('lodash/pick');
 const trim = require('lodash/trim');
+const lowerCase = require('lodash/lowerCase');
 const semver = require('semver');
 const { messages, getVCFromClaims } = require('@abtnode/auth/lib/auth');
 const { getPassportClaimUrl, getKycAcquireUrl } = require('@abtnode/auth/lib/passport');
@@ -159,6 +160,20 @@ function getKycClaims(blocklet, user, locale, baseUrl, trustedIssuers) {
   return claims;
 }
 
+const isSameEmail = (email1, email2) => {
+  if (!email1 || !email2) {
+    return false;
+  }
+  return lowerCase(email1) === lowerCase(email2);
+};
+
+const isSamePhone = (phone1, phone2) => {
+  if (!phone1 || !phone2) {
+    return false;
+  }
+  return phone1.replace(/\s+/g, '').replace(/[()-]/g, '') === phone2.replace(/\s+/g, '').replace(/[()-]/g, '');
+};
+
 async function verifyKycClaims({ node, blocklet, teamDid, claims, challenge, locale, sourceAppPid, user }) {
   const profile = claims.find((claim) => claim.type === 'profile');
   const kycUpdates = pick(user || {}, ['emailVerified', 'phoneVerified']);
@@ -177,7 +192,7 @@ async function verifyKycClaims({ node, blocklet, teamDid, claims, challenge, loc
       throw new Error(messages.missingEmailKyc[locale]);
     }
     const email = get(emailKyc, 'credentialSubject.kyc.subject');
-    if (profile?.email && profile.email !== email) {
+    if (profile?.email && !isSameEmail(profile.email, email)) {
       throw new Error(messages.emailMismatch[locale]);
     }
 
@@ -232,7 +247,7 @@ async function verifyKycClaims({ node, blocklet, teamDid, claims, challenge, loc
       throw new Error(messages.missingPhoneKyc[locale]);
     }
     const phone = get(phoneKyc, 'credentialSubject.kyc.subject');
-    if (profile?.phone && profile.phone !== phone) {
+    if (profile?.phone && !isSamePhone(profile.phone, phone)) {
       throw new Error(messages.phoneMismatch[locale]);
     }
     if (!user && isPhoneUniqueRequired(blocklet)) {
@@ -267,4 +282,6 @@ module.exports = {
   getPassportVc,
   isEmailBlocked,
   isEmailAllowed,
+  isSameEmail,
+  isSamePhone,
 };

package/api/routes/oauth.js

@@ -31,7 +31,7 @@ const { sendToUser } = require('../libs/notification');
 const { isInvitedUserOnly, createTokenFn, getDidConnectVersion } = require('../util');
 const { ApiError } = require('../util/error');
 const federatedUtil = require('../util/federated');
-const { isOAuthEmailVerified, isEmailUniqueRequired, isEmailKycRequired } = require('../libs/kyc');
+const { isOAuthEmailVerified, isEmailUniqueRequired, isEmailKycRequired, isSameEmail } = require('../libs/kyc');
 
 const PREFIX = WELLKNOWN_SERVICE_PATH_PREFIX;
 
@@ -438,7 +438,7 @@ async function invite(req, node, options) {
       fullName: oauthInfo.name,
       avatar: getUserAvatarUrl(baseUrl, avatar),
     };
-    if (profile.email === oauthInfo.email && isOAuthEmailVerified(blocklet, oauthInfo)) {
+    if (isSameEmail(profile.email, oauthInfo.email) && isOAuthEmailVerified(blocklet, oauthInfo)) {
       profile.emailVerified = true;
     }
   }
@@ -644,7 +644,7 @@ async function bind(req, node, options) {
     avatar,
   };
 
-  if (mergeProfile.email === oauthInfo.email && isOAuthEmailVerified(blocklet, oauthInfo)) {
+  if (isSameEmail(mergeProfile.email, oauthInfo.email) && isOAuthEmailVerified(blocklet, oauthInfo)) {
     mergeProfile.emailVerified = true;
   }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.32-beta-76103be3",
+  "version": "1.16.32-beta-820e4cfa",
   "description": "Provide unified services for every blocklet",
   "main": "api/index.js",
   "files": [
@@ -33,17 +33,17 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.32-beta-76103be3",
-    "@abtnode/auth": "1.16.32-beta-76103be3",
-    "@abtnode/client": "1.16.32-beta-76103be3",
-    "@abtnode/connect-storage": "1.16.32-beta-76103be3",
-    "@abtnode/constant": "1.16.32-beta-76103be3",
-    "@abtnode/core": "1.16.32-beta-76103be3",
-    "@abtnode/cron": "1.16.32-beta-76103be3",
-    "@abtnode/logger": "1.16.32-beta-76103be3",
-    "@abtnode/models": "1.16.32-beta-76103be3",
-    "@abtnode/router-templates": "1.16.32-beta-76103be3",
-    "@abtnode/util": "1.16.32-beta-76103be3",
+    "@abtnode/analytics": "1.16.32-beta-820e4cfa",
+    "@abtnode/auth": "1.16.32-beta-820e4cfa",
+    "@abtnode/client": "1.16.32-beta-820e4cfa",
+    "@abtnode/connect-storage": "1.16.32-beta-820e4cfa",
+    "@abtnode/constant": "1.16.32-beta-820e4cfa",
+    "@abtnode/core": "1.16.32-beta-820e4cfa",
+    "@abtnode/cron": "1.16.32-beta-820e4cfa",
+    "@abtnode/logger": "1.16.32-beta-820e4cfa",
+    "@abtnode/models": "1.16.32-beta-820e4cfa",
+    "@abtnode/router-templates": "1.16.32-beta-820e4cfa",
+    "@abtnode/util": "1.16.32-beta-820e4cfa",
     "@arcblock/did": "^1.18.135",
     "@arcblock/did-auth": "1.18.135",
     "@arcblock/did-ext": "^1.18.135",
@@ -52,11 +52,11 @@
     "@arcblock/jwt": "1.18.135",
     "@arcblock/validator": "^1.18.135",
     "@arcblock/ws": "1.18.135",
-    "@blocklet/constant": "1.16.32-beta-76103be3",
+    "@blocklet/constant": "1.16.32-beta-820e4cfa",
     "@blocklet/form-builder": "^0.1.11",
     "@blocklet/form-collector": "^0.1.8",
-    "@blocklet/meta": "1.16.32-beta-76103be3",
-    "@blocklet/sdk": "1.16.32-beta-76103be3",
+    "@blocklet/meta": "1.16.32-beta-820e4cfa",
+    "@blocklet/sdk": "1.16.32-beta-820e4cfa",
     "@did-connect/authenticator": "^2.2.4",
     "@did-connect/relay-adapter-express": "^2.2.4",
     "@ocap/client": "1.18.135",
@@ -101,14 +101,14 @@
     "minimatch": "9.0.4"
   },
   "devDependencies": {
-    "@abtnode/ux": "1.16.32-beta-76103be3",
+    "@abtnode/ux": "1.16.32-beta-820e4cfa",
     "@arcblock/bridge": "^2.10.33",
     "@arcblock/did-connect": "^2.10.33",
     "@arcblock/icons": "^2.10.33",
     "@arcblock/react-hooks": "^2.10.33",
     "@arcblock/ux": "^2.10.33",
     "@blocklet/launcher-layout": "2.10.33",
-    "@blocklet/tracker": "1.16.32-beta-76103be3",
+    "@blocklet/tracker": "1.16.32-beta-820e4cfa",
     "@blocklet/ui-react": "^2.10.33",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
@@ -182,5 +182,5 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues",
     "email": "shijun@arcblock.io"
   },
-  "gitHead": "6d7afe107a349b1267b29e7f2216db9997085015"
+  "gitHead": "5d9721ea660974e75815a6b74de4dd233459ec58"
 }