fix bad assigns

Author: skadefro

OpenFlow/src/Config.ts

@@ -444,7 +444,7 @@ export class Config {
         // if anything throws, we retry
         return promiseRetry(async () => {
             const reader: any = await fetch({ url });
-            if (NoderedUtil.IsNullUndefinded(reader)) { throw new Error("Failed getting result"); return; }
+            if (NoderedUtil.IsNullUndefinded(reader)) { throw new Error("Failed getting result"); }
             const config: any = toPassportConfig(reader);
             // we need this, for Office 365 :-/
             if (reader.signingCerts && reader.signingCerts.length > 1) {

OpenFlow/src/DatabaseConnection.ts

@@ -2765,15 +2765,15 @@ export class DatabaseConnection extends events.EventEmitter {
                 let impersonationquery;
                 if (!NoderedUtil.IsNullEmpty(queryas)) impersonationquery = await this.getbasequeryuserid(user, queryas, "metadata._acl", [Rights.delete], span);
                 if (!NoderedUtil.IsNullEmpty(queryas) && !NoderedUtil.IsNullUndefinded(impersonationquery)) {
-                    baseq = this.getbasequery(user, "metadata._acl", [Rights.delete]), impersonationquery;
+                    baseq = impersonationquery;
                 } else {
                     baseq = this.getbasequery(user, "metadata._acl", [Rights.delete]);
                 }
             } else {
                 let impersonationquery: any;
                 if (!NoderedUtil.IsNullEmpty(queryas)) impersonationquery = await this.getbasequeryuserid(user, queryas, "_acl", [Rights.delete], span)
                 if (!NoderedUtil.IsNullEmpty(queryas) && !NoderedUtil.IsNullUndefinded(impersonationquery)) {
-                    baseq = this.getbasequery(user, "_acl", [Rights.delete]), impersonationquery;
+                    baseq = impersonationquery;
                 } else {
                     baseq = this.getbasequery(user, "_acl", [Rights.delete]);
                 }

OpenFlow/src/OAuthProvider.ts

@@ -345,6 +345,7 @@ export class OAuthProvider {
             try {
                 OAuthProvider.instance = instance;
                 instance.app = app;
+                // @ts-ignore
                 this.LoadClients();
             } catch (error) {
                 Logger.instanse.error("OAuthProvider", "configure", error);

OpenFlow/src/public/Controllers.ts

@@ -3183,7 +3183,7 @@ export class EditFormCtrl extends entityCtrl<Form> {
                         this.model = {} as any;
                         this.model._type = "form";
                         this.model.dataType = "json";
-                        this.model.formData == { "display": "form" };
+                        this.model.formData = { "display": "form" };
                     }
                     this.model.fbeditor = false;
                     this.renderform();

OpenFlowNodeRED/src/Config.ts

@@ -254,7 +254,7 @@ export class Config {
             if (Config.saml_ignore_cert) process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
             const reader: any = await fetch({ url });
             if (Config.saml_ignore_cert) process.env.NODE_TLS_REJECT_UNAUTHORIZED = "1";
-            if (reader === null || reader === undefined) { throw new Error("Failed getting result"); return; }
+            if (reader === null || reader === undefined) { throw new Error("Failed getting result"); }
             const config: any = toPassportConfig(reader);
             // we need this, for Office 365 :-/
             if (reader.signingCerts && reader.signingCerts.length > 1) {

OpenFlowNodeRED/src/node-red-contrib-auth-saml.ts

@@ -77,7 +77,7 @@ export class noderedcontribauthsaml {
             const backupStore = new FileSystemCache(path.join(Config.logpath, '.cache-' + Config.nodered_id));
             const reader: any = await fetch({ url, backupStore });
             if (Config.saml_ignore_cert) process.env.NODE_TLS_REJECT_UNAUTHORIZED = "1";
-            if (reader === null || reader === undefined) { throw new Error("Failed getting result"); return; }
+            if (reader === null || reader === undefined) { throw new Error("Failed getting result"); }
             const config: any = toPassportConfig(reader);
             // we need this, for Office 365 :-/
             if (reader.signingCerts && reader.signingCerts.length > 1) {