@drax/identity-back 0.11.4 → 0.11.5

package/dist/controllers/UserApiKeyController.js

@@ -44,9 +44,12 @@ class UserApiKeyController extends AbstractFastifyController {
     }
     async create(request, reply) {
         try {
-            request.rbac.assertPermission(UserApiKeyPermissions.Create);
+            request.rbac.assertOrPermissions([UserApiKeyPermissions.Create, UserApiKeyPermissions.CreateMy]);
             const payload = request.body;
-            payload.user = request.rbac.authUser.id;
+            if (!request.rbac.hasPermission(UserApiKeyPermissions.Create) || !payload.user) {
+                payload.user = request.rbac.authUser.id;
+            }
+            payload.createdBy = request.rbac.authUser.id;
             const userApiKeyService = UserApiKeyServiceFactory();
             let userApiKey = await userApiKeyService.create(payload);
             return userApiKey;

package/dist/graphql/types/userApiKey.graphql

@@ -5,6 +5,7 @@ type UserApiKey {
     ipv4: [String]
     ipv6: [String]
     user: User
+    createdBy: User
     createdAt: Date
     updatedAt: Date
 }

package/dist/models/UserApiKeyModel.js

@@ -32,6 +32,11 @@ const UserApiKeySchema = new mongoose.Schema({
             required: false,
             index: false,
         }],
+    createdBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User',
+        required: true,
+    },
 }, { timestamps: true });
 UserApiKeySchema.set('toJSON', { getters: true });
 UserApiKeySchema.plugin(uniqueValidator, { message: 'validation.unique' });

package/dist/permissions/UserApiKeyPermissions.js

@@ -1,10 +1,11 @@
 var UserApiKeyPermissions;
 (function (UserApiKeyPermissions) {
     UserApiKeyPermissions["Create"] = "userApiKey:create";
+    UserApiKeyPermissions["CreateMy"] = "userApiKey:createMy";
     UserApiKeyPermissions["Update"] = "userApiKey:update";
     UserApiKeyPermissions["Delete"] = "userApiKey:delete";
     UserApiKeyPermissions["View"] = "userApiKey:view";
-    UserApiKeyPermissions["ViewMy"] = "userApiKey:myView";
+    UserApiKeyPermissions["ViewMy"] = "userApiKey:viewMy";
     UserApiKeyPermissions["Manage"] = "userApiKey:manage";
 })(UserApiKeyPermissions || (UserApiKeyPermissions = {}));
 export default UserApiKeyPermissions;

package/dist/repository/mongo/UserApiKeyMongoRepository.js

@@ -8,7 +8,10 @@ class UserApiKeyMongoRepository {
         try {
             const userApiKey = new UserApiKeyModel(data);
             await userApiKey.save();
-            await userApiKey.populate({ path: 'user', populate: { path: 'tenant role' } });
+            await userApiKey.populate([
+                { path: 'user', populate: { path: 'tenant role' } },
+                { path: 'createdBy', populate: { path: 'tenant role' } },
+            ]);
             return userApiKey;
         }
         catch (e) {
@@ -58,7 +61,7 @@ class UserApiKeyMongoRepository {
         }
         MongooseQueryFilter.applyFilters(query, filters);
         const sort = MongooseSort.applySort(orderBy, order);
-        const options = { populate: ['user', 'user.tenant', 'user.role'], page, limit, sort };
+        const options = { populate: ['user', 'user.tenant', 'user.role', 'createdBy'], page, limit, sort };
         const userApiKeyPaginated = await UserApiKeyModel.paginate(query, options);
         return {
             page: page,

package/dist/repository/sqlite/UserApiKeySqliteRepository.js

@@ -8,6 +8,7 @@ const tableFields = [
     { name: "user", type: "TEXT", unique: false, primary: false },
     { name: "ipv4", type: "TEXT", unique: false, primary: false },
     { name: "ipv6", type: "TEXT", unique: false, primary: false },
+    { name: "createdBy", type: "TEXT", unique: false, primary: false },
     { name: "createdAt", type: "TEXT", unique: false, primary: false }
 ];
 class UserApiKeySqliteRepository {
@@ -123,6 +124,7 @@ class UserApiKeySqliteRepository {
             userApiKey.ipv4 = userApiKey.ipv4 != "" ? userApiKey.ipv4.split(',') : [];
             userApiKey.ipv6 = userApiKey.ipv6 != "" ? userApiKey.ipv6.split(',') : [];
             userApiKey.user = await this.findUserById(userApiKey.user);
+            userApiKey.createdBy = await this.findUserById(userApiKey.createdBy);
         }
         return {
             page: page,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.11.4",
+  "version": "0.11.5",
   "description": "Identity module for user management, authentication and authorization.",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -29,10 +29,10 @@
   "license": "ISC",
   "dependencies": {
     "@drax/common-back": "^0.11.3",
-    "@drax/crud-back": "^0.11.4",
-    "@drax/crud-share": "^0.11.4",
+    "@drax/crud-back": "^0.11.5",
+    "@drax/crud-share": "^0.11.5",
     "@drax/email-back": "^0.11.3",
-    "@drax/identity-share": "^0.11.3",
+    "@drax/identity-share": "^0.11.5",
     "bcryptjs": "^2.4.3",
     "express-jwt": "^8.4.1",
     "graphql": "^16.8.2",
@@ -63,5 +63,5 @@
       "debug": "0"
     }
   },
-  "gitHead": "543e9fc9947da228d0f2dc37d2bae3a39ec32250"
+  "gitHead": "e67f10f0af29468c9d30f16135cfdbdff166d916"
 }

package/src/controllers/UserApiKeyController.ts

@@ -58,9 +58,14 @@ class UserApiKeyController extends AbstractFastifyController<IUserApiKey, IUserA
 
     async create(request, reply) {
         try {
-            request.rbac.assertPermission(UserApiKeyPermissions.Create)
+            request.rbac.assertOrPermissions([UserApiKeyPermissions.Create, UserApiKeyPermissions.CreateMy])
             const payload = request.body
-            payload.user = request.rbac.authUser.id
+
+            if(!request.rbac.hasPermission(UserApiKeyPermissions.Create) || !payload.user){
+                payload.user = request.rbac.authUser.id
+            }
+
+            payload.createdBy = request.rbac.authUser.id
 
             const userApiKeyService = UserApiKeyServiceFactory()
 

package/src/graphql/types/userApiKey.graphql

@@ -5,6 +5,7 @@ type UserApiKey {
     ipv4: [String]
     ipv6: [String]
     user: User
+    createdBy: User
     createdAt: Date
     updatedAt: Date
 }

package/src/models/UserApiKeyModel.ts

@@ -35,6 +35,11 @@ const UserApiKeySchema = new mongoose.Schema<IUserApiKey>({
         required: false,
         index: false,
     }],
+    createdBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User',
+        required: true,
+    },
 }, {timestamps: true});
 
 UserApiKeySchema.set('toJSON', {getters: true});

package/src/permissions/UserApiKeyPermissions.ts

@@ -1,9 +1,10 @@
 enum UserApiKeyPermissions {
     Create = "userApiKey:create",
+    CreateMy = "userApiKey:createMy",
     Update = "userApiKey:update",
     Delete = "userApiKey:delete",
     View = "userApiKey:view",
-    ViewMy = "userApiKey:myView",
+    ViewMy = "userApiKey:viewMy",
     Manage = "userApiKey:manage",
 
 }

package/src/repository/mongo/UserApiKeyMongoRepository.ts

@@ -22,7 +22,10 @@ class UserApiKeyMongoRepository implements IUserApiKeyRepository {
 
             const userApiKey: mongoose.HydratedDocument<IUserApiKey> = new UserApiKeyModel(data)
             await userApiKey.save()
-            await userApiKey.populate({path: 'user', populate: {path: 'tenant role'} })
+            await userApiKey.populate([
+                {path: 'user', populate: {path: 'tenant role'} },
+                {path: 'createdBy', populate: {path: 'tenant role'} },
+            ])
             return userApiKey
         } catch (e) {
             if (e instanceof mongoose.Error.ValidationError) {
@@ -88,7 +91,7 @@ class UserApiKeyMongoRepository implements IUserApiKeyRepository {
 
         const sort = MongooseSort.applySort(orderBy, order)
 
-        const options = {populate: ['user', 'user.tenant', 'user.role'], page, limit, sort}
+        const options = {populate: ['user', 'user.tenant', 'user.role', 'createdBy'], page, limit, sort}
 
         const userApiKeyPaginated: PaginateResult<IUserApiKey> = await UserApiKeyModel.paginate(query, options)
         return {

package/src/repository/sqlite/UserApiKeySqliteRepository.ts

@@ -15,6 +15,7 @@ const tableFields: SqliteTableField[] = [
     {name: "user", type: "TEXT", unique: false, primary: false},
     {name: "ipv4", type: "TEXT", unique: false, primary: false},
     {name: "ipv6", type: "TEXT", unique: false, primary: false},
+    {name: "createdBy", type: "TEXT", unique: false, primary: false},
     {name: "createdAt", type: "TEXT", unique: false, primary: false}
 ]
 
@@ -170,6 +171,7 @@ class UserApiKeySqliteRepository implements IUserApiKeyRepository {
             userApiKey.ipv4 = userApiKey.ipv4 != "" ? userApiKey.ipv4.split(',') : []
             userApiKey.ipv6 = userApiKey.ipv6 != "" ? userApiKey.ipv6.split(',') : []
             userApiKey.user = await this.findUserById(userApiKey.user)
+            userApiKey.createdBy = await this.findUserById(userApiKey.createdBy)
         }
 
         return {