@drax/identity-back 3.2.0 → 3.4.2

package/dist/repository/sqlite/UserSessionSqliteRepository.js

@@ -6,7 +6,9 @@ class UserSessionSqliteRepository extends AbstractSqliteRepository {
         this.searchFields = [];
         this.booleanFields = [];
         this.identifier = '_id';
-        this.populateFields = [{ field: 'user', table: 'users', identifier: '_id' }];
+        this.populateFields = [
+            { field: 'user', table: 'users', identifier: '_id' }
+        ];
         this.tableFields = [
             { name: "uuid", type: "TEXT", unique: false, primary: false },
             { name: "user", type: "TEXT", unique: false, primary: false },

package/dist/repository/sqlite/UserSqliteRepository.js

@@ -8,8 +8,12 @@ class UserSqliteRepository extends AbstractSqliteRepository {
         this.tableName = 'users';
         this.searchFields = [];
         this.booleanFields = ['active'];
+        this.jsonFields = [];
         this.identifier = '_id';
-        this.populateFields = [];
+        this.populateFields = [
+            { field: 'tenant', table: 'tenants', identifier: '_id' },
+            // {field: 'role', table: 'roles', identifier: '_id'}
+        ];
         this.tableFields = [
             { name: "name", type: "TEXT", unique: false, primary: false },
             { name: "username", type: "TEXT", unique: true, primary: false },
@@ -36,18 +40,27 @@ class UserSqliteRepository extends AbstractSqliteRepository {
         if (userData.groups && Array.isArray(userData.groups)) {
             userData.groups = userData.groups.join(",");
         }
+        if (userData.role && typeof userData.role === 'object' && userData.role._id) {
+            userData.role = userData.role._id;
+        }
+        if (userData.tenant && typeof userData.tenant === 'object' && userData.tenant._id) {
+            userData.tenant = userData.tenant._id;
+        }
         userData.active = userData.active ? 1 : 0;
         if (!await this.findRoleById(userData.role)) {
             throw new ValidationError([{ field: 'role', reason: 'validation.notfound', value: userData.role }]);
         }
     }
     async prepareItem(user) {
-        if (user && user.role) {
+        if (user && user.role && typeof user.role === 'string') {
             user.role = await this.findRoleById(user.role);
         }
-        if (user && user.tenant) {
+        if (user && user.tenant && typeof user.tenant === 'string') {
             user.tenant = await this.findTenantById(user.tenant);
         }
+        if (user && user.hasOwnProperty('groups')) {
+            user.groups = user.groups ? user.groups.split(",") : [];
+        }
     }
     async updatePartial(id, userData) {
         return this.update(id, userData);
@@ -69,7 +82,7 @@ class UserSqliteRepository extends AbstractSqliteRepository {
         return user;
     }
     async findByIdWithPassword(id) {
-        const user = this.db.prepare('SELECT * FROM users WHERE ${this.identifier} = ?').get(id);
+        const user = this.db.prepare(`SELECT * FROM users WHERE ${this.identifier} = ?`).get(id);
         if (!user) {
             return null;
         }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.2.0",
+  "version": "3.4.2",
   "description": "Identity module for user management, authentication and authorization.",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -29,7 +29,7 @@
   "license": "ISC",
   "dependencies": {
     "@drax/common-back": "^3.0.0",
-    "@drax/crud-back": "^3.2.0",
+    "@drax/crud-back": "^3.4.2",
     "@drax/crud-share": "^3.2.0",
     "@drax/email-back": "^3.1.0",
     "@drax/identity-share": "^3.0.0",
@@ -63,5 +63,5 @@
       "debug": "0"
     }
   },
-  "gitHead": "8446a621e05bc1f4fd080c814a3ebdd7ae8a626b"
+  "gitHead": "678a645d46927a684bd9c5f9c4aa13ff77266e2d"
 }

package/src/repository/sqlite/UserSessionSqliteRepository.ts

@@ -13,7 +13,9 @@ class UserSessionSqliteRepository extends AbstractSqliteRepository<IUserSession,
     protected searchFields: string[] = [];
     protected booleanFields: string[] = [];
     protected identifier: string = '_id';
-    protected populateFields = [{field: 'user', table: 'users', identifier: '_id'}]
+    protected populateFields = [
+        {field: 'user', table: 'users', identifier: '_id'}
+    ]
     protected tableFields: SqliteTableField[] = [
         {name: "uuid", type: "TEXT", unique: false, primary: false},
         {name: "user", type: "TEXT", unique: false, primary: false},

package/src/repository/sqlite/UserSqliteRepository.ts

@@ -18,8 +18,12 @@ class UserSqliteRepository extends AbstractSqliteRepository<IUser, IUserCreate,
     protected dataBaseFile: string;
     protected searchFields: string[] = [];
     protected booleanFields: string[] = ['active'];
+    protected jsonFields: string[] = [];
     protected identifier: string = '_id';
-    protected populateFields = []
+    protected populateFields = [
+        {field: 'tenant', table: 'tenants', identifier: '_id'},
+        // {field: 'role', table: 'roles', identifier: '_id'}
+    ]
     protected tableFields: SqliteTableField[] = [
         {name: "name", type: "TEXT", unique: false, primary: false},
         {name: "username", type: "TEXT", unique: true, primary: false},
@@ -52,6 +56,15 @@ class UserSqliteRepository extends AbstractSqliteRepository<IUser, IUserCreate,
         if (userData.groups && Array.isArray(userData.groups)) {
             userData.groups = userData.groups.join(",")
         }
+
+        if (userData.role && typeof userData.role === 'object' && userData.role._id) {
+            userData.role = userData.role._id
+        }
+
+        if (userData.tenant && typeof userData.tenant === 'object' && userData.tenant._id) {
+            userData.tenant = userData.tenant._id
+        }
+
         userData.active = userData.active ? 1 : 0
 
         if (!await this.findRoleById(userData.role)) {
@@ -60,13 +73,17 @@ class UserSqliteRepository extends AbstractSqliteRepository<IUser, IUserCreate,
     }
 
     async prepareItem(user: any) {
-        if (user && user.role) {
+        if (user && user.role && typeof user.role === 'string') {
             user.role = await this.findRoleById(user.role)
         }
 
-        if (user && user.tenant) {
+        if (user && user.tenant && typeof user.tenant === 'string') {
             user.tenant = await this.findTenantById(user.tenant)
         }
+
+        if (user && user.hasOwnProperty('groups')) {
+            user.groups = user.groups ? user.groups.split(",") : []
+        }
     }
 
 
@@ -94,7 +111,7 @@ class UserSqliteRepository extends AbstractSqliteRepository<IUser, IUserCreate,
     }
 
     async findByIdWithPassword(id: string): Promise<IUser | null> {
-        const user = this.db.prepare('SELECT * FROM users WHERE ${this.identifier} = ?').get(id);
+        const user = this.db.prepare(`SELECT * FROM users WHERE ${this.identifier} = ?`).get(id);
         if (!user) {
             return null
         }