@sqrzro/server 2.0.0-bz.5 → 2.0.0-bz.6

package/dist/AuthService.d.ts

@@ -1,6 +1,7 @@
+import type { Errorable } from '@sqrzro/interfaces';
 import type { NextRequest } from 'next/server';
 import { NextResponse } from 'next/server';
-import type { Errorable, LoginFormFields, UserObject } from './interfaces';
+import type { LoginFormFields, UserObject } from './interfaces';
 export declare function handleLogin(formData: LoginFormFields, lookupFn: (email: string) => Promise<UserObject | null>): Promise<Errorable<UserObject>>;
 interface MeObject {
     name: string;

package/dist/DataService.d.ts

@@ -1,10 +1,10 @@
+import type { Errorable } from '@sqrzro/interfaces';
 import type Joi from 'joi';
-import type { Errorable } from './interfaces';
 interface MutateArgs<F extends object> {
     formData: F;
     onSuccess?: (model: F) => Promise<void> | void;
     onValidationError?: (errors: Record<string, string>) => void;
-    request: Promise<Joi.ObjectSchema<F>>;
+    request: Joi.ObjectSchema<F>;
 }
 interface MutateArgsWithFn<F extends object, M> extends Omit<MutateArgs<F>, 'onSuccess'> {
     fn: (data: F) => Promise<M | null>;

package/dist/DataService.js

@@ -7,7 +7,7 @@ function hasFn(args) {
     return Boolean(Object.prototype.hasOwnProperty.call(args, 'fn'));
 }
 async function mutate(args) {
-    const [validated, validationErrors] = await (0, RequestService_1.validateSchema)(args.formData, await args.request);
+    const [validated, validationErrors] = await (0, RequestService_1.validateSchema)(args.formData, args.request);
     if (validationErrors) {
         args.onValidationError?.(validationErrors);
         return [null, validationErrors];

package/dist/ImageService.d.ts

@@ -1,4 +1,4 @@
-import type { Errorable } from './interfaces';
+import type { Errorable } from '@sqrzro/interfaces';
 interface ImageValidationConfig {
     maxSize?: number;
     types?: string[];

package/dist/LoginRequest.d.ts

@@ -1,4 +1,4 @@
 import Joi from 'joi';
 import type { LoginFormFields } from './interfaces';
-declare const LoginRequest: Promise<Joi.ObjectSchema<LoginFormFields>>;
+declare const LoginRequest: Joi.ObjectSchema<LoginFormFields>;
 export default LoginRequest;

package/dist/PasswordService.js

@@ -4,6 +4,7 @@ exports.checkPasswordComplexity = exports.verifyPassword = exports.hashPassword
 const tslib_1 = require("tslib");
 const bcryptjs_1 = tslib_1.__importDefault(require("bcryptjs"));
 const PW_SALT_ROUNDS = 12;
+const SECRET_LENGTH = 64;
 const PASSWORD_RULES = {
     min: 8,
     upper: 1,
@@ -34,8 +35,13 @@ const PASSWORD_FUNCTIONS = {
     symbol: checkPasswordSymbol,
 };
 async function createSecret() {
-    const secret = await bcryptjs_1.default.genSalt(PW_SALT_ROUNDS);
-    return secret;
+    const charset = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+    let secret = '';
+    for (let idx = 0; idx < SECRET_LENGTH; idx += 1) {
+        const randomIndex = Math.floor(Math.random() * charset.length);
+        secret += charset[randomIndex];
+    }
+    return Promise.resolve(secret);
 }
 exports.createSecret = createSecret;
 async function hashPassword(password) {

package/dist/RequestService.d.ts

@@ -1,5 +1,5 @@
 import Joi from 'joi';
-import type { ErrorablePromise } from './interfaces';
+import type { Errorable } from '@sqrzro/interfaces';
 export declare function validate(): typeof Joi;
 /**
  * This function takes FormData and a schema. It then attempts to transform the FormData into an
@@ -12,10 +12,10 @@ export declare function validate(): typeof Joi;
  * @param validation
  * @returns
  */
-export declare function validateSchema<T extends object>(formData: T, validation: Joi.ObjectSchema<T>): ErrorablePromise<T>;
-export declare function createSchema<T>(schema: Joi.PartialSchemaMap<T>): Promise<Joi.ObjectSchema<T>>;
+export declare function validateSchema<T extends object>(formData: T, validation: Joi.ObjectSchema<T>): Promise<Errorable<T>>;
+export declare function createSchema<T>(schema: Joi.PartialSchemaMap<T>): Joi.ObjectSchema<T>;
 interface ExtendSchemaOptions {
     required?: string[];
 }
-export declare function extendSchema<T>(schema: Promise<Joi.ObjectSchema<T>>, appends: Joi.PartialSchemaMap<T>, options?: ExtendSchemaOptions): Promise<Joi.ObjectSchema<T>>;
+export declare function extendSchema<T>(schema: Joi.ObjectSchema<T>, appends: Joi.PartialSchemaMap<T>, options?: ExtendSchemaOptions): Joi.ObjectSchema<T>;
 export {};

package/dist/RequestService.js

@@ -52,20 +52,16 @@ async function validateSchema(formData, validation) {
     }
 }
 exports.validateSchema = validateSchema;
-async function createSchema(schema) {
-    return new Promise((resolve) => {
-        resolve(joi_1.default.object(schema));
-    });
+function createSchema(schema) {
+    return joi_1.default.object(schema);
 }
 exports.createSchema = createSchema;
-async function extendSchema(schema, appends, options) {
-    const extended = (await schema).concat(joi_1.default.object(appends));
+function extendSchema(schema, appends, options) {
+    const extended = schema.concat(joi_1.default.object(appends));
     const required = (options?.required || []).reduce((acc, cur) => ({
         ...acc,
         [cur]: extended.extract(cur).required(),
     }), {});
-    return new Promise((resolve) => {
-        resolve(extended.concat(joi_1.default.object(required)));
-    });
+    return extended.concat(joi_1.default.object(required));
 }
 exports.extendSchema = extendSchema;

package/dist/interfaces.d.ts

@@ -1,7 +1,3 @@
-export type CastType = 'date';
-export type CastObject<T extends object> = Partial<Record<keyof T, CastType>>;
-export type Errorable<T> = [null, Record<string, string>] | [T, null];
-export type ErrorablePromise<T> = Promise<Errorable<T>>;
 export interface LoginFormFields {
     email: string;
     password: string;

package/dist/middleware.d.ts

@@ -1,4 +1,4 @@
 import { NextResponse } from 'next/server';
 import type { NextRequest } from 'next/server';
 export declare function getIdFromToken(token: string | null): Promise<number>;
-export declare function handleMiddleware(request: NextRequest, url: string): Promise<NextResponse>;
+export declare function handleMiddleware(request: NextRequest, url: string, cb?: () => NextResponse): Promise<NextResponse>;

package/dist/middleware.js

@@ -25,12 +25,12 @@ function redirectToLogin(request, url) {
     }
     return server_1.NextResponse.redirect(`${url}login?r=${encodeURIComponent(getRelativeUrl(request.url))}`);
 }
-async function handleMiddleware(request, url) {
+async function handleMiddleware(request, url, cb) {
     const token = request.cookies.get('token')?.value;
     const userId = await getIdFromToken(token || null);
     if (!userId) {
         return redirectToLogin(request, url);
     }
-    return server_1.NextResponse.next();
+    return cb ? cb() : server_1.NextResponse.next();
 }
 exports.handleMiddleware = handleMiddleware;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sqrzro/server",
-  "version": "2.0.0-bz.5",
+  "version": "2.0.0-bz.6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "ISC",
@@ -10,6 +10,7 @@
     "middleware.d.ts"
   ],
   "dependencies": {
+    "@sqrzro/interfaces": "bz",
     "@sqrzro/utility": "bz",
     "bcryptjs": "^2.4.3",
     "joi": "^17.11.0",