@riocrypto/common-server 1.0.2702 → 1.0.2703

package/build/clients/cluster-client.d.ts

@@ -1,4 +1,4 @@
-import { Quote, Fiat, Crypto, BitsoBankAccount, Side, Country, Order, CryptoAddress, BankAccount, AuthRole, Auth, ImportOrderData, TreasuryProvider, FXProvider, EmarketsFXTrade, ExternalTradingAlgorithm, ExternalTrade, ExternalTradeType, ExternalTradingProvider, ExternalTradingAlgorithmType, STPMXNWithdrawal, AuthPermission, DeferredPaymentType, TwoWaySettlementType, OrderType, EmarketsSettlementType, EmarketsOrderType, BulkBankPayout, BulkCryptoPayout, BulkBankPayment, BulkCryptoPayment, OrderStatus, TWAPSession, TransnetworkFXTrade, TransnetworkSettlementType, TransnetworkOrderType } from "@riocrypto/common";
+import { Quote, Fiat, Crypto, BitsoBankAccount, Side, Country, Order, CryptoAddress, BankAccount, AuthRole, Auth, ImportOrderData, TreasuryProvider, FXProvider, EmarketsFXTrade, ExternalTradingAlgorithm, ExternalTrade, ExternalTradeType, ExternalTradingProvider, ExternalTradingAlgorithmType, STPMXNWithdrawal, AuthPermission, DeferredPaymentType, TwoWaySettlementType, OrderType, EmarketsSettlementType, EmarketsOrderType, BulkBankPayout, BulkCryptoPayout, BulkBankPayment, BulkCryptoPayment, OrderStatus, TWAPSession, TransnetworkFXTrade, TransnetworkSettlementType, TransnetworkOrderType, AuthMethod } from "@riocrypto/common";
 import { STPMXNWithdrawalDoc } from "../models/STP-mxn-withdrawal";
 declare class ClusterClient {
     private baseUrl;
@@ -59,8 +59,8 @@ declare class ClusterClient {
     checkBankPayment(orderId: string): Promise<void>;
     checkCryptoPayment(orderId: string): Promise<void>;
     createBitsoBankAccount(userId: string): Promise<BitsoBankAccount>;
-    createAuthWithoutRegistration({ phoneNumber, firstName, lastName, role, permissions, telegramUsername, telegramUserId, slackUsername, email, }: {
-        phoneNumber: string;
+    createAuthWithoutRegistration({ phoneNumber, firstName, lastName, role, permissions, telegramUsername, telegramUserId, slackUsername, email, authMethod, }: {
+        phoneNumber?: string;
         firstName: string;
         lastName: string;
         role?: AuthRole;
@@ -69,6 +69,7 @@ declare class ClusterClient {
         telegramUserId?: string;
         slackUsername?: string;
         email: string;
+        authMethod?: AuthMethod;
     }): Promise<Auth>;
     getLiquidityAvailable(): Promise<{
         buy: number;

package/build/clients/cluster-client.js

@@ -192,7 +192,7 @@ class ClusterClient {
             return response.data;
         });
     }
-    createAuthWithoutRegistration({ phoneNumber, firstName, lastName, role, permissions, telegramUsername, telegramUserId, slackUsername, email, }) {
+    createAuthWithoutRegistration({ phoneNumber, firstName, lastName, role, permissions, telegramUsername, telegramUserId, slackUsername, email, authMethod, }) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.axios.post(`${this.baseUrl}/api/auth/unregistered`, {
                 phoneNumber,
@@ -201,6 +201,7 @@ class ClusterClient {
                 role,
                 email,
                 permissions,
+                authMethod,
                 telegram: {
                     username: telegramUsername,
                     telegramUserId: telegramUserId,

package/build/middlewares/authorize.d.ts

@@ -12,6 +12,7 @@ declare global {
             user?: UserDoc;
             validClusterApiKey?: boolean;
             validGenisisAdminKey?: boolean;
+            isAuthMissing2FA?: boolean;
         }
     }
 }

package/build/middlewares/authorize.js

@@ -21,7 +21,7 @@ const apiKey_1 = require("../services/apiKey");
 const secret_manager_client_1 = require("../clients/secret-manager-client");
 const admin_auth_1 = require("../models/admin-auth");
 const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
+    var _a, _b, _c;
     // Prepare promises for parallel execution
     const promises = [];
     // Check for cluster API key - only if needed
@@ -175,6 +175,28 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
             }))());
         }
     }
+    // Check for AuthMissing2FA token - only if needed
+    if (authorizationTypes.includes(common_1.AuthorizationType.AuthMissing2FA)) {
+        const authMissing2FAToken = (_c = req.cookies) === null || _c === void 0 ? void 0 : _c.authMissing2FAToken;
+        if (authMissing2FAToken) {
+            promises.push((() => __awaiter(void 0, void 0, void 0, function* () {
+                try {
+                    const AUTH_MISSING_2FA_SECRET = yield secret_manager_client_1.secretManagerClient.getSecretValue("AUTH_MISSING_2FA_SECRET");
+                    if (!AUTH_MISSING_2FA_SECRET) {
+                        return;
+                    }
+                    const payload = jsonwebtoken_1.default.verify(authMissing2FAToken, AUTH_MISSING_2FA_SECRET);
+                    const Auth = yield (0, auth_1.buildAuth)(mongoose);
+                    const auth = yield Auth.findById(payload.id);
+                    if (auth && !auth.isDisabled) {
+                        req.auth = auth;
+                        req.isAuthMissing2FA = true;
+                    }
+                }
+                catch (err) { }
+            }))());
+        }
+    }
     // Wait for all promises to complete
     yield Promise.all(promises);
     // Check authorization results and proceed if authorized
@@ -184,6 +206,9 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
         (authorizationTypes.includes(common_1.AuthorizationType.GenesisAdmin) &&
             req.validGenisisAdminKey) ||
         (authorizationTypes.includes(common_1.AuthorizationType.Auth) && req.auth) ||
+        (authorizationTypes.includes(common_1.AuthorizationType.AuthMissing2FA) &&
+            req.auth &&
+            req.isAuthMissing2FA) ||
         (authorizationTypes.includes(common_1.AuthorizationType.AdminAuth) &&
             req.adminAuth) ||
         ((authorizationTypes.includes(common_1.AuthorizationType.User) ||

package/build/models/auth.d.ts

@@ -1,7 +1,7 @@
-import { APIKey, AuthRole, SecurityQuestion, AuthPermission } from "@riocrypto/common";
+import { APIKey, AuthMethod, AuthRole, SecurityQuestion, AuthPermission } from "@riocrypto/common";
 import { Mongoose, Model, Document } from "mongoose";
 interface AuthAttrs {
-    phoneNumber: string;
+    phoneNumber?: string;
     password?: string;
     email?: string;
     missingRegistration?: boolean;
@@ -28,9 +28,17 @@ interface AuthAttrs {
     secondLastName?: string;
     role?: AuthRole;
     permissions?: AuthPermission[];
+    emailVerified?: boolean;
+    emailVerifiedAt?: Date;
+    emailVerificationCode?: string;
+    emailVerificationExpires?: Date;
+    emailVerificationAttempts?: number;
+    authMethod?: AuthMethod;
+    twoFactorConfigured?: boolean;
+    twoFactorMethod?: string;
 }
 interface AuthDoc extends Document {
-    phoneNumber: string;
+    phoneNumber?: string;
     password?: string;
     email?: string;
     missingRegistration?: boolean;
@@ -57,6 +65,14 @@ interface AuthDoc extends Document {
     secondLastName?: string;
     role?: AuthRole;
     permissions?: AuthPermission[];
+    emailVerified?: boolean;
+    emailVerifiedAt?: Date;
+    emailVerificationCode?: string;
+    emailVerificationExpires?: Date;
+    emailVerificationAttempts?: number;
+    authMethod?: AuthMethod;
+    twoFactorConfigured?: boolean;
+    twoFactorMethod?: string;
 }
 interface AuthModel extends Model<AuthDoc> {
     build(attrs: AuthAttrs): AuthDoc;

package/build/models/auth.js

@@ -19,7 +19,6 @@ const buildAuth = (mongoose) => {
     const AuthSchema = new mongoose.Schema({
         phoneNumber: {
             type: String,
-            required: true,
         },
         email: {
             type: String,
@@ -110,6 +109,32 @@ const buildAuth = (mongoose) => {
                 },
             },
         ],
+        emailVerified: {
+            type: Boolean,
+        },
+        emailVerifiedAt: {
+            type: Date,
+        },
+        emailVerificationCode: {
+            type: String,
+        },
+        emailVerificationExpires: {
+            type: Date,
+        },
+        emailVerificationAttempts: {
+            type: Number,
+            default: 0,
+        },
+        authMethod: {
+            type: String,
+        },
+        twoFactorConfigured: {
+            type: Boolean,
+            default: false,
+        },
+        twoFactorMethod: {
+            type: String,
+        },
     }, {
         toJSON: {
             transform(doc, ret) {
@@ -123,6 +148,9 @@ const buildAuth = (mongoose) => {
                 if (ret.authenticator && ret.authenticator.secret) {
                     delete ret.authenticator.secret;
                 }
+                delete ret.emailVerificationCode;
+                delete ret.emailVerificationExpires;
+                delete ret.emailVerificationAttempts;
                 for (let apiKey of ret.apiKeys) {
                     delete apiKey.value;
                 }
@@ -148,6 +176,14 @@ const buildAuth = (mongoose) => {
     AuthSchema.statics.build = (attrs) => {
         return new Auth(attrs);
     };
+    AuthSchema.index({ email: 1 }, {
+        unique: true,
+        partialFilterExpression: { email: { $type: "string" } },
+    });
+    AuthSchema.index({ phoneNumber: 1 }, {
+        unique: true,
+        partialFilterExpression: { phoneNumber: { $type: "string" } },
+    });
     const Auth = mongoose.model("Auth", AuthSchema);
     return Auth;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.2702",
+  "version": "1.0.2703",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -28,7 +28,7 @@
     "@google-cloud/secret-manager": "^5.3.0",
     "@google-cloud/storage": "^6.9.5",
     "@hyperdx/node-opentelemetry": "^0.7.0",
-    "@riocrypto/common": "^1.0.2503",
+    "@riocrypto/common": "^1.0.2504",
     "@types/express": "^4.17.13",
     "axios": "^1.7.4",
     "crypto-js": "^4.2.0",