File tree Expand file tree Collapse file tree
OpenFlowNodeRED/src/nodered/nodes Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -537,7 +537,7 @@ export class Message {
537537 containers : [
538538 {
539539 name : 'nodered' ,
540- image : 'cloudhack/openflownodered:0.0.187 ' ,
540+ image : 'cloudhack/openflownodered:0.0.190 ' ,
541541 imagePullPolicy : "Always" ,
542542 env : [
543543 { name : "saml_federation_metadata" , value : Config . saml_federation_metadata } ,
Original file line number Diff line number Diff line change @@ -5,6 +5,7 @@ import { Crypt } from "../../Crypt";
55import { WebSocketClient } from "../../WebSocketClient" ;
66import { NoderedUtil } from "./NoderedUtil" ;
77import { Base } from "../../Base" ;
8+ import { Config } from "../../Config" ;
89
910
1011
@@ -40,6 +41,9 @@ export class api_get_jwt {
4041 this . node . on ( "input" , this . oninput ) ;
4142 this . node . on ( "close" , this . onclose ) ;
4243 }
44+ isNumeric ( num ) {
45+ return ! isNaN ( num )
46+ }
4347 async oninput ( msg : any ) {
4448 try {
4549 this . node . status ( { } ) ;
@@ -61,7 +65,13 @@ export class api_get_jwt {
6165 q . username = username ; q . password = password ;
6266 } else {
6367 if ( Crypt . encryption_key === "" ) { return NoderedUtil . HandleError ( this , "root signin not allowed" ) ; }
64- var user = new TokenUser ( ) ; user . name = "root" ; user . username = "root" ;
68+ var user = new TokenUser ( ) ;
69+ if ( this . isNumeric ( Config . nodered_id ) ) {
70+ user . name = "nodered" + Config . nodered_id ;
71+ } else {
72+ user . name = Config . nodered_id ;
73+ }
74+ user . username = user . name ;
6575 q . jwt = Crypt . createToken ( user ) ;
6676 }
6777 this . node . status ( { fill : "blue" , shape : "dot" , text : "Requesting token" } ) ;
Original file line number Diff line number Diff line change 1- 0.0.189
1+ 0.0.190
You can’t perform that action at this time.
0 commit comments