@fonoster/identity 0.9.22 → 0.9.24

package/dist/exchanges/createExchangeCredentials.js

@@ -69,13 +69,13 @@ const createIsValidVerificationCode_1 = require("../utils/createIsValidVerificat
 const verification_1 = require("../verification");
 const exchangeTokens_1 = require("./exchangeTokens");
 const logger = (0, logger_1.getLogger)({ service: "identity", filePath: __filename });
-const verificationRequiredButNotProvided = (identityConfig, user) => identityConfig.userVerificationRequired &&
+const verificationRequiredButNotProvided = (identityConfig, user) => identityConfig.contactVerificationRequired &&
     (!user.emailVerified || !user.phoneNumberVerified);
 function createExchangeCredentials(prisma, identityConfig) {
     const isValidVerificationCode = (0, createIsValidVerificationCode_1.createIsValidVerificationCode)(prisma);
     const exchangeCredentials = (call, callback) => __awaiter(this, void 0, void 0, function* () {
         const { request } = call;
-        const { username: email, password, verificationCode } = request;
+        const { username: email, password, twoFactorCode } = request;
         logger.verbose("call to exchangeCredentials", { username: email });
         const user = yield (0, createGetUserByEmail_1.createGetUserByEmail)(prisma)(email);
         if (!user || user.password !== (password === null || password === void 0 ? void 0 : password.trim())) {
@@ -90,16 +90,18 @@ function createExchangeCredentials(prisma, identityConfig) {
                 message: "User contact information not verified"
             });
         }
-        if (identityConfig.userVerificationRequired) {
+        // TODO: Rename verifcation methods to be more generic
+        // At the moment name would suggest that 2FA and verification are the same thing
+        if (identityConfig.twoFactorAuthenticationRequired) {
             const isValid = yield isValidVerificationCode({
                 type: verification_1.ContactType.EMAIL,
                 value: email,
-                code: verificationCode
+                code: twoFactorCode
             });
             if (!isValid) {
                 return callback({
                     code: grpc.status.PERMISSION_DENIED,
-                    message: "Invalid verification code"
+                    message: "Invalid 2FA code"
                 });
             }
         }

package/dist/exchanges/types.d.ts

@@ -31,7 +31,8 @@ type IdentityConfig = {
     workspaceInviteExpiration: string;
     workspaceInviteUrl: string;
     workspaceInviteFailUrl: string;
-    userVerificationRequired: boolean;
+    contactVerificationRequired: boolean;
+    twoFactorAuthenticationRequired: boolean;
     resetPasswordUrl: string;
     smtpConfig: {
         sender: string;

package/dist/service.js

@@ -71,7 +71,8 @@ function buildIdentityService(identityConfig) {
             verifyCode: undefined
         }
     };
-    if (identityConfig.userVerificationRequired) {
+    if (identityConfig.contactVerificationRequired ||
+        identityConfig.twoFactorAuthenticationRequired) {
         service.handlers.sendVerificationCode = (0, verification_1.createSendVerificationCode)(prisma, identityConfig);
         service.handlers.verifyCode = (0, verification_1.createVerifyCode)(prisma);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/identity",
-  "version": "0.9.22",
+  "version": "0.9.24",
   "description": "Identity service for Fonoster",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/fonoster#readme",
@@ -20,7 +20,7 @@
     "fonoster": "./dist/index.js"
   },
   "dependencies": {
-    "@fonoster/common": "^0.9.22",
+    "@fonoster/common": "^0.9.24",
     "@fonoster/logger": "^0.9.22",
     "@fonoster/types": "^0.9.22",
     "@grpc/grpc-js": "~1.10.6",
@@ -48,5 +48,5 @@
   "devDependencies": {
     "@types/jsonwebtoken": "^9.0.6"
   },
-  "gitHead": "3c393362218ebfdd7ec672f18553953edf37e9e3"
+  "gitHead": "a6e16d9b8af8594e57d8b385b936cc2508546de1"
 }