@driveflux/api-functions 0.0.7-next.0 → 0.0.7-next.10

package/dist/auth/confirm.d.ts

@@ -9,25 +9,11 @@ export type ConfirmUserOptions = z.infer<typeof Body>;
 declare const Body: z.ZodObject<{
     firstName: z.ZodString;
     lastName: z.ZodString;
-    phoneNumber: z.ZodEffects<z.ZodString, string, string>;
+    phoneNumber: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
     code: z.ZodNullable<z.ZodOptional<z.ZodString>>;
-    email: z.ZodEffects<z.ZodString, string, string>;
+    email: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
     pageSource: z.ZodNullable<z.ZodOptional<z.ZodString>>;
-}, "strip", z.ZodTypeAny, {
-    firstName: string;
-    lastName: string;
-    email: string;
-    phoneNumber: string;
-    code?: string | null | undefined;
-    pageSource?: string | null | undefined;
-}, {
-    firstName: string;
-    lastName: string;
-    email: string;
-    phoneNumber: string;
-    code?: string | null | undefined;
-    pageSource?: string | null | undefined;
-}>;
+}, z.core.$strip>;
 export declare const handleConfirmUser: (b: Record<string, unknown>, user: Pick<User, "id" | "phoneNumberVerified" | "metadata">, xForwardedFor?: string | string[]) => PromisedResult<ConfirmUserApiResponse>;
 export {};
 //# sourceMappingURL=confirm.d.ts.map

package/dist/auth/confirm.js

@@ -1,202 +1,3 @@
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-    try {
-        var info = gen[key](arg);
-        var value = info.value;
-    } catch (error) {
-        reject(error);
-        return;
-    }
-    if (info.done) {
-        resolve(value);
-    } else {
-        Promise.resolve(value).then(_next, _throw);
-    }
-}
-function _async_to_generator(fn) {
-    return function() {
-        var self = this, args = arguments;
-        return new Promise(function(resolve, reject) {
-            var gen = fn.apply(self, args);
-            function _next(value) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-            }
-            function _throw(err) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-            }
-            _next(undefined);
-        });
-    };
-}
-function _define_property(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        obj[key] = value;
-    }
-    return obj;
-}
-function _object_spread(target) {
-    for(var i = 1; i < arguments.length; i++){
-        var source = arguments[i] != null ? arguments[i] : {};
-        var ownKeys = Object.keys(source);
-        if (typeof Object.getOwnPropertySymbols === "function") {
-            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-            }));
-        }
-        ownKeys.forEach(function(key) {
-            _define_property(target, key, source[key]);
-        });
-    }
-    return target;
-}
-function ownKeys(object, enumerableOnly) {
-    var keys = Object.keys(object);
-    if (Object.getOwnPropertySymbols) {
-        var symbols = Object.getOwnPropertySymbols(object);
-        if (enumerableOnly) {
-            symbols = symbols.filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-            });
-        }
-        keys.push.apply(keys, symbols);
-    }
-    return keys;
-}
-function _object_spread_props(target, source) {
-    source = source != null ? source : {};
-    if (Object.getOwnPropertyDescriptors) {
-        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-        ownKeys(Object(source)).forEach(function(key) {
-            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-        });
-    }
-    return target;
-}
-function _object_without_properties(source, excluded) {
-    if (source == null) return {};
-    var target = _object_without_properties_loose(source, excluded);
-    var key, i;
-    if (Object.getOwnPropertySymbols) {
-        var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-        for(i = 0; i < sourceSymbolKeys.length; i++){
-            key = sourceSymbolKeys[i];
-            if (excluded.indexOf(key) >= 0) continue;
-            if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
-            target[key] = source[key];
-        }
-    }
-    return target;
-}
-function _object_without_properties_loose(source, excluded) {
-    if (source == null) return {};
-    var target = {};
-    var sourceKeys = Object.keys(source);
-    var key, i;
-    for(i = 0; i < sourceKeys.length; i++){
-        key = sourceKeys[i];
-        if (excluded.indexOf(key) >= 0) continue;
-        target[key] = source[key];
-    }
-    return target;
-}
-function _ts_generator(thisArg, body) {
-    var f, y, t, _ = {
-        label: 0,
-        sent: function() {
-            if (t[0] & 1) throw t[1];
-            return t[1];
-        },
-        trys: [],
-        ops: []
-    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-        return this;
-    }), g;
-    function verb(n) {
-        return function(v) {
-            return step([
-                n,
-                v
-            ]);
-        };
-    }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while(g && (g = 0, op[0] && (_ = 0)), _)try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [
-                op[0] & 2,
-                t.value
-            ];
-            switch(op[0]){
-                case 0:
-                case 1:
-                    t = op;
-                    break;
-                case 4:
-                    _.label++;
-                    return {
-                        value: op[1],
-                        done: false
-                    };
-                case 5:
-                    _.label++;
-                    y = op[1];
-                    op = [
-                        0
-                    ];
-                    continue;
-                case 7:
-                    op = _.ops.pop();
-                    _.trys.pop();
-                    continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-                        _ = 0;
-                        continue;
-                    }
-                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-                        _.label = op[1];
-                        break;
-                    }
-                    if (op[0] === 6 && _.label < t[1]) {
-                        _.label = t[1];
-                        t = op;
-                        break;
-                    }
-                    if (t && _.label < t[2]) {
-                        _.label = t[2];
-                        _.ops.push(op);
-                        break;
-                    }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop();
-                    continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) {
-            op = [
-                6,
-                e
-            ];
-            y = 0;
-        } finally{
-            f = t = 0;
-        }
-        if (op[0] & 5) throw op[1];
-        return {
-            value: op[0] ? op[1] : void 0,
-            done: true
-        };
-    }
-}
 import { refreshEmailPreferences } from '@driveflux/api-functions/mailjet/refresh-email-preferences';
 import { prisma } from '@driveflux/db';
 import { generateId } from '@driveflux/db/id';
@@ -207,136 +8,76 @@ import { addDays } from 'date-fns/addDays';
 import { z } from 'zod';
 import { clearToken, verifyToken } from './tokens.js';
 import { sendVerificationEmail } from './verifications.js';
-var Body = z.object({
+const Body = z.object({
     firstName: z.string(),
     lastName: z.string(),
-    phoneNumber: z.string().transform(function(s) {
-        return s.replace(/[\s-]/g, '');
-    }),
+    phoneNumber: z.string().transform((s)=>s.replace(/[\s-]/g, '')),
     code: z.string().optional().nullable(),
-    email: z.string().email().transform(function(s) {
-        return s.toLowerCase().trim();
-    }),
+    email: z.string().email().transform((s)=>s.toLowerCase().trim()),
     pageSource: z.string().optional().nullable()
 });
-export var handleConfirmUser = function(b, user, xForwardedFor) {
-    return _async_to_generator(function() {
-        var _user_metadata, _Body_parse, phoneNumber, email, code, pageSource, body, phoneNumberVerified, tokenResult, method, updatedUser, token;
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    _Body_parse = Body.parse(b), phoneNumber = _Body_parse.phoneNumber, email = _Body_parse.email, code = _Body_parse.code, pageSource = _Body_parse.pageSource, body = _object_without_properties(_Body_parse, [
-                        "phoneNumber",
-                        "email",
-                        "code",
-                        "pageSource"
-                    ]);
-                    phoneNumberVerified = false;
-                    if (!code) return [
-                        3,
-                        3
-                    ];
-                    return [
-                        4,
-                        verifyToken(code, {
-                            scope: 'verify-phone'
-                        })
-                    ];
-                case 1:
-                    tokenResult = _state.sent();
-                    if (tokenResult.err) {
-                        return [
-                            2,
-                            new Err(makeProblem(PROBLEM_CONFLICT, 'Invalid OTP token'))
-                        ];
-                    }
-                    return [
-                        4,
-                        clearToken(tokenResult.val.id)
-                    ];
-                case 2:
-                    _state.sent();
-                    phoneNumberVerified = true;
-                    return [
-                        3,
-                        4
-                    ];
-                case 3:
-                    phoneNumberVerified = user.phoneNumberVerified;
-                    _state.label = 4;
-                case 4:
-                    method = isMetadata(user === null || user === void 0 ? void 0 : user.metadata) ? user === null || user === void 0 ? void 0 : (_user_metadata = user.metadata) === null || _user_metadata === void 0 ? void 0 : _user_metadata.signupProvider : undefined;
-                    return [
-                        4,
-                        prisma.user.update({
-                            where: {
-                                id: user.id
-                            },
-                            data: _object_spread_props(_object_spread({}, body), {
-                                phoneNumber: phoneNumber === null || phoneNumber === void 0 ? void 0 : phoneNumber.replace(/[\s-]/g, ''),
-                                preferredCurrency: 'MYR',
-                                preferredLocale: 'en',
-                                phoneNumberVerified: phoneNumberVerified,
-                                consented: true,
-                                groups: [
-                                    'member'
-                                ],
-                                signupParams: {
-                                    method: method,
-                                    source: pageSource
-                                },
-                                consents: {
-                                    create: {
-                                        id: generateId('UserConsent'),
-                                        ipAddress: Array.isArray(xForwardedFor) ? (xForwardedFor === null || xForwardedFor === void 0 ? void 0 : xForwardedFor[0]) || '0.0.0.0' : xForwardedFor || '0.0.0.0',
-                                        consentType: 'terms',
-                                        email: email
-                                    }
-                                },
-                                registrationComplete: true
-                            })
-                        })
-                    ];
-                case 5:
-                    updatedUser = _state.sent();
-                    return [
-                        4,
-                        prisma.token.create({
-                            data: {
-                                id: generateId('Token'),
-                                user: {
-                                    connect: {
-                                        id: updatedUser.id
-                                    }
-                                },
-                                expiresAt: addDays(new Date(), 365),
-                                scope: 'all'
-                            }
-                        })
-                    ];
-                case 6:
-                    token = _state.sent();
-                    // We don't want this to be a task. It should be instant
-                    return [
-                        4,
-                        sendVerificationEmail(updatedUser.id)
-                    ];
-                case 7:
-                    _state.sent();
-                    return [
-                        4,
-                        refreshEmailPreferences(updatedUser.id)
-                    ];
-                case 8:
-                    _state.sent();
-                    return [
-                        2,
-                        new Ok({
-                            token: token,
-                            user: updatedUser
-                        })
-                    ];
-            }
+export const handleConfirmUser = async (b, user, xForwardedFor)=>{
+    const { phoneNumber, email, code, pageSource, ...body } = Body.parse(b);
+    let phoneNumberVerified = false;
+    if (code) {
+        const tokenResult = await verifyToken(code, {
+            scope: 'verify-phone'
         });
-    })();
+        if (tokenResult.err) {
+            return new Err(makeProblem(PROBLEM_CONFLICT, 'Invalid OTP token'));
+        }
+        await clearToken(tokenResult.val.id);
+        phoneNumberVerified = true;
+    } else {
+        phoneNumberVerified = user.phoneNumberVerified;
+    }
+    const method = isMetadata(user?.metadata) ? user?.metadata?.signupProvider : undefined;
+    const updatedUser = await prisma.user.update({
+        where: {
+            id: user.id
+        },
+        data: {
+            ...body,
+            phoneNumber: phoneNumber?.replace(/[\s-]/g, ''),
+            preferredCurrency: 'MYR',
+            preferredLocale: 'en',
+            phoneNumberVerified,
+            consented: true,
+            groups: [
+                'member'
+            ],
+            signupParams: {
+                method,
+                source: pageSource
+            },
+            consents: {
+                create: {
+                    id: generateId('UserConsent'),
+                    ipAddress: Array.isArray(xForwardedFor) ? xForwardedFor?.[0] || '0.0.0.0' : xForwardedFor || '0.0.0.0',
+                    consentType: 'terms',
+                    email: email
+                }
+            },
+            registrationComplete: true
+        }
+    });
+    const token = await prisma.token.create({
+        data: {
+            id: generateId('Token'),
+            user: {
+                connect: {
+                    id: updatedUser.id
+                }
+            },
+            expiresAt: addDays(new Date(), 365),
+            scope: 'all'
+        }
+    });
+    // We don't want this to be a task. It should be instant
+    await sendVerificationEmail(updatedUser.id);
+    await refreshEmailPreferences(updatedUser.id);
+    return new Ok({
+        token,
+        user: updatedUser
+    });
 };

package/dist/auth/emails.js

@@ -1,218 +1,50 @@
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-    try {
-        var info = gen[key](arg);
-        var value = info.value;
-    } catch (error) {
-        reject(error);
-        return;
-    }
-    if (info.done) {
-        resolve(value);
-    } else {
-        Promise.resolve(value).then(_next, _throw);
-    }
-}
-function _async_to_generator(fn) {
-    return function() {
-        var self = this, args = arguments;
-        return new Promise(function(resolve, reject) {
-            var gen = fn.apply(self, args);
-            function _next(value) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-            }
-            function _throw(err) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-            }
-            _next(undefined);
-        });
-    };
-}
-function _ts_generator(thisArg, body) {
-    var f, y, t, _ = {
-        label: 0,
-        sent: function() {
-            if (t[0] & 1) throw t[1];
-            return t[1];
-        },
-        trys: [],
-        ops: []
-    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-        return this;
-    }), g;
-    function verb(n) {
-        return function(v) {
-            return step([
-                n,
-                v
-            ]);
-        };
-    }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while(g && (g = 0, op[0] && (_ = 0)), _)try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [
-                op[0] & 2,
-                t.value
-            ];
-            switch(op[0]){
-                case 0:
-                case 1:
-                    t = op;
-                    break;
-                case 4:
-                    _.label++;
-                    return {
-                        value: op[1],
-                        done: false
-                    };
-                case 5:
-                    _.label++;
-                    y = op[1];
-                    op = [
-                        0
-                    ];
-                    continue;
-                case 7:
-                    op = _.ops.pop();
-                    _.trys.pop();
-                    continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-                        _ = 0;
-                        continue;
-                    }
-                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-                        _.label = op[1];
-                        break;
-                    }
-                    if (op[0] === 6 && _.label < t[1]) {
-                        _.label = t[1];
-                        t = op;
-                        break;
-                    }
-                    if (t && _.label < t[2]) {
-                        _.label = t[2];
-                        _.ops.push(op);
-                        break;
-                    }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop();
-                    continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) {
-            op = [
-                6,
-                e
-            ];
-            y = 0;
-        } finally{
-            f = t = 0;
-        }
-        if (op[0] & 5) throw op[1];
-        return {
-            value: op[0] ? op[1] : void 0,
-            done: true
-        };
-    }
-}
 import { prisma } from '@driveflux/db';
 import { send } from '@driveflux/email';
 import { emailChangedEmail } from '@driveflux/email-templates/flux/email-changed';
 import { passwordChangedEmail } from '@driveflux/email-templates/flux/password-changed';
 import { makeProblem, PROBLEM_NOT_FOUND } from '@driveflux/problem';
 import { Err } from '@driveflux/result';
-export var sendEmailChangedEmail = function(userId) {
-    return _async_to_generator(function() {
-        var user;
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    return [
-                        4,
-                        prisma.user.findUnique({
-                            where: {
-                                id: userId
-                            }
-                        })
-                    ];
-                case 1:
-                    user = _state.sent();
-                    if (!user) {
-                        return [
-                            2,
-                            new Err(makeProblem(PROBLEM_NOT_FOUND, "The user ".concat(userId, " was not found")))
-                        ];
-                    }
-                    return [
-                        4,
-                        send({
-                            subject: 'Email change confirmation',
-                            to: {
-                                name: user.firstName || '',
-                                address: user.email
-                            },
-                            html: emailChangedEmail({
-                                user: user.firstName || '',
-                                title: 'Email change confirmation',
-                                newEmail: user.email
-                            })
-                        })
-                    ];
-                case 2:
-                    return [
-                        2,
-                        _state.sent()
-                    ];
-            }
-        });
-    })();
+export const sendEmailChangedEmail = async (userId)=>{
+    const user = await prisma.user.findUnique({
+        where: {
+            id: userId
+        }
+    });
+    if (!user) {
+        return new Err(makeProblem(PROBLEM_NOT_FOUND, `The user ${userId} was not found`));
+    }
+    return await send({
+        subject: 'Email change confirmation',
+        to: {
+            name: user.firstName || '',
+            address: user.email
+        },
+        html: emailChangedEmail({
+            user: user.firstName || '',
+            title: 'Email change confirmation',
+            newEmail: user.email
+        })
+    });
 };
-export var sendPasswordChangedEmail = function(userId) {
-    return _async_to_generator(function() {
-        var user, title;
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    return [
-                        4,
-                        prisma.user.findUnique({
-                            where: {
-                                id: userId
-                            }
-                        })
-                    ];
-                case 1:
-                    user = _state.sent();
-                    if (!user) {
-                        return [
-                            2,
-                            new Err(makeProblem(PROBLEM_NOT_FOUND, "The user ".concat(userId, " was not found")))
-                        ];
-                    }
-                    title = 'Password changed';
-                    return [
-                        4,
-                        send({
-                            subject: title,
-                            to: {
-                                name: user.firstName || '',
-                                address: user.email
-                            },
-                            html: passwordChangedEmail({
-                                user: user.firstName || '',
-                                title: title
-                            })
-                        })
-                    ];
-                case 2:
-                    return [
-                        2,
-                        _state.sent()
-                    ];
-            }
-        });
-    })();
+export const sendPasswordChangedEmail = async (userId)=>{
+    const user = await prisma.user.findUnique({
+        where: {
+            id: userId
+        }
+    });
+    if (!user) {
+        return new Err(makeProblem(PROBLEM_NOT_FOUND, `The user ${userId} was not found`));
+    }
+    const title = 'Password changed';
+    return await send({
+        subject: title,
+        to: {
+            name: user.firstName || '',
+            address: user.email
+        },
+        html: passwordChangedEmail({
+            user: user.firstName || '',
+            title: title
+        })
+    });
 };