@driveflux/api-functions 1.0.77-next.0 → 1.0.77

package/dist/auth/register.js

@@ -13,42 +13,40 @@ import { nanoid } from 'nanoid';
 import { z } from 'zod';
 import { SALT_ROUNDS } from '../constants.js';
 import { setContactInList } from '../mailjet/set-contact.js';
+import { getConsentCreateData } from './consent.js';
 import { clearToken, verifyToken } from './tokens.js';
 import { sendVerificationEmail } from './verifications.js';
-const Body = z.object({
+export const RegistrationValidation = z.object({
     firstName: z.string(),
     lastName: z.string(),
-    phoneNumber: z.string().transform((s)=>s.replace(/[\s-]/g, '')),
-    authMethod: z.enum([
-        'mobile',
-        'email',
-        'facebook',
-        'google',
-        'apple'
-    ]),
+    phoneNumber: z.string().transform((s) => s.replace(/[\s-]/g, '')),
+    authMethod: z.enum(['mobile', 'email', 'facebook', 'google', 'apple']),
     code: z.string().optional().nullable(),
     keepCode: z.boolean().optional().default(false),
-    email: z.string().email().transform((s)=>s.toLowerCase().trim()),
-    dateOfBirth: dateValidation.refine((d)=>{
+    email: z.email().transform((s) => s.toLowerCase().trim()),
+    dateOfBirth: dateValidation
+        .refine((d) => {
         return isAfter(d, subYears(new Date(), 25));
     }, {
-        path: [
-            'dateOfBirth'
-        ],
-        message: 'You must be at least 25 years old to signup for the service.'
-    }).optional(),
+        path: ['dateOfBirth'],
+        message: 'You must be at least 25 years old to signup for the service.',
+    })
+        .optional(),
     password: z.string().min(6).optional(),
     noMarketing: z.boolean().optional(),
     pageSource: z.string().optional().nullable(),
-    skipPassword: z.boolean().optional().nullable()
+    skipPassword: z.boolean().optional().nullable(),
+    fingerprint: z.string().optional(),
+    termsVersion: z.string().optional(),
+    userAgent: z.string().optional(),
+    ipAddress: z.ipv4().or(z.ipv6()),
+    sessionToken: z.string().optional(),
+    sessionId: z.string().optional(),
 });
-export const handleRegister = async (b, xForwardedFor)=>{
-    const { noMarketing, password, authMethod, phoneNumber, code, keepCode, pageSource, skipPassword, ...body } = Body.parse(b);
+export const handleRegister = async ({ noMarketing, password, authMethod, phoneNumber, code, keepCode, pageSource, skipPassword, fingerprint, termsVersion, userAgent, ipAddress, sessionToken, sessionId, ...body }) => {
     let phoneNumberVerified = false;
     if (code) {
-        const tokenResult = await verifyToken(code, {
-            scope: 'verify-phone'
-        });
+        const tokenResult = await verifyToken(code, { scope: 'verify-phone' });
         if (tokenResult.err) {
             return new Err(makeProblem(PROBLEM_CONFLICT, 'Invalid OTP token'));
         }
@@ -62,9 +60,7 @@ export const handleRegister = async (b, xForwardedFor)=>{
     }
     // Check if the user exists
     const foundUser = await prisma.user.findFirst({
-        where: {
-            email: body.email
-        }
+        where: { email: body.email },
     });
     if (foundUser) {
         return new Err(makeProblem(PROBLEM_CONFLICT, 'A user with this email address already exists. Did you mean to login?'));
@@ -72,65 +68,72 @@ export const handleRegister = async (b, xForwardedFor)=>{
     const formattedPohoneNumber = cleanupPhoneNumber(phoneNumber);
     const id = generateId('User');
     const hashedPassword = await bcrypt.hash(password ?? nanoid(), SALT_ROUNDS);
-    const user = await prisma.user.create({
-        data: {
-            id,
-            password: hashedPassword,
-            ...body,
-            phoneNumber: formattedPohoneNumber,
-            preferredCurrency: 'MYR',
-            preferredLocale: 'en',
-            phoneNumberVerified,
-            consented: true,
-            groups: [
-                'member'
-            ],
-            consents: {
-                create: {
-                    id: generateId('UserConsent'),
-                    ipAddress: Array.isArray(xForwardedFor) ? xForwardedFor?.[0] || '0.0.0.0' : xForwardedFor || '0.0.0.0',
-                    consentType: 'terms',
-                    email: body.email
-                }
+    const tokenId = generateId('Token');
+    const userCreateData = {
+        id,
+        password: hashedPassword,
+        ...body,
+        phoneNumber: formattedPohoneNumber,
+        preferredCurrency: 'MYR',
+        preferredLocale: 'en',
+        phoneNumberVerified,
+        groups: ['member'],
+        signupParams: {
+            method: authMethod,
+            source: pageSource,
+        },
+        registrationComplete: true,
+        accounts: {
+            create: {
+                id: generateId('Account'),
+                object: 'account',
+                type: 'default',
+                provider: 'credentials',
+                providerAccountId: id,
             },
-            signupParams: {
-                method: authMethod,
-                source: pageSource
+        },
+        tokens: {
+            create: {
+                id: tokenId,
+                expiresAt: addDays(new Date(), 365),
+                scope: 'all',
             },
-            registrationComplete: true,
-            accounts: {
-                create: {
-                    id: generateId('Account'),
-                    object: 'account',
-                    type: 'default',
-                    provider: 'credentials',
-                    providerAccountId: id
-                }
-            }
-        }
+        },
+    };
+    const { user: _removeDueToNestedCreate, ...consentCreate } = getConsentCreateData({
+        user: userCreateData,
+        fingerprint: fingerprint,
+        termsVersion: termsVersion,
+        ipAddress: ipAddress,
+        userAgent: userAgent,
+        sessionToken: tokenId,
+        consentType: 'terms',
     });
-    const token = await prisma.token.create({
-        data: {
-            id: generateId('Token'),
-            user: {
-                connect: {
-                    id: user.id
-                }
+    const finalCreateData = {
+        ...userCreateData,
+        consents: {
+            create: consentCreate,
+        },
+    };
+    const user = await prisma.user.create({
+        data: finalCreateData,
+        include: {
+            tokens: {
+                where: {
+                    id: tokenId,
+                },
             },
-            expiresAt: addDays(new Date(), 365),
-            scope: 'all'
-        }
+        },
     });
     // We don't want this to be a task. It should be instant
     await sendVerificationEmail(user.id);
     if (!noMarketing) {
-        await setContactInList(user.id, {
-            generalMarketing: true
-        });
+        await setContactInList(user.id, { generalMarketing: true });
     }
     await refreshEmailPreferences(user.id);
     return new Ok({
-        token,
-        user
+        token: user.tokens[0],
+        user,
     });
 };
+//# sourceMappingURL=register.js.map

package/dist/auth/register.js.map

@@ -1 +1 @@
-{"version":3,"file":"register.js","sourceRoot":"","sources":["../../src/auth/register.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"register.js","sourceRoot":"","sources":["../../src/auth/register.ts"],"names":[],"mappings":"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"}

package/dist/auth/tokens.js

@@ -1,17 +1,18 @@
 import { prisma } from '@driveflux/db';
 import { generateId } from '@driveflux/db/id';
-import { makeProblem, PROBLEM_CORRUPT, PROBLEM_EXPIRED, PROBLEM_INVALID_DATA, PROBLEM_NOT_FOUND } from '@driveflux/problem';
+import { makeProblem, PROBLEM_CORRUPT, PROBLEM_EXPIRED, PROBLEM_INVALID_DATA, PROBLEM_NOT_FOUND, } from '@driveflux/problem';
 import { Err, Ok } from '@driveflux/result';
 import { addDays } from 'date-fns/addDays';
 import { addMinutes } from 'date-fns/addMinutes';
 import { customAlphabet } from 'nanoid';
-export const createToken = async (userId, type, value, providedExpiresAt)=>{
+export const createToken = async (userId, type, value, providedExpiresAt) => {
     // Generate 6 digits
     const alphabet = '0123456789';
     const nanoid = customAlphabet(alphabet, 6);
     const identifier = !userId ? value : null;
     const scope = type === 'email' ? 'verify-email' : 'verify-phone';
-    const expiresAt = providedExpiresAt || (type === 'email' ? addDays(new Date(), 1) : addMinutes(new Date(), 30));
+    const expiresAt = providedExpiresAt ||
+        (type === 'email' ? addDays(new Date(), 1) : addMinutes(new Date(), 30));
     if (!userId && !identifier) {
         return;
     }
@@ -19,69 +20,72 @@ export const createToken = async (userId, type, value, providedExpiresAt)=>{
         data: {
             id: generateId('Token'),
             value: nanoid(),
-            ...userId ? {
-                user: {
-                    connect: {
-                        id: userId
-                    }
+            ...(userId
+                ? {
+                    user: {
+                        connect: {
+                            id: userId,
+                        },
+                    },
                 }
-            } : {},
-            ...identifier ? {
-                identifier
-            } : {},
+                : {}),
+            ...(identifier ? { identifier } : {}),
             expiresAt,
             scope,
             metadata: {
-                [type]: value
-            }
-        }
+                [type]: value,
+            },
+        },
     });
 };
-export const createEmailToken = async (userId, email)=>{
+export const createEmailToken = async (userId, email) => {
     return await createToken(userId, 'email', email);
 };
-export const createSMSToken = async (userId, phoneNumber)=>{
+export const createSMSToken = async (userId, phoneNumber) => {
     return await createToken(userId, 'phoneNumber', phoneNumber);
 };
-export const verifyToken = async (tokenIdOrValue, verifications, option)=>{
-    const token = typeof tokenIdOrValue === 'object' ? tokenIdOrValue : await prisma.token.findFirst({
-        where: {
-            OR: [
-                {
-                    id: tokenIdOrValue
-                },
-                {
-                    value: tokenIdOrValue
-                }
-            ]
-        },
-        ...option?.includeUser ? {
-            include: {
-                user: true
-            }
-        } : {}
-    });
+export const verifyToken = async (tokenIdOrValue, verifications, option) => {
+    const token = typeof tokenIdOrValue === 'object'
+        ? tokenIdOrValue
+        : (await prisma.token.findFirst({
+            where: {
+                OR: [{ id: tokenIdOrValue }, { value: tokenIdOrValue }],
+            },
+            ...(option?.includeUser ? { include: { user: true } } : {}),
+        }));
     if (!token) {
         return new Err(makeProblem(PROBLEM_NOT_FOUND, 'Token not found'));
     }
     if (token.expiresAt && token.expiresAt.getTime() < Date.now()) {
         return new Err(makeProblem(PROBLEM_EXPIRED, 'This token has expired'));
     }
-    if (typeof verifications?.scope !== 'undefined' && token.scope !== verifications.scope) {
+    if (typeof verifications?.scope !== 'undefined' &&
+        token.scope !== verifications.scope) {
         return new Err(makeProblem(PROBLEM_INVALID_DATA, 'Invalid token scope'));
     }
     if (typeof verifications?.metadata !== 'undefined') {
         if (typeof verifications.metadata.phoneNumber !== 'undefined') {
-            const tokenPhoneNumber = token?.metadata && typeof token.metadata === 'object' && 'phoneNumber' in token.metadata ? token.metadata.phoneNumber : undefined;
-            const formattedTokenPhoneNumber = `+${tokenPhoneNumber?.replace(/[^0-9]/g, '')}`;
+            const tokenPhoneNumber = token?.metadata &&
+                typeof token.metadata === 'object' &&
+                'phoneNumber' in token.metadata
+                ? token.metadata.phoneNumber
+                : undefined;
+            const formattedTokenPhoneNumber = `+${(tokenPhoneNumber)?.replace(/[^0-9]/g, '')}`;
             const phoneNumber = verifications.metadata?.phoneNumber;
-            if (verifications.scope === 'verify-phone' && phoneNumber !== formattedTokenPhoneNumber && phoneNumber !== tokenPhoneNumber) {
+            if (verifications.scope === 'verify-phone' &&
+                phoneNumber !== formattedTokenPhoneNumber &&
+                phoneNumber !== tokenPhoneNumber) {
                 return new Err(makeProblem(PROBLEM_INVALID_DATA, 'Invalid token data'));
             }
         }
         if (typeof verifications.metadata.email !== 'undefined') {
-            const tokenEmail = token?.metadata && typeof token.metadata === 'object' && 'email' in token.metadata ? token.metadata.email : undefined;
-            if (verifications.scope === 'verify-email' && tokenEmail !== verifications.metadata.email) {
+            const tokenEmail = token?.metadata &&
+                typeof token.metadata === 'object' &&
+                'email' in token.metadata
+                ? token.metadata.email
+                : undefined;
+            if (verifications.scope === 'verify-email' &&
+                tokenEmail !== verifications.metadata.email) {
                 return new Err(makeProblem(PROBLEM_INVALID_DATA, 'Invalid token data'));
             }
         }
@@ -103,30 +107,23 @@ export const verifyToken = async (tokenIdOrValue, verifications, option)=>{
     }
     return new Ok(token);
 };
-export const clearToken = async (tokenId)=>{
+export const clearToken = async (tokenId) => {
     try {
         await prisma.token.delete({
             where: {
-                id: tokenId
-            }
+                id: tokenId,
+            },
         });
-    } catch (_e) {
-    // Nothing to for now
+    }
+    catch (_e) {
+        // Nothing to for now
     }
 };
-export const clearExpiredTokens = async ()=>{
+export const clearExpiredTokens = async () => {
     await prisma.token.deleteMany({
         where: {
-            OR: [
-                {
-                    expiresAt: {
-                        lte: new Date()
-                    }
-                },
-                {
-                    invalid: true
-                }
-            ]
-        }
+            OR: [{ expiresAt: { lte: new Date() } }, { invalid: true }],
+        },
     });
 };
+//# sourceMappingURL=tokens.js.map

package/dist/auth/verifications.js

@@ -3,21 +3,19 @@ import { prisma } from '@driveflux/db';
 import { send } from '@driveflux/email';
 import { verificationEmail } from '@driveflux/email-templates/flux/verification';
 import { enhancedFetch } from '@driveflux/fetch';
-import { makeProblem, PROBLEM_CONFLICT, PROBLEM_EXTERNAL, PROBLEM_INTERNAL, PROBLEM_INVALID_DATA, PROBLEM_NOT_FOUND, PROBLEM_NOT_IMPLEMENTED } from '@driveflux/problem';
+import { makeProblem, PROBLEM_CONFLICT, PROBLEM_EXTERNAL, PROBLEM_INTERNAL, PROBLEM_INVALID_DATA, PROBLEM_NOT_FOUND, PROBLEM_NOT_IMPLEMENTED, } from '@driveflux/problem';
 import { reportProblem } from '@driveflux/reporter';
 import { Err, Ok } from '@driveflux/result';
 import { z } from 'zod';
 import { clearToken, createEmailToken, createSMSToken } from './tokens.js';
 const CheckDuplicationBody = z.object({
     phoneNumber: z.string(),
-    email: z.string().transform((email)=>email.toLowerCase().trim())
+    email: z.string().transform((email) => email.toLowerCase().trim()),
 });
-export const sendVerificationEmail = async (userId, temporaryEmail, next)=>{
-    const user = typeof userId === 'string' ? await prisma.user.findUnique({
-        where: {
-            id: userId
-        }
-    }) : userId;
+export const sendVerificationEmail = async (userId, temporaryEmail, next) => {
+    const user = typeof userId === 'string'
+        ? await prisma.user.findUnique({ where: { id: userId } })
+        : userId;
     if (!user) {
         return new Err(makeProblem(PROBLEM_NOT_FOUND, `User ${typeof userId === 'string' ? userId : 'unknown'} not found.`));
     }
@@ -34,18 +32,18 @@ export const sendVerificationEmail = async (userId, temporaryEmail, next)=>{
     }
     const updatedUser = await prisma.user.update({
         where: {
-            id: user.id
+            id: user.id,
         },
         data: {
-            temporaryEmail: destinationEmail
+            temporaryEmail: destinationEmail,
         },
         include: {
-            tokens: true
-        }
+            tokens: true,
+        },
     });
     const tokens = updatedUser?.tokens;
     if (tokens) {
-        await Promise.allSettled(tokens.map(async (userToken)=>{
+        await Promise.allSettled(tokens.map(async (userToken) => {
             if (userToken.scope === 'verify-email' && userToken.id !== token.id) {
                 return await clearToken(userToken.id);
             }
@@ -56,13 +54,15 @@ export const sendVerificationEmail = async (userId, temporaryEmail, next)=>{
     const query = new URLSearchParams({
         email: destinationEmail,
         token: token.id,
-        code: token.value
+        code: token.value,
     });
     if (next) {
         query.append('next', next);
     }
     const link = `${config.appUrl}/verify?${query}`;
-    const title = temporaryEmail ? 'Confirm email change' : 'Verify your email address';
+    const title = temporaryEmail
+        ? 'Confirm email change'
+        : 'Verify your email address';
     try {
         // Generate html
         const html = verificationEmail({
@@ -70,122 +70,119 @@ export const sendVerificationEmail = async (userId, temporaryEmail, next)=>{
             link,
             title: `${title}`,
             newEmail: temporaryEmail,
-            isChanging: !!temporaryEmail
+            isChanging: !!temporaryEmail,
         });
         // send email
         const result = await send({
             to: {
                 name: user.firstName || '',
-                address: destinationEmail
+                address: destinationEmail,
             },
             subject: `${title}`,
-            html
+            html,
         });
         if (result.err) {
             console.error('Error sending email:', result.val);
             return new Err(makeProblem('email_not_sent', 'Unable to send the verification email'));
         }
-        return new Ok({
-            success: true,
-            link
-        });
-    } catch (e) {
+        return new Ok({ success: true, link });
+    }
+    catch (e) {
         return new Err(makeProblem('email_not_sent', e.message));
     }
 };
-export const verifyEmailUsage = async (newEmail)=>{
+export const verifyEmailUsage = async (newEmail) => {
     // TODO: add email regex checking
     if (newEmail.length < 3) {
         return new Err(makeProblem(PROBLEM_INVALID_DATA, 'Email address needs minimum 3 characters'));
     }
     const existingEmail = await prisma.user.findFirst({
         where: {
-            email: newEmail
-        }
+            email: newEmail,
+        },
     });
     if (existingEmail) {
         return new Err(makeProblem(PROBLEM_INVALID_DATA, 'The email address is already in use'));
     }
     return new Ok({});
 };
-export const sendVerificationSMS = async (userId, phoneNumber)=>{
+export const sendVerificationSMS = async (userId, phoneNumber) => {
     const token = await createSMSToken(userId, phoneNumber);
     if (!token) {
         return new Err(makeProblem(PROBLEM_NOT_IMPLEMENTED, 'Token was not created'));
     }
     return await sendSms(phoneNumber, token.value);
 };
-const formatPhoneNumber = (phoneNumber)=>{
+const formatPhoneNumber = (phoneNumber) => {
     return phoneNumber.replace(/[^0-9]/g, '');
 };
-const sendSms = async (phoneNumber, code)=>{
+const sendSms = async (phoneNumber, code) => {
     const isInternational = !formatPhoneNumber(phoneNumber).startsWith('60');
     try {
-        const sendSmsResult = isInternational ? await sendVonageSms(phoneNumber, code) : await sendEsmsSms(phoneNumber, code);
+        const sendSmsResult = isInternational
+            ? await sendVonageSms(phoneNumber, code)
+            : await sendEsmsSms(phoneNumber, code);
         if (sendSmsResult.err) {
             return new Err(await reportProblem(makeProblem({
                 type: 'public',
                 code: PROBLEM_EXTERNAL,
                 message: 'Unable to send sms verification',
                 privateMetadata: {
-                    error: sendSmsResult.val
-                }
+                    error: sendSmsResult.val,
+                },
             })));
         }
-        return new Ok({
-            success: true,
-            code
-        });
-    } catch (e) {
+        return new Ok({ success: true, code });
+    }
+    catch (e) {
         return new Err(await reportProblem(makeProblem({
             type: 'public',
             code: PROBLEM_INTERNAL,
             message: 'Unable to send sms verification',
             privateMetadata: {
-                error: e
-            }
+                error: e,
+            },
         })));
     }
 };
-export const handleCheckDuplication = async (b)=>{
+export const handleCheckDuplication = async (b) => {
     const { phoneNumber, email } = CheckDuplicationBody.parse(b);
     // Check if the user exists
     const checkForEmail = await prisma.user.findFirst({
         where: {
-            email: email.toLowerCase().trim()
-        }
+            email: email.toLowerCase().trim(),
+        },
     });
     if (checkForEmail) {
         return new Err(makeProblem(PROBLEM_CONFLICT, 'This email is already registered. Are you trying to sign in?'));
     }
     const checkForMobile = await prisma.user.findFirst({
         where: {
-            phoneNumber: phoneNumber.replace(/[\s-]/g, '')
-        }
+            phoneNumber: phoneNumber.replace(/[\s-]/g, ''),
+        },
     });
     if (checkForMobile) {
         return new Err(makeProblem(PROBLEM_CONFLICT, 'The phone number is already in use. Please try a different one.'));
     }
-    return new Ok({
-        notDuplicate: true
-    });
+    return new Ok({ notDuplicate: true });
 };
 /**
  * This function runs only for foreign numbers and sends an SMS containing the OTP code to the foreign number
  * @param phoneNumber user's phone number
  * @param code OTP code
  * @returns result of sending SMS to user
- */ const sendVonageSms = async (phoneNumber, code)=>{
+ */
+const sendVonageSms = async (phoneNumber, code) => {
     const body = {
         from: 'FLUX',
         to: formatPhoneNumber(phoneNumber),
         text: `FLUX verification code: ${code}`,
         api_key: config.vonage.apiKey,
-        api_secret: config.vonage.apiSecret
+        api_secret: config.vonage.apiSecret,
     };
     const result = await enhancedFetch('https://rest.nexmo.com/sms/json', {
         method: 'POST',
-        body: JSON.stringify(body)
+        body: JSON.stringify(body),
     });
     return result;
 };
@@ -194,17 +191,19 @@ export const handleCheckDuplication = async (b)=>{
  * @param phoneNumber user's phone number
  * @param code OTP code
  * @returns result of sending SMS to user
- */ const sendEsmsSms = async (phoneNumber, code)=>{
+ */
+const sendEsmsSms = async (phoneNumber, code) => {
     const body = {
         user: config.esms.apiKey,
         pass: config.esms.apiSecret,
         to: formatPhoneNumber(phoneNumber),
         msg: `RM0.00 FLUX verification code: ${code}`,
-        sender: 'FLUX'
+        sender: 'FLUX',
     };
     const result = await enhancedFetch('https://api.esms.com.my/sms/send', {
         method: 'POST',
-        body: JSON.stringify(body)
+        body: JSON.stringify(body),
     });
     return result;
 };
+//# sourceMappingURL=verifications.js.map

package/dist/constants.js

@@ -2,3 +2,4 @@ export const TASK_PIPELINE_SLACK = 'slack-pipeline';
 export const TASK_COMMIT_SLACK_CHANNEL = 'commit-slack-channel';
 export const TASK_PIPELINE_SLACK_CRON = '* * * * *';
 export const SALT_ROUNDS = 12;
+//# sourceMappingURL=constants.js.map

package/dist/create-logger.js

@@ -1,2 +1,3 @@
 import { createLogger } from '@driveflux/logger';
-export const createScopedLogger = (name)=>createLogger(`flux:api-functions:${name}`);
+export const createScopedLogger = (name) => createLogger(`flux:api-functions:${name}`);
+//# sourceMappingURL=create-logger.js.map