Hotfix 2.25.1: DR support for roles, fix to "429" error

ai-service/.gitignore

@@ -1,3 +1,2 @@
-/faiss-vector
-/data
-
+/faiss-vector/
+/data/

ai-service/package.json

@@ -1,11 +1,11 @@
 {
   "name": "ai-service",
-  "version": "2.25.0",
+  "version": "2.25.1",
   "main": "dist/app.js",
   "license": "Apache-2.0",
   "dependencies": {
-    "@guardian/common": "^2.25.0",
-    "@guardian/interfaces": "^2.25.0",
+    "@guardian/common": "^2.25.1",
+    "@guardian/interfaces": "^2.25.1",
     "@mikro-orm/core": "6.2.2",
     "@mikro-orm/mongodb": "6.2.2",
     "@nestjs/common": "^9.4.1",

analytics-service/package.json

@@ -13,8 +13,8 @@
     },
     "author": "Envision Blockchain Solutions <info@envisionblockchain.com>",
     "dependencies": {
-        "@guardian/common": "^2.25.0",
-        "@guardian/interfaces": "^2.25.0",
+        "@guardian/common": "^2.25.1",
+        "@guardian/interfaces": "^2.25.1",
         "@nestjs/common": "^9.4.1",
         "@nestjs/core": "^9.4.1",
         "@nestjs/jwt": "^10.0.3",
@@ -82,5 +82,5 @@
         "test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
     },
     "type": "module",
-    "version": "2.25.0"
+    "version": "2.25.1"
 }

api-gateway/package.json

@@ -4,8 +4,8 @@
         "@fastify/formbody": "^7.4.0",
         "@fastify/multipart": "^8.2.0",
         "@fastify/static": "^7.0.0",
-        "@guardian/common": "^2.25.0",
-        "@guardian/interfaces": "^2.25.0",
+        "@guardian/common": "^2.25.1",
+        "@guardian/interfaces": "^2.25.1",
         "@nestjs/common": "^9.4.1",
         "@nestjs/core": "^9.4.1",
         "@nestjs/jwt": "^10.0.3",
@@ -87,5 +87,5 @@
         "test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
     },
     "type": "module",
-    "version": "2.25.0"
+    "version": "2.25.1"
 }

api-gateway/src/api/service/permissions.ts

@@ -443,7 +443,7 @@ export class PermissionsApi {
         try {
             const owner = user.parent || user.did;
             const users = new Users();
-            const row = await users.getUser(username);
+            const row = await users.getUserPermissions(username);
             if (!row || row.parent !== owner || row.did === user.did) {
                 throw new HttpException('User does not exist.', HttpStatus.NOT_FOUND);
             }
@@ -500,7 +500,7 @@ export class PermissionsApi {
         let row: any;
         const users = new Users();
         try {
-            row = await users.getUser(username);
+            row = await users.getUserPermissions(username);
         } catch (error) {
             await InternalException(error);
         }
@@ -583,7 +583,7 @@ export class PermissionsApi {
         const owner = user.parent || user.did;
         let target: any;
         try {
-            target = await (new Users()).getUser(username);
+            target = await (new Users()).getUserPermissions(username);
         } catch (error) {
             await InternalException(error);
         }
@@ -648,7 +648,7 @@ export class PermissionsApi {
         let row: any;
         const users = new Users();
         try {
-            row = await users.getUser(username);
+            row = await users.getUserPermissions(username);
         } catch (error) {
             await InternalException(error);
         }
@@ -713,7 +713,7 @@ export class PermissionsApi {
         let row: any;
         const users = new Users();
         try {
-            row = await users.getUser(username);
+            row = await users.getUserPermissions(username);
         } catch (error) {
             await InternalException(error);
         }
@@ -773,7 +773,7 @@ export class PermissionsApi {
         let row: any;
         const users = new Users();
         try {
-            row = await users.getUser(username);
+            row = await users.getUserPermissions(username);
         } catch (error) {
             await InternalException(error);
         }

api-gateway/src/helpers/users.ts

@@ -88,6 +88,14 @@ export class Users extends NatsService {
         return await this.sendMessage(AuthEvents.GET_USER, { username });
     }
 
+    /**
+     * Return user by username
+     * @param username
+     */
+    public async getUserPermissions(username: string): Promise<IAuthUser> {
+        return await this.sendMessage(AuthEvents.GET_USER_PERMISSIONS, { username });
+    }
+
     /**
      * Return user by did
      * @param did

api-tests/package.json

@@ -1,6 +1,6 @@
 {
     "name": "api-tests",
-    "version": "2.25.0",
+    "version": "2.25.1",
     "description": "API Tests",
     "main": "index.js",
     "type": "module",

auth-service/package.json

@@ -10,8 +10,8 @@
       "image-size": "1.0.2"
   },
   "dependencies": {
-    "@guardian/common": "^2.25.0",
-    "@guardian/interfaces": "^2.25.0",
+    "@guardian/common": "^2.25.1",
+    "@guardian/interfaces": "^2.25.1",
     "@meeco/cryppo": "^2.0.2",
     "@mikro-orm/core": "6.2.2",
     "@mikro-orm/mongodb": "6.2.2",
@@ -75,5 +75,5 @@
     "test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
   },
   "type": "module",
-  "version": "2.25.0"
+  "version": "2.25.1"
 }

auth-service/src/api/account-service.ts

@@ -20,6 +20,7 @@ import {
     IGetUsersByAccountMessage,
     IGetUsersByIdMessage,
     IGetUsersByIRoleMessage,
+    IGroup,
     IRegisterNewUserMessage,
     ISaveUserMessage,
     IStandardRegistryUserResponse,
@@ -71,7 +72,12 @@ export async function createNewUser(
         default: true,
         readonly: true
     });
-    const permissionsGroup = defaultRole ? [defaultRole.id] : [];
+    const permissionsGroup: IGroup[] = defaultRole ? [{
+        uuid: defaultRole.uuid,
+        roleId: defaultRole.id,
+        roleName: defaultRole.name,
+        owner: null
+    }] : [];
     const permissions = defaultRole ? defaultRole.permissions : [];
     const user = (new DataBaseHelper(User)).create({
         username,
@@ -88,6 +94,14 @@ export async function createNewUser(
     return await (new DataBaseHelper(User)).save(user);
 }
 
+export function getRequiredProps(user: User): IUser {
+    const userRequiredProps: IUser = {}
+    for (const prop of Object.values(USER_REQUIRED_PROPS)) {
+        userRequiredProps[prop] = user[prop];
+    }
+    return userRequiredProps;
+}
+
 /**
  * Account service
  */
@@ -125,15 +139,7 @@ export class AccountService extends NatsService {
                 }
 
                 const user = await new DataBaseHelper(User).findOne({ username: decryptedToken.username });
-                const puser = setDefaultPermissions(user)
-
-                const userRequiredProps = {}
-
-                for (const prop of Object.values(USER_REQUIRED_PROPS)) {
-                    userRequiredProps[prop] = puser[prop];
-                }
-
-                return new MessageResponse(userRequiredProps);
+                return new MessageResponse(getRequiredProps(setDefaultPermissions(user)));
             } catch (error) {
                 return new MessageError(error);
             }
@@ -221,7 +227,7 @@ export class AccountService extends NatsService {
         this.getMessages<IGetUsersByIdMessage, IUser[]>(AuthEvents.GET_USERS_BY_ID, async (msg: any) => {
             const { dids } = msg;
             try {
-                return new MessageResponse(await new DataBaseHelper(User).find({ where: { did: { $in: dids } } }));
+                return new MessageResponse(await new DataBaseHelper(User).find({ did: { $in: dids } }));
             } catch (error) {
                 new Logger().error(error, ['AUTH_SERVICE']);
                 return new MessageError(error);
@@ -247,11 +253,13 @@ export class AccountService extends NatsService {
          */
         this.getMessages<any, IGetAllUserResponse[]>(AuthEvents.GET_ALL_USER_ACCOUNTS, async (_: any) => {
             try {
-                const userAccounts = (await new DataBaseHelper(User).find({ role: UserRole.USER })).map((e) => ({
-                    username: e.username,
-                    parent: e.parent,
-                    did: e.did
-                }));
+                const userAccounts = (await new DataBaseHelper(User)
+                    .find({ role: UserRole.USER }))
+                    .map((e) => ({
+                        username: e.username,
+                        parent: e.parent,
+                        did: e.did
+                    }));
                 return new MessageResponse(userAccounts);
             } catch (error) {
                 new Logger().error(error, ['AUTH_SERVICE']);
@@ -264,10 +272,12 @@ export class AccountService extends NatsService {
          */
         this.getMessages<any, IStandardRegistryUserResponse[]>(AuthEvents.GET_ALL_STANDARD_REGISTRY_ACCOUNTS, async (_) => {
             try {
-                const userAccounts = (await new DataBaseHelper(User).find({ role: UserRole.STANDARD_REGISTRY })).map((e) => ({
-                    username: e.username,
-                    did: e.did
-                }));
+                const userAccounts = (await new DataBaseHelper(User)
+                    .find({ role: UserRole.STANDARD_REGISTRY }))
+                    .map((e) => ({
+                        username: e.username,
+                        did: e.did
+                    }));
                 return new MessageResponse(userAccounts);
             } catch (error) {
                 new Logger().error(error, ['AUTH_SERVICE']);
@@ -280,7 +290,9 @@ export class AccountService extends NatsService {
          */
         this.getMessages<any, IGetDemoUserResponse[]>(AuthEvents.GET_ALL_USER_ACCOUNTS_DEMO, async (_) => {
             try {
-                const userAccounts = (await new DataBaseHelper(User).findAll()).map((e) => ({
+                const userAccounts = (await new DataBaseHelper(User).find({
+                    template: { $ne: true }
+                })).map((e) => ({
                     parent: e.parent,
                     did: e.did,
                     username: e.username,
@@ -322,10 +334,31 @@ export class AccountService extends NatsService {
             }
         });
 
+        this.getMessages<IRegisterNewUserMessage, User>(AuthEvents.REGISTER_NEW_TEMPLATE,
+            async (msg: { role: string, did: string, parent: string }) => {
+                try {
+                    const { role, did, parent } = msg;
+                    const username = `template_${Date.now()}${Math.round(Math.random() * 1000)}`;
+                    const row = (new DataBaseHelper(User)).create({
+                        username,
+                        role,
+                        parent,
+                        did,
+                        template: true
+                    });
+                    const user = await (new DataBaseHelper(User)).save(row);
+                    return new MessageResponse(user);
+                } catch (error) {
+                    new Logger().error(error, ['AUTH_SERVICE']);
+                    return new MessageError(error)
+                }
+            });
+
         this.getMessages<IRegisterNewUserMessage, User>(AuthEvents.GENERATE_NEW_TOKEN_BASED_ON_USER_PROVIDER,
             async (msg: ProviderAuthUser) => {
                 try {
-                    let user = await (new DataBaseHelper(User)).findOne({ username: msg.username });
+                    let user = await (new DataBaseHelper(User))
+                        .findOne({ username: msg.username, template: { $ne: true } });
                     if (!user) {
                         user = await createNewUser(
                             msg.username,
@@ -368,7 +401,10 @@ export class AccountService extends NatsService {
 
                 const REFRESH_TOKEN_UPDATE_INTERVAL = process.env.REFRESH_TOKEN_UPDATE_INTERVAL || '31536000000' // 1 year
 
-                const user = await new DataBaseHelper(User).findOne({ username });
+                const user = await new DataBaseHelper(User).findOne({
+                    username,
+                    template: { $ne: true }
+                });
                 if (user && passwordDigest === user.password) {
                     const tokenId = GenerateUUIDv4();
                     const refreshToken = sign({
@@ -405,7 +441,11 @@ export class AccountService extends NatsService {
                 return new MessageResponse({})
             }
 
-            const user = await new DataBaseHelper(User).findOne({ refreshToken: decryptedToken.id, username: decryptedToken.name });
+            const user = await new DataBaseHelper(User).findOne({
+                refreshToken: decryptedToken.id,
+                username: decryptedToken.name,
+                template: { $ne: true }
+            });
             if (!user) {
                 return new MessageResponse({})
             }
@@ -424,9 +464,22 @@ export class AccountService extends NatsService {
 
         this.getMessages<IUpdateUserMessage, any>(AuthEvents.UPDATE_USER, async (msg) => {
             const { username, item } = msg;
-
             try {
-                return new MessageResponse(await new DataBaseHelper(User).update(item, { username }));
+                const user = await (new DataBaseHelper(User))
+                    .findOne({ username });
+                if (!user) {
+                    return new MessageResponse(null);
+                }
+                Object.assign(user, item);
+                const template = await (new DataBaseHelper(User))
+                    .findOne({ did: item.did, template: true });
+                if (template) {
+                    user.permissions = template.permissions;
+                    user.permissionsGroup = template.permissionsGroup;
+                    await new DataBaseHelper(User).delete(template);
+                }
+                const result = await new DataBaseHelper(User).update(user);
+                return new MessageResponse(result);
             } catch (error) {
                 new Logger().error(error, ['AUTH_SERVICE']);
                 return new MessageError(error);
@@ -435,7 +488,6 @@ export class AccountService extends NatsService {
 
         this.getMessages<ISaveUserMessage, IUser>(AuthEvents.SAVE_USER, async (msg) => {
             const { user } = msg;
-
             try {
                 return new MessageResponse(await new DataBaseHelper(User).save(user));
             } catch (error) {
@@ -459,6 +511,7 @@ export class AccountService extends NatsService {
                         'role',
                         'permissionsGroup',
                         'permissions',
+                        'template'
                     ]
                 };
                 const _pageSize = parseInt(pageSize, 10);