@saltcorn/data 0.6.3-beta.2 → 0.6.4-beta.2

package/dist/models/user.d.ts

@@ -1,15 +1,47 @@
-export = User;
+import { Row, SelectOptions, Where } from "@saltcorn/db-common/internal";
+import type { ErrorMessage, GenObj, SuccessMessage } from "@saltcorn/types/common_types";
 /**
  * User
  * @category saltcorn-data
  */
 declare class User {
+    email: string;
+    password: string;
+    language?: string;
+    _attributes?: any;
+    api_token?: string | null;
+    verification_token?: string;
+    verified_on?: Date;
+    disabled: boolean;
+    id?: number;
+    reset_password_token?: string | null;
+    reset_password_expiry?: Date | null;
+    role_id: number;
+    [key: string]: any;
+    /**
+     * User constructor
+     * @param {object} o
+     */
+    constructor(o: UserCfg | User);
     /**
      * Get bcrypt hash for Password
      * @param pw - password string
      * @returns {Promise<string>}
      */
-    static hashPassword(pw: any): Promise<string>;
+    static hashPassword(pw: string): Promise<string>;
+    /**
+     * Check password
+     * @param pw - password string
+     * @returns {boolean}
+     */
+    checkPassword(pw: string): boolean;
+    /**
+     * Change password
+     * @param newpw - new password string
+     * @param expireToken - if true than force reset password token
+     * @returns {Promise<void>} no result
+     */
+    changePasswordTo(newpw: string, expireToken?: boolean): Promise<void>;
     /**
      * Find or Create User
      * @param k
@@ -17,71 +49,101 @@ declare class User {
      * @param {object} [uo = {}]
      * @returns {Promise<{session_object: {_attributes: {}}, _attributes: {}}|User|*|boolean|{error: string}|User>}
      */
-    static findOrCreateByAttribute(k: any, v: any, uo?: object | undefined): Promise<{
-        session_object: {
-            _attributes: {};
-        };
-        _attributes: {};
-    } | User | any | boolean | {
-        error: string;
-    } | User>;
+    static findOrCreateByAttribute(k: string, v: any, uo?: any): Promise<User | false | ErrorMessage>;
     /**
      * Create user
      * @param uo - user object
      * @returns {Promise<{error: string}|User>}
      */
-    static create(uo: any): Promise<{
-        error: string;
-    } | User>;
+    static create(uo: GenObj): Promise<User | ErrorMessage>;
+    /**
+     * Create session object for user
+     * @type {{role_id: number, language, id, email, tenant: *}}
+     */
+    get session_object(): any;
     /**
      * Authenticate User
      * @param uo - user object
      * @returns {Promise<boolean|User>}
      */
-    static authenticate(uo: any): Promise<boolean | User>;
+    static authenticate(uo: any): Promise<User | false>;
     /**
      * Find users list
      * @param where - where object
      * @param selectopts - select options
      * @returns {Promise<User[]>}
      */
-    static find(where: any, selectopts: any): Promise<User[]>;
+    static find(where: Where, selectopts?: SelectOptions): Promise<Array<User>>;
     /**
      * Find one user
      * @param where - where object
      * @returns {Promise<User|*>}
      */
-    static findOne(where: any): Promise<User | any>;
+    static findOne(where: Where): Promise<User | undefined>;
     /**
      * Check that user table is not empty in database
      * @deprecated use method count()
      * @returns {Promise<boolean>} true if there are users in db
      */
     static nonEmpty(): Promise<boolean>;
+    /**
+     * Delete user based on session object
+     * @returns {Promise<void>}
+     */
+    delete(): Promise<void>;
+    /**
+     * Set language for User in database
+     * @param language
+     * @returns {Promise<void>}
+     */
+    set_language(language: string): Promise<void>;
+    /**
+     * Update User
+     * @param row
+     * @returns {Promise<void>}
+     */
+    update(row: Row): Promise<void>;
+    /**
+     * Get new reset token
+     * @returns {Promise<*|string>}
+     */
+    getNewResetToken(): Promise<string>;
+    /**
+     * Add new API token to user
+     * @returns {Promise<string>}
+     */
+    getNewAPIToken(): Promise<string>;
+    /**
+     * Remove API token for user
+     * @returns {Promise<string>}
+     */
+    removeAPIToken(): Promise<null>;
     /**
      * Validate password
      * @param pw
      * @returns {string}
      */
-    static unacceptable_password_reason(pw: any): string;
+    static unacceptable_password_reason(pw: string): string | undefined;
     /**
      * Validate email
      * @param email
      * @returns {boolean}
      */
-    static valid_email(email: any): boolean;
+    static valid_email(email: string): boolean;
     /**
      * Verification with token
      * @param email - email sting
      * @param verification_token - verification token string
      * @returns {Promise<{error: string}|boolean>} true if verification passed, error string if not
      */
-    static verifyWithToken({ email, verification_token }: {
-        email: any;
-        verification_token: any;
-    }): Promise<{
-        error: string;
-    } | boolean>;
+    static verifyWithToken({ email, verification_token, }: {
+        email: string;
+        verification_token: string;
+    }): Promise<true | ErrorMessage>;
+    /**
+     * @returns {Promise<boolean>}
+     */
+    set_to_verified(): Promise<true>;
     /**
      * Reset password using token
      * @param email - email address string
@@ -90,107 +152,26 @@ declare class User {
      * @returns {Promise<{error: string}|{success: boolean}>}
      */
     static resetPasswordWithToken({ email, reset_password_token, password, }: {
-        email: any;
-        reset_password_token: any;
-        password: any;
-    }): Promise<{
-        error: string;
-    } | {
-        success: boolean;
-    }>;
+        email: string;
+        reset_password_token: string;
+        password: string;
+    }): Promise<SuccessMessage | ErrorMessage>;
     /**
      * Count users in database
      * @param where
      * @returns {Promise<number>}
      */
-    static count(where: any): Promise<number>;
+    static count(where?: Where): Promise<number>;
     /**
      * Get available roles
      * @returns {Promise<*>}
      */
-    static get_roles(): Promise<any>;
+    static get_roles(): Promise<string[]>;
     /**
      * Generate password
      * @returns {string}
      */
     static generate_password(): string;
-    /**
-     * User constructor
-     * @param {object} o
-     */
-    constructor(o: object);
-    email: any;
-    password: any;
-    language: any;
-    _attributes: any;
-    api_token: any;
-    verification_token: any;
-    verified_on: any;
-    disabled: boolean;
-    id: any;
-    reset_password_token: any;
-    reset_password_expiry: any;
-    role_id: number;
-    /**
-     * Check password
-     * @param pw - password string
-     * @returns {boolean}
-     */
-    checkPassword(pw: any): boolean;
-    /**
-     * Change password
-     * @param newpw - new password string
-     * @param expireToken - if true than force reset password token
-     * @returns {Promise<void>} no result
-     */
-    changePasswordTo(newpw: any, expireToken: any): Promise<void>;
-    /**
-     * Create session object for user
-     * @type {{role_id: number, language, id, email, tenant: *}}
-     */
-    get session_object(): {
-        role_id: number;
-        language: any;
-        id: any;
-        email: any;
-        tenant: any;
-    };
-    /**
-     * Delete user based on session object
-     * @returns {Promise<void>}
-     */
-    delete(): Promise<void>;
-    /**
-     * Set language for User in database
-     * @param language
-     * @returns {Promise<void>}
-     */
-    set_language(language: any): Promise<void>;
-    /**
-     * Update User
-     * @param row
-     * @returns {Promise<void>}
-     */
-    update(row: any): Promise<void>;
-    /**
-     * Get new reset token
-     * @returns {Promise<*|string>}
-     */
-    getNewResetToken(): Promise<any | string>;
-    /**
-     * Add new API token to user
-     * @returns {Promise<string>}
-     */
-    getNewAPIToken(): Promise<string>;
-    /**
-     * Remove API token for user
-     * @returns {Promise<string>}
-     */
-    removeAPIToken(): Promise<string>;
-    /**
-     * @returns {Promise<boolean>}
-     */
-    set_to_verified(): Promise<boolean>;
     /**
      * @returns {Promise<void>}
      */
@@ -198,38 +179,25 @@ declare class User {
     /**
      * @param {object} req
      */
-    relogin(req: object): void;
+    relogin(req: NonNullable<any>): void;
 }
 declare namespace User {
-    namespace contract {
-        namespace variables {
-            const id: any;
-            const email: any;
-            const disabled: any;
-            const language: any;
-            const _attributes: any;
-            const role_id: any;
-            const reset_password_token: any;
-            const reset_password_expiry: any;
-        }
-        namespace methods {
-            const _delete: any;
-            export { _delete as delete };
-            export const destroy_sessions: any;
-            export const changePasswordTo: any;
-            export const checkPassword: any;
-        }
-        namespace static_methods {
-            const find: any;
-            const findOne: any;
-            const nonEmpty: any;
-            const hashPassword: any;
-            const authenticate: any;
-            const verifyWithToken: any;
-            const resetPasswordWithToken: any;
-            const create: any;
-            const get_roles: any;
-        }
-    }
+    type UserCfg = {
+        id?: number | string;
+        email: string;
+        password: string;
+        disabled?: boolean;
+        language?: string;
+        _attributes?: string | any;
+        api_token?: string;
+        verification_token?: string;
+        verified_on?: Date | number | string;
+        role_id?: number | string;
+        reset_password_token?: string;
+        reset_password_expiry?: Date | number | string;
+        [key: string]: any;
+    };
 }
+declare type UserCfg = User.UserCfg;
+export = User;
 //# sourceMappingURL=user.d.ts.map

package/dist/models/user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../models/user.js"],"names":[],"mappings":";AAkCA;;;GAGG;AACH;IAkCE;;;;OAIG;IACH,8BAFa,QAAQ,MAAM,CAAC,CAI3B;IAyBD;;;;;;OAMG;IACH,yEAFa,QAAQ;QAAC,cAAc,EAAE;YAAC,WAAW,EAAE,EAAE,CAAA;SAAC,CAAC;QAAC,WAAW,EAAE,EAAE,CAAA;KAAC,GAAC,IAAI,SAAG,OAAO,GAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,GAAC,IAAI,CAAC,CAyB7G;IAED;;;;OAIG;IACH,wBAFa,QAAQ;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,GAAC,IAAI,CAAC,CAsBzC;IAkBD;;;;OAIG;IACH,8BAFa,QAAQ,OAAO,GAAC,IAAI,CAAC,CAWjC;IAED;;;;;OAKG;IACH,0CAFa,QAAQ,IAAI,EAAE,CAAC,CAK3B;IAED;;;;OAIG;IACH,4BAFa,QAAQ,IAAI,MAAE,CAAC,CAK3B;IAED;;;;OAIG;IACH,mBAFa,QAAQ,OAAO,CAAC,CAK5B;IAwED;;;;OAIG;IACH,8CAFa,MAAM,CAMlB;IAED;;;;OAIG;IAEH,gCAHa,OAAO,CAKnB;IAED;;;;;OAKG;IACH;;;QAFa,QAAQ;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,GAAC,OAAO,CAAC,CAa5C;IAmBD;;;;;;OAMG;IACH;;;;QAFa,QAAQ;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,GAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAC,CAAC,CAkCvD;IAED;;;;OAIG;IAGH,0BAJa,QAAQ,MAAM,CAAC,CAM3B;IAED;;;OAGG;IACH,oBAFa,YAAU,CAKtB;IAED;;;OAGG;IACH,4BAFa,MAAM,CAOlB;IAhYD;;;OAGG;IACH,eAFW,MAAM,EA6BhB;IA1BC,WAAoB;IACpB,cAA0B;IAC1B,cAA0B;IAC1B,iBAGyB;IACzB,eAA4B;IAC5B,wBAA8C;IAC9C,iBAEiB;IACjB,kBAA4B;IAC5B,QAA6B;IAC7B,0BAA0D;IAC1D,2BAKqC;IACrC,gBAAyC;IAgB3C;;;;OAIG;IACH,wBAFa,OAAO,CAInB;IAED;;;;;OAKG;IACH,gDAFa,QAAQ,IAAI,CAAC,CAQzB;IA6DD;;;OAGG;IACH;iBAFoB,MAAM;;;;;MAYzB;IAiDD;;;OAGG;IACH,UAFa,QAAQ,IAAI,CAAC,CAMzB;IAED;;;;OAIG;IACH,6BAFa,QAAQ,IAAI,CAAC,CAIzB;IAED;;;;OAIG;IACH,kBAFa,QAAQ,IAAI,CAAC,CAIzB;IAED;;;OAGG;IACH,oBAFa,QAAQ,MAAE,MAAM,CAAC,CAgB7B;IAED;;;OAGG;IACH,kBAFa,QAAQ,MAAM,CAAC,CAO3B;IAED;;;OAGG;IACH,kBAFa,QAAQ,MAAM,CAAC,CAO3B;IA0CD;;OAEG;IACH,mBAFa,QAAQ,OAAO,CAAC,CAc5B;IA0ED;;OAEG;IACH,oBAFa,QAAQ,IAAI,CAAC,CAazB;IAED;;OAEG;IACH,aAFW,MAAM,QAMhB;CACF"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../models/user.ts"],"names":[],"mappings":"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"}

package/dist/models/user.js

@@ -1,15 +1,19 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 /**
  * @category saltcorn-data
  * @module models/user
  * @subcategory models
  */
-const db = require("../db");
-const bcrypt = require("bcryptjs");
-const { contract, is } = require("contractis");
-const { v4: uuidv4 } = require("uuid");
-const dumbPasswords = require("dumb-passwords");
-const validator = require("email-validator");
+const db_1 = __importDefault(require("../db"));
+const bcryptjs_1 = require("bcryptjs");
+const uuid_1 = require("uuid");
+const dumb_passwords_1 = require("dumb-passwords");
+const email_validator_1 = require("email-validator");
+const generators_1 = __importDefault(require("@saltcorn/types/generators"));
+const { generateString } = generators_1.default;
 /**
  * @param {object} o
  * @returns {*}
@@ -37,21 +41,24 @@ class User {
                 : o._attributes || {};
         this.api_token = o.api_token;
         this.verification_token = o.verification_token;
-        this.verified_on = ["string", "number"].includes(typeof o.verified_on)
-            ? new Date(o.verified_on)
-            : o.verified_on;
+        this.verified_on =
+            typeof o.verified_on === "string" || typeof o.verified_on === "number"
+                ? new Date(o.verified_on)
+                : o.verified_on;
         this.disabled = !!o.disabled;
-        this.id = o.id ? +o.id : o.id;
+        if (o.id)
+            this.id = +o.id;
         this.reset_password_token = o.reset_password_token || null;
         this.reset_password_expiry =
             (typeof o.reset_password_expiry === "string" &&
                 o.reset_password_expiry.length > 0) ||
                 typeof o.reset_password_expiry === "number"
                 ? new Date(o.reset_password_expiry)
-                : o.reset_password_expiry || null;
+                : o.reset_password_expiry instanceof Date
+                    ? o.reset_password_expiry
+                    : null;
         this.role_id = o.role_id ? +o.role_id : 8;
         Object.assign(this, safeUserFields(o));
-        contract.class(this);
     }
     /**
      * Get bcrypt hash for Password
@@ -59,7 +66,7 @@ class User {
      * @returns {Promise<string>}
      */
     static async hashPassword(pw) {
-        return await bcrypt.hash(pw, 10);
+        return await (0, bcryptjs_1.hash)(pw, 10);
     }
     /**
      * Check password
@@ -67,7 +74,7 @@ class User {
      * @returns {boolean}
      */
     checkPassword(pw) {
-        return bcrypt.compareSync(pw, this.password);
+        return (0, bcryptjs_1.compareSync)(pw, this.password);
     }
     /**
      * Change password
@@ -81,7 +88,7 @@ class User {
         const upd = { password };
         if (expireToken)
             upd.reset_password_token = null;
-        await db.update("users", upd, this.id);
+        await db_1.default.update("users", upd, this.id);
     }
     /**
      * Find or Create User
@@ -134,7 +141,7 @@ class User {
         const ex = await User.findOne({ email: u.email });
         if (ex)
             return { error: `User with this email already exists` };
-        const id = await db.insert("users", {
+        const id = await db_1.default.insert("users", {
             email: u.email,
             password: hashpw,
             role_id: u.role_id,
@@ -153,7 +160,7 @@ class User {
             id: this.id,
             role_id: this.role_id,
             language: this.language,
-            tenant: db.getTenantSchema(),
+            tenant: db_1.default.getTenantSchema(),
         };
         Object.assign(so, safeUserFields(this));
         return so;
@@ -184,7 +191,7 @@ class User {
      * @returns {Promise<User[]>}
      */
     static async find(where, selectopts) {
-        const us = await db.select("users", where, selectopts);
+        const us = await db_1.default.select("users", where, selectopts);
         return us.map((u) => new User(u));
     }
     /**
@@ -193,7 +200,7 @@ class User {
      * @returns {Promise<User|*>}
      */
     static async findOne(where) {
-        const u = await db.selectMaybeOne("users", where);
+        const u = await db_1.default.selectMaybeOne("users", where);
         return u ? new User(u) : u;
     }
     /**
@@ -202,7 +209,7 @@ class User {
      * @returns {Promise<boolean>} true if there are users in db
      */
     static async nonEmpty() {
-        const res = await db.count("users");
+        const res = await db_1.default.count("users");
         return res > 0;
     }
     /**
@@ -210,9 +217,9 @@ class User {
      * @returns {Promise<void>}
      */
     async delete() {
-        const schema = db.getTenantSchemaPrefix();
+        const schema = db_1.default.getTenantSchemaPrefix();
         this.destroy_sessions();
-        await db.query(`delete FROM ${schema}users WHERE id = $1`, [this.id]);
+        await db_1.default.query(`delete FROM ${schema}users WHERE id = $1`, [this.id]);
     }
     /**
      * Set language for User in database
@@ -228,18 +235,18 @@ class User {
      * @returns {Promise<void>}
      */
     async update(row) {
-        await db.update("users", row, this.id);
+        await db_1.default.update("users", row, this.id);
     }
     /**
      * Get new reset token
      * @returns {Promise<*|string>}
      */
     async getNewResetToken() {
-        const reset_password_token_uuid = uuidv4();
+        const reset_password_token_uuid = (0, uuid_1.v4)();
         const reset_password_expiry = new Date();
         reset_password_expiry.setDate(new Date().getDate() + 1);
-        const reset_password_token = await bcrypt.hash(reset_password_token_uuid, 10);
-        await db.update("users", { reset_password_token, reset_password_expiry }, this.id);
+        const reset_password_token = await (0, bcryptjs_1.hash)(reset_password_token_uuid, 10);
+        await db_1.default.update("users", { reset_password_token, reset_password_expiry }, this.id);
         return reset_password_token_uuid;
     }
     /**
@@ -247,8 +254,8 @@ class User {
      * @returns {Promise<string>}
      */
     async getNewAPIToken() {
-        const api_token = uuidv4();
-        await db.update("users", { api_token }, this.id);
+        const api_token = (0, uuid_1.v4)();
+        await db_1.default.update("users", { api_token }, this.id);
         this.api_token = api_token;
         return api_token;
     }
@@ -258,7 +265,7 @@ class User {
      */
     async removeAPIToken() {
         const api_token = null;
-        await db.update("users", { api_token }, this.id);
+        await db_1.default.update("users", { api_token }, this.id);
         this.api_token = api_token;
         return api_token;
     }
@@ -272,7 +279,7 @@ class User {
             return "Not a string";
         if (pw.length < 8)
             return "Too short";
-        if (dumbPasswords.check(pw))
+        if ((0, dumb_passwords_1.check)(pw))
             return "Too common";
     }
     /**
@@ -282,7 +289,7 @@ class User {
      */
     // TBD that validation works
     static valid_email(email) {
-        return validator.validate(email);
+        return (0, email_validator_1.validate)(email);
     }
     /**
      * Verification with token
@@ -290,7 +297,7 @@ class User {
      * @param verification_token - verification token string
      * @returns {Promise<{error: string}|boolean>} true if verification passed, error string if not
      */
-    static async verifyWithToken({ email, verification_token }) {
+    static async verifyWithToken({ email, verification_token, }) {
         if (typeof verification_token !== "string" ||
             typeof email !== "string" ||
             verification_token.length < 10 ||
@@ -310,7 +317,7 @@ class User {
         const elevate_verified = +getState().getConfig("elevate_verified");
         if (elevate_verified)
             upd.role_id = Math.min(elevate_verified, this.role_id);
-        await db.update("users", upd, this.id);
+        await db_1.default.update("users", upd, this.id);
         Object.assign(this, upd);
         const Trigger = require("./trigger");
         Trigger.emitEvent("UserVerified", null, this, this);
@@ -331,8 +338,11 @@ class User {
                 error: "Invalid token or invalid token length or incorrect email",
             };
         const u = await User.findOne({ email });
-        if (u && new Date() < u.reset_password_expiry && u.reset_password_token) {
-            const match = bcrypt.compareSync(reset_password_token, u.reset_password_token);
+        if (u &&
+            u.reset_password_expiry &&
+            new Date() < u.reset_password_expiry &&
+            u.reset_password_token) {
+            const match = (0, bcryptjs_1.compareSync)(reset_password_token, u.reset_password_token);
             if (match) {
                 if (User.unacceptable_password_reason(password))
                     return {
@@ -357,14 +367,14 @@ class User {
     // TBD I think that method is simular to notEmppty() but more powerfull.
     // TBD use some rules for naming of methods - e.g. this method will have name count_users or countUsers because of methods relay on roles in this class
     static async count(where) {
-        return await db.count("users", where || {});
+        return await db_1.default.count("users", where || {});
     }
     /**
      * Get available roles
      * @returns {Promise<*>}
      */
     static async get_roles() {
-        const rs = await db.select("_sc_roles", {}, { orderBy: "id" });
+        const rs = await db_1.default.select("_sc_roles", {}, { orderBy: "id" });
         return rs;
     }
     /**
@@ -372,7 +382,7 @@ class User {
      * @returns {string}
      */
     static generate_password() {
-        const candidate = is.str.generate().split(" ").join("");
+        const candidate = generateString().split(" ").join("");
         // TBD low performance impact - un
         if (candidate.length < 10)
             return User.generate_password();
@@ -383,9 +393,9 @@ class User {
      * @returns {Promise<void>}
      */
     async destroy_sessions() {
-        if (!db.isSQLite) {
-            const schema = db.getTenantSchema();
-            await db.query(`delete from _sc_session 
+        if (!db_1.default.isSQLite) {
+            const schema = db_1.default.getTenantSchema();
+            await db_1.default.query(`delete from _sc_session 
         where sess->'passport'->'user'->>'id' = $1 
         and sess->'passport'->'user'->>'tenant' = $2`, [`${this.id}`, schema]);
         }
@@ -400,35 +410,5 @@ class User {
         });
     }
 }
-User.contract = {
-    variables: {
-        id: is.maybe(is.posint),
-        email: is.str,
-        //password: is.str,
-        disabled: is.bool,
-        language: is.maybe(is.str),
-        _attributes: is.maybe(is.obj({})),
-        role_id: is.posint,
-        reset_password_token: is.maybe(is.and(is.str, is.sat((s) => s.length > 10))),
-        reset_password_expiry: is.maybe(is.class("Date")),
-    },
-    methods: {
-        delete: is.fun([], is.promise(is.undefined)),
-        destroy_sessions: is.fun([], is.promise(is.undefined)),
-        changePasswordTo: is.fun(is.str, is.promise(is.undefined)),
-        checkPassword: is.fun(is.str, is.bool),
-    },
-    static_methods: {
-        find: is.fun(is.maybe(is.obj()), is.promise(is.array(is.class("User")))),
-        findOne: is.fun(is.obj(), is.promise(is.maybe(is.class("User")))),
-        nonEmpty: is.fun([], is.promise(is.bool)),
-        hashPassword: is.fun(is.str, is.promise(is.str)),
-        authenticate: is.fun(is.objVals(is.str), is.promise(is.or(is.class("User"), is.eq(false)))),
-        verifyWithToken: is.fun(is.obj({ email: is.str, verification_token: is.str }), is.promise(is.any)),
-        resetPasswordWithToken: is.fun(is.obj({ email: is.str, reset_password_token: is.str, password: is.str }), is.promise(is.any)),
-        create: is.fun(is.obj({ email: is.str }), is.promise(is.or(is.obj({ error: is.str }), is.class("User")))),
-        get_roles: is.fun([], is.promise(is.array(is.obj({ id: is.posint, role: is.str })))),
-    },
-};
 module.exports = User;
 //# sourceMappingURL=user.js.map