@technomoron/api-server-base 2.0.0-beta.2 → 2.0.0-beta.21

package/dist/esm/user/sequelize.js

@@ -1,24 +1,10 @@
-import { DataTypes, Model, Op } from 'sequelize';
+import { DataTypes, Model, Op, UniqueConstraintError } from 'sequelize';
+import { normalizeNumericUserId } from '../auth-api/user-id.js';
+import { integerIdType, tableOptions } from '../sequelize-utils.js';
 import { UserStore } from './base.js';
-const DIALECTS_SUPPORTING_UNSIGNED = new Set(['mysql', 'mariadb']);
-function integerIdType(sequelize) {
-    return DIALECTS_SUPPORTING_UNSIGNED.has(sequelize.getDialect()) ? DataTypes.INTEGER.UNSIGNED : DataTypes.INTEGER;
-}
-function userTableOptions(sequelize) {
-    const opts = {
-        sequelize,
-        tableName: 'users',
-        timestamps: false
-    };
-    if (DIALECTS_SUPPORTING_UNSIGNED.has(sequelize.getDialect())) {
-        opts.charset = 'utf8mb4';
-        opts.collate = 'utf8mb4_unicode_ci';
-    }
-    return opts;
-}
 export class AuthUserModel extends Model {
 }
-export function initAuthUserModel(sequelize) {
+export function initAuthUserModel(sequelize, options = {}) {
     const idType = integerIdType(sequelize);
     AuthUserModel.init({
         user_id: {
@@ -42,7 +28,7 @@ export function initAuthUserModel(sequelize) {
             allowNull: false
         }
     }, {
-        ...userTableOptions(sequelize)
+        ...tableOptions(sequelize, 'users', options.tablePrefix, { timestamps: false })
     });
     return AuthUserModel;
 }
@@ -58,7 +44,9 @@ export class SequelizeUserStore extends UserStore {
         }
         this.Users = options.userModel
             ? options.userModel
-            : (options.userModelFactory ?? initAuthUserModel)(options.sequelize);
+            : (options.userModelFactory ?? initAuthUserModel)(options.sequelize, {
+                tablePrefix: options.tablePrefix
+            });
         this.recordMapper =
             options.recordMapper ??
                 ((model) => SequelizeUserStore.mapModelToUser(model));
@@ -107,11 +95,16 @@ export class SequelizeUserStore extends UserStore {
         if (providedId !== undefined && providedId !== null && Number.isFinite(providedId)) {
             defaults.user_id = Number(providedId);
         }
-        const [model] = await this.Users.findOrCreate({
-            where: { login: rest.login },
-            defaults: defaults
-        });
-        return this.toUserRecord(model);
+        try {
+            const model = await this.Users.create(defaults);
+            return this.toUserRecord(model);
+        }
+        catch (error) {
+            if (error instanceof UniqueConstraintError) {
+                throw new Error(`User with login ${rest.login} or email ${rest.email} already exists`);
+            }
+            throw error;
+        }
     }
     async upsertUser(input) {
         const normalized = this.normalizeUserInput(input);
@@ -165,12 +158,6 @@ export class SequelizeUserStore extends UserStore {
         };
     }
     normalizeUserId(identifier) {
-        if (typeof identifier === 'number' && Number.isFinite(identifier)) {
-            return identifier;
-        }
-        if (typeof identifier === 'string' && /^\d+$/.test(identifier)) {
-            return Number(identifier);
-        }
-        throw new Error(`Unable to normalise user identifier: ${identifier}`);
+        return normalizeNumericUserId(identifier);
     }
 }