fix issue with big user objects

Author: skadefro

OpenFlow/src/LoginProvider.ts

@@ -146,10 +146,23 @@ export class LoginProvider {
         app.use(passport.initialize());
         app.use(passport.session());
         passport.serializeUser(async function (user: any, done: any): Promise<void> {
-            done(null, user);
+            const tuser: TokenUser = TokenUser.From(user);
+            await Auth.AddUser(tuser as any, tuser._id, "passport");
+            done(null, user._id);
         });
-        passport.deserializeUser(function (user: any, done: any): void {
-            done(null, user);
+        passport.deserializeUser(async function (userid: string, done: any): Promise<void> {
+            if (NoderedUtil.IsNullEmpty(userid)) return done('missing userid', null);
+            if (typeof userid !== 'string') userid = (userid as any)._id
+            if (NoderedUtil.IsNullEmpty(userid)) return done('missing userid', null);
+            const _user = await Auth.getUser(userid, "passport");
+            if (_user == null) {
+                const user = await DBHelper.FindByUsernameOrId(null, userid, null);
+                const tuser = TokenUser.From(user);
+                await Auth.AddUser(tuser as any, tuser._id, "passport");
+                done(null, tuser);
+            } else {
+                done(null, _user);
+            }
         });
 
         app.use(function (req, res, next) {
@@ -1023,6 +1036,7 @@ export class LoginProvider {
                 }
                 const tuser: TokenUser = TokenUser.From(user);
                 Audit.LoginSuccess(tuser, "weblogin", "local", remoteip, "browser", "unknown", span);
+                // tuser.roles.splice(40, tuser.roles.length)
                 Logger.otel.endSpan(span);
                 return done(null, tuser);
             } catch (error) {

OpenFlow/src/public/Controllers.ts

@@ -88,9 +88,17 @@ export class MenuCtrl {
 
             this.customers = await NoderedUtil.Query("users", { _type: "customer" }, null, null, 100, 0, null, null, null, 2);
             if (this.customers.length == 1) this.customer = this.customers[0];
-            if (this.customers.length > 1 && data.customerid != null) {
-                for (let cust of this.customers)
-                    if (cust._id == data.customerid) this.customer = cust;
+            if (this.customers.length > 1 && (data.customerid != null || data.selectedcustomerid != null)) {
+                this.customer = null;
+                if (data.selectedcustomerid != null) {
+                    for (let cust of this.customers)
+                        if (cust._id == data.selectedcustomerid) this.customer = cust;
+                }
+                if (this.customer == null) {
+                    for (let cust of this.customers)
+                        if (cust._id == data.customerid) this.customer = cust;
+
+                }
             }
             if (!this.$scope.$$phase) { this.$scope.$apply(); }
             // cleanup();

gulpfile.js

@@ -181,19 +181,19 @@ gulp.task("browserify", function () {
 gulp.task("compose", shell.task([
     'echo "Build openiap/openflow"',
     'docker build -t openiap/openflow:edge .',
-    // 'docker tag openiap/openflow:edge openiap/openflow:' + version,
+    'docker tag openiap/openflow:edge openiap/openflow:' + version,
     'docker tag openiap/openflow:edge openiap/openflow:edge1.3',
     'echo "Push openiap/openflow"',
     'docker push openiap/openflow:edge',
-    // 'docker push openiap/openflow:' + version,
+    'docker push openiap/openflow:' + version,
     'docker push openiap/openflow:edge1.3',
 
     'echo "Build openiap/nodered"',
     'cd OpenFlowNodeRED && docker build -t openiap/nodered:edge .',
-    // 'docker tag openiap/nodered:edge openiap/nodered:' + version,
+    'docker tag openiap/nodered:edge openiap/nodered:' + version,
     'echo "Push openiap/nodered"',
     'docker push openiap/nodered:edge',
-    // 'docker push openiap/nodered:' + version,
+    'docker push openiap/nodered:' + version,
     'docker push openiap/nodered:edge1.3',
 
     // 'echo "Build openiap/nodered-puppeteer"',