@drax/identity-back 0.7.22 → 0.8.1

package/dist/controllers/UserController.js

@@ -135,6 +135,7 @@ class UserController extends AbstractFastifyController {
             else if (request.rbac.getAuthUser.tenantId) {
                 payload.tenant = request.rbac.getAuthUser.tenantId;
             }
+            payload.origin ?? (payload.origin = 'Admin');
             const userService = UserServiceFactory();
             let user = await userService.create(payload);
             return user;

package/dist/models/UserModel.js

@@ -57,6 +57,7 @@ const UserSchema = new mongoose.Schema({
         required: false,
         index: false
     },
+    origin: { type: String, required: false, index: false },
     groups: [{
             type: mongoose.Schema.Types.ObjectId,
             ref: 'Group',

package/dist/repository/mongo/UserMongoRepository.js

@@ -51,6 +51,10 @@ class UserMongoRepository {
         const user = await UserModel.findOne({ username: username }).populate(['role', 'tenant']).exec();
         return user;
     }
+    async findByEmail(email) {
+        const user = await UserModel.findOne({ email: email }).populate(['role', 'tenant']).exec();
+        return user;
+    }
     async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
         const query = {};
         if (search) {

package/dist/repository/sqlite/UserSqliteRepository.js

@@ -15,6 +15,7 @@ const tableFields = [
     { name: "tenant", type: "TEXT", unique: false, primary: false },
     { name: "groups", type: "TEXT", unique: false, primary: false },
     { name: "avatar", type: "TEXT", unique: false, primary: false },
+    { name: "origin", type: "TEXT", unique: false, primary: false },
     { name: "createdAt", type: "TEXT", unique: false, primary: false },
     { name: "updatedAt", type: "TEXT", unique: false, primary: false }
 ];
@@ -110,6 +111,15 @@ class UserSqliteRepository {
         user.tenant = await this.findTenantById(user.tenant);
         return user;
     }
+    async findByEmail(email) {
+        const user = this.db.prepare('SELECT * FROM users WHERE email = ?').get(email);
+        if (!user) {
+            return null;
+        }
+        user.role = await this.findRoleById(user.role);
+        user.tenant = await this.findTenantById(user.tenant);
+        return user;
+    }
     async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
         const offset = page > 1 ? (page - 1) * limit : 0;
         let where = "";

package/dist/services/UserService.js

@@ -25,6 +25,24 @@ class UserService extends AbstractService {
             throw new BadCredentialsError();
         }
     }
+    async authByEmail(email, createIfNotFound = false, userData) {
+        let user = null;
+        console.log("auth email", email);
+        user = await this.findByEmail(email);
+        if (!user && createIfNotFound) {
+            userData.password = userData.password ? userData.password : randomUUID();
+            userData.active = userData.active === undefined ? true : userData.active;
+            user = await this.create(userData);
+        }
+        if (user && user.active) {
+            const session = randomUUID();
+            const accessToken = AuthUtils.generateToken(user.id.toString(), user.username, user.role.id, user.tenant?.id, session);
+            return { accessToken: accessToken };
+        }
+        else {
+            throw new BadCredentialsError();
+        }
+    }
     async changeUserPassword(userId, newPassword) {
         const user = await this.findById(userId);
         if (user) {
@@ -135,6 +153,16 @@ class UserService extends AbstractService {
             throw e;
         }
     }
+    async findByEmail(email) {
+        try {
+            const user = await this._repository.findByEmail(email);
+            return user;
+        }
+        catch (e) {
+            console.error("Error finding user by username", e);
+            throw e;
+        }
+    }
     async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
         try {
             const pagination = await this._repository.paginate({ page, limit, orderBy, order, search, filters });

package/package.json

@@ -3,10 +3,10 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.7.22",
+  "version": "0.8.1",
   "description": "Identity module for user management, authentication and authorization.",
   "main": "dist/index.js",
-  "types": "dist/types/index.d.ts",
+  "types": "types/index.d.ts",
   "type": "module",
   "scripts": {
     "prepublish": "tsc && npm run copygql",
@@ -28,10 +28,10 @@
   "author": "Cristian Incarnato & Drax Team",
   "license": "ISC",
   "dependencies": {
-    "@drax/common-back": "^0.7.0",
-    "@drax/crud-back": "^0.7.22",
-    "@drax/crud-share": "^0.7.21",
-    "@drax/identity-share": "^0.7.0",
+    "@drax/common-back": "^0.8.0",
+    "@drax/crud-back": "^0.8.1",
+    "@drax/crud-share": "^0.8.0",
+    "@drax/identity-share": "^0.8.0",
     "bcryptjs": "^2.4.3",
     "express-jwt": "^8.4.1",
     "graphql": "^16.8.2",
@@ -62,5 +62,5 @@
       "debug": "0"
     }
   },
-  "gitHead": "cbe1b2d33284c511c3b52722a56af030aa36d03e"
+  "gitHead": "92afa3327c2d2d01b568a03b2c4e2ca1ebbe2e30"
 }

package/src/controllers/UserController.ts

@@ -140,6 +140,8 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
                 payload.tenant = request.rbac.getAuthUser.tenantId
             }
 
+            payload.origin ??= 'Admin'
+
             const userService = UserServiceFactory()
             let user = await userService.create(payload)
             return user

package/src/interfaces/IUserRepository.ts

@@ -4,6 +4,7 @@ import {IDraxCrud, IDraxFieldFilter} from "@drax/crud-share";
 interface IUserRepository extends IDraxCrud<IUser, IUserCreate, IUserUpdate>{
     findById(id: string): Promise<IUser | null>;
     findByUsername(username: string): Promise<IUser | null>;
+    findByEmail(email: string): Promise<IUser | null>;
     changePassword(id: string, password:string):Promise<Boolean>;
     changeAvatar(id: string, avatarUrl: string): Promise<Boolean>;
 }

package/src/models/UserModel.ts

@@ -49,6 +49,7 @@ const UserSchema = new mongoose.Schema<IUser>({
         }
     },
     avatar: {type: String, required: false, index:false},
+
     role: {
         type: mongoose.Schema.Types.ObjectId,
         ref: 'Role',
@@ -61,6 +62,7 @@ const UserSchema = new mongoose.Schema<IUser>({
         required: false,
         index: false
     },
+    origin: {type: String, required: false, index:false},
     groups: [{
         type: mongoose.Schema.Types.ObjectId,
         ref: 'Group',

package/src/repository/mongo/UserMongoRepository.ts

@@ -74,6 +74,11 @@ class UserMongoRepository implements IUserRepository {
         return user
     }
 
+    async findByEmail(email: string): Promise<IUser> {
+        const user: mongoose.HydratedDocument<IUser> = await UserModel.findOne({email: email}).populate(['role','tenant']).exec()
+        return user
+    }
+
     async paginate({
                        page= 1,
                        limit= 5,

package/src/repository/sqlite/UserSqliteRepository.ts

@@ -27,6 +27,7 @@ const tableFields: SqliteTableField[] = [
     {name: "tenant", type: "TEXT", unique: false, primary: false},
     {name: "groups", type: "TEXT", unique: false, primary: false},
     {name: "avatar", type: "TEXT", unique: false, primary: false},
+    {name: "origin", type: "TEXT", unique: false, primary: false},
     {name: "createdAt", type: "TEXT", unique: false, primary: false},
     {name: "updatedAt", type: "TEXT", unique: false, primary: false}
 ]
@@ -150,6 +151,16 @@ class UserSqliteRepository implements IUserRepository {
         return user
     }
 
+    async findByEmail(email: string): Promise<IUser> {
+        const user = this.db.prepare('SELECT * FROM users WHERE email = ?').get(email);
+        if (!user) {
+            return null
+        }
+        user.role = await this.findRoleById(user.role)
+        user.tenant = await this.findTenantById(user.tenant)
+        return user
+    }
+
     async paginate({
                        page= 1,
                        limit= 5,

package/src/services/UserService.ts

@@ -33,6 +33,26 @@ class UserService extends AbstractService<IUser, IUserCreate, IUserUpdate>{
         }
     }
 
+    async authByEmail(email: string, createIfNotFound: boolean = false, userData: IUserCreate) {
+        let user = null
+        console.log("auth email", email)
+        user = await this.findByEmail(email)
+
+        if(!user && createIfNotFound){
+            userData.password = userData.password ? userData.password : randomUUID()
+            userData.active = userData.active === undefined ? true : userData.active
+            user = await this.create(userData)
+        }
+
+        if (user && user.active) {
+            const session = randomUUID()
+            const accessToken = AuthUtils.generateToken(user.id.toString(), user.username, user.role.id, user.tenant?.id, session)
+            return {accessToken: accessToken}
+        } else {
+                throw new BadCredentialsError()
+        }
+    }
+
     async changeUserPassword(userId: string, newPassword: string) {
         const user = await this.findById(userId)
         if (user) {
@@ -99,8 +119,6 @@ class UserService extends AbstractService<IUser, IUserCreate, IUserUpdate>{
             }
             throw e
         }
-
-
     }
 
     async update(id: string, userData: IUserUpdate) {
@@ -160,6 +178,16 @@ class UserService extends AbstractService<IUser, IUserCreate, IUserUpdate>{
 
     }
 
+    async findByEmail(email: string): Promise<IUser | null> {
+        try {
+            const user: IUser = await this._repository.findByEmail(email);
+            return user
+        } catch (e) {
+            console.error("Error finding user by username", e)
+            throw e
+        }
+    }
+
     async paginate({
                        page = 1,
                        limit = 5,