fix service name issue, fix oauth

skadefro · skadefro · commit 609fb4838dfb · 2021-04-08T21:01:10.000+02:00
diff --git a/OpenFlow/src/Config.ts b/OpenFlow/src/Config.ts
@@ -125,7 +125,6 @@ export class Config {
         Config.otel_debug_log = Config.parseBoolean(Config.getEnv("otel_debug_log", "false"));
         Config.otel_trace_url = Config.getEnv("otel_trace_url", "");
         Config.otel_metric_url = Config.getEnv("otel_metric_url", "");
-        Config.otel_servicename = Config.getEnv("otel_servicename", "openflow");
         Config.otel_trace_interval = parseInt(Config.getEnv("otel_trace_interval", "5000"));
         Config.otel_metric_interval = parseInt(Config.getEnv("otel_metric_interval", "5000"));
         Config.validate_user_form = Config.getEnv("validate_user_form", "");
@@ -251,7 +250,6 @@ export class Config {
     public static otel_debug_log: boolean = Config.parseBoolean(Config.getEnv("otel_debug_log", "false"));
     public static otel_trace_url: string = Config.getEnv("otel_trace_url", "");
     public static otel_metric_url: string = Config.getEnv("otel_metric_url", "");
-    public static otel_servicename: string = Config.getEnv("otel_servicename", "openflow");
     public static otel_trace_interval: number = parseInt(Config.getEnv("otel_trace_interval", "5000"));
     public static otel_metric_interval: number = parseInt(Config.getEnv("otel_metric_interval", "5000"));
 
diff --git a/OpenFlowNodeRED/package.json b/OpenFlowNodeRED/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openiap/nodered",
-  "version": "1.2.68",
+  "version": "1.2.71",
   "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": {
diff --git a/OpenFlowNodeRED/src/Config.ts b/OpenFlowNodeRED/src/Config.ts
@@ -73,7 +73,6 @@ export class Config {
         Config.otel_debug_log = Config.parseBoolean(Config.getEnv("otel_debug_log", "false"));
         Config.otel_trace_url = Config.getEnv("otel_trace_url", "");
         Config.otel_metric_url = Config.getEnv("otel_metric_url", "");
-        Config.otel_servicename = Config.getEnv("otel_servicename", "nodered");
         Config.otel_trace_interval = parseInt(Config.getEnv("otel_trace_interval", "5000"));
         Config.otel_metric_interval = parseInt(Config.getEnv("otel_metric_interval", "5000"));
     }
@@ -145,7 +144,6 @@ export class Config {
     public static otel_debug_log: boolean = Config.parseBoolean(Config.getEnv("otel_debug_log", "false"));
     public static otel_trace_url: string = Config.getEnv("otel_trace_url", "");
     public static otel_metric_url: string = Config.getEnv("otel_metric_url", "");
-    public static otel_servicename: string = Config.getEnv("otel_servicename", "nodered");
     public static otel_trace_interval: number = parseInt(Config.getEnv("otel_trace_interval", "5000"));
     public static otel_metric_interval: number = parseInt(Config.getEnv("otel_metric_interval", "5000"));
 
diff --git a/OpenFlowNodeRED/src/cli.ts b/OpenFlowNodeRED/src/cli.ts
@@ -160,7 +160,10 @@ async function doit() {
                     script: __filename,
                     args: [servicename, "--run", "--config", envfilepathname]
                 });
-                if (process.platform != "win32") {
+                if (process.platform == "linux") {
+                    await pm2startup("systemd");
+                }
+                else if (process.platform != "win32") {
                     await pm2startup(process.platform as any);
                 }
                 await pm2dump();
diff --git a/OpenFlowNodeRED/src/index.ts b/OpenFlowNodeRED/src/index.ts
@@ -165,6 +165,7 @@ let server: http.Server = null;
                 if (!NoderedUtil.IsNullEmpty(result.openflow_uniqueid) || !NoderedUtil.IsNullEmpty(result.otel_metric_url)) {
                     if (!NoderedUtil.IsNullUndefinded(_otel_require)) {
                         Config.enable_analytics = result.enable_analytics;
+                        Logger.instanse.info("reconfigure otel");
                         Logger.otel = _otel_require.otel.configure();
                     }
                 }
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.68
+1.2.71
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openiap/openflow",
-  "version": "1.2.68",
+  "version": "1.2.71",
   "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": {
@@ -58,7 +58,7 @@
     "multer": "^1.4.2",
     "multer-gridfs-storage": "^4.2.0",
     "oauth2-server": "^3.1.1",
-    "oidc-provider": "^7.2.0",
+    "oidc-provider": "^6.31.0",
     "passport": "^0.4.1",
     "passport-google-oauth20": "^2.0.0",
     "passport-local": "^1.0.0",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@openiap/nodered",`
`3`		`- "version": "1.2.68",`
	`3`	`+ "version": "1.2.71",`
`4`	`4`	`"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)",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,7 @@ let server: http.Server = null;`
`165`	`165`	`if (!NoderedUtil.IsNullEmpty(result.openflow_uniqueid) \|\| !NoderedUtil.IsNullEmpty(result.otel_metric_url)) {`
`166`	`166`	`if (!NoderedUtil.IsNullUndefinded(_otel_require)) {`
`167`	`167`	`Config.enable_analytics = result.enable_analytics;`
	`168`	`+ Logger.instanse.info("reconfigure otel");`
`168`	`169`	`Logger.otel = _otel_require.otel.configure();`
`169`	`170`	`}`
`170`	`171`	`}`