fix and bump

Author: skadefro

OpenFlow/src/DBHelper.ts

@@ -14,8 +14,7 @@ export class DBHelper {
             if (jwt === null || jwt == undefined || jwt == "") { jwt = Crypt.rootToken(); }
             const items: User[] = await Config.db.query<User>(q, null, 1, 0, null, "users", jwt, undefined, undefined, span);
             if (items === null || items === undefined || items.length === 0) { return null; }
-            const result: User = User.assign(items[0]);
-            await this.DecorateWithRoles(result, span);
+            const result: User = await this.DecorateWithRoles(User.assign(items[0]), span);
             return result;
         } catch (error) {
             span.recordException(error);
@@ -30,8 +29,7 @@ export class DBHelper {
             if (jwt === null || jwt == undefined || jwt == "") { jwt = Crypt.rootToken(); }
             const items: User[] = await Config.db.query<User>({ _id: _id }, null, 1, 0, null, "users", jwt, undefined, undefined, span);
             if (items === null || items === undefined || items.length === 0) { return null; }
-            const result: User = User.assign(items[0]);
-            await this.DecorateWithRoles(result, span);
+            const result: User = await this.DecorateWithRoles(User.assign(items[0]), span);
             return result;
         } catch (error) {
             span.recordException(error);
@@ -46,8 +44,7 @@ export class DBHelper {
             const items: User[] = await Config.db.query<User>({ $or: [{ username: new RegExp(["^", username, "$"].join(""), "i") }, { _id: id }] },
                 null, 1, 0, null, "users", Crypt.rootToken(), undefined, undefined, span);
             if (items === null || items === undefined || items.length === 0) { return null; }
-            const result: User = User.assign(items[0]);
-            await this.DecorateWithRoles(result, span);
+            const result: User = await this.DecorateWithRoles(User.assign(items[0]), span);
             return result;
         } catch (error) {
             span.recordException(error);
@@ -107,7 +104,7 @@ export class DBHelper {
     // }
     public static cached_roles: Role[] = [];
     public static cached_at: Date = new Date();
-    public static async DecorateWithRoles(user: User, parent: Span): Promise<void> {
+    public static async DecorateWithRoles(user: User, parent: Span): Promise<User> {
         const span: Span = Logger.otel.startSubSpan("dbhelper.DecorateWithRoles", parent);
         try {
             if (!Config.decorate_roles_fetching_all_roles) {
@@ -180,6 +177,7 @@ export class DBHelper {
         } finally {
             Logger.otel.endSpan(span);
         }
+        return user;
     }
     public static async FindRoleByName(name: string, parent: Span): Promise<Role> {
         const items: Role[] = await Config.db.query<Role>({ name: name }, null, 1, 0, null, "users", Crypt.rootToken(), undefined, undefined, parent);
@@ -238,7 +236,7 @@ export class DBHelper {
             users.AddMember(user);
             this.EnsureNoderedRoles(user, jwt, false, span);
             await this.Save(users, jwt, span)
-            await this.DecorateWithRoles(user, span);
+            user = await this.DecorateWithRoles(user, span);
             return user;
         } catch (error) {
             span.recordException(error);

OpenFlow/src/LoginProvider.ts

@@ -1179,7 +1179,7 @@ export class LoginProvider {
                             await DBHelper.Save(role, jwt, span);
                         }
                     }
-                    await DBHelper.DecorateWithRoles(_user, span);
+                    _user = await DBHelper.DecorateWithRoles(_user, span);
                 }
             }
 

OpenFlow/src/Messages/Message.ts

@@ -1271,7 +1271,7 @@ export class Message {
                         }
                         const tuserimpostor = tuser;
                         user = User.assign(items[0] as User);
-                        await DBHelper.DecorateWithRoles(user, span);
+                        user = await DBHelper.DecorateWithRoles(user, span);
                         // Check we have update rights
                         try {
                             await DBHelper.Save(user, msg.jwt, span);

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/nodered",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {

VERSION

@@ -1 +1 @@
-1.3.10
+1.3.11

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/openflow",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {