ficx user registration error

Author: skadefro

OpenFlow/src/Messages/Message.ts

@@ -491,8 +491,24 @@ export class Message {
             if (msg.password == null || msg.password == undefined || msg.password == "") { throw new Error("Password cannot be null"); }
             user = await User.FindByUsername(msg.username);
             if (user !== null && user !== undefined) { throw new Error("Illegal username"); }
-            user = await User.ensureUser(msg.name, msg.username, msg.password, null);
+            var jwt: string = TokenUser.rootToken();
+            user = await User.ensureUser(jwt, msg.name, msg.username, null, msg.password);
             msg.user = new TokenUser(user);
+
+            jwt = Crypt.createToken(msg.user, "1h");
+            var name = user.username;
+            name = name.split("@").join("").split(".").join("");
+            name = name.toLowerCase();
+
+            cli._logger.debug("[" + user.username + "] ensure nodered role " + name + "noderedadmins");
+            var noderedadmins = await User.ensureRole(jwt, name + "noderedadmins", null);
+            noderedadmins.addRight(user._id, user.username, [Rights.full_control]);
+            noderedadmins.removeRight(user._id, [Rights.delete]);
+            noderedadmins.AddMember(user);
+            cli._logger.debug("[" + user.username + "] update nodered role " + name + "noderedadmins");
+            await noderedadmins.Save(jwt);
+
+
         } catch (error) {
             msg.error = error.toString();
         }
@@ -564,7 +580,7 @@ export class Message {
                                 containers: [
                                     {
                                         name: 'nodered',
-                                        image: 'cloudhack/openflownodered:0.0.242',
+                                        image: 'cloudhack/openflownodered:0.0.243',
                                         imagePullPolicy: "Always",
                                         ports: [{ containerPort: 80 }],
                                         env: [

OpenFlow/src/User.ts

@@ -32,12 +32,16 @@ export class User extends Base {
     device: any;
     federationids: FederationId[] = [];
     roles: Rolemember[] = [];
-    public static async ensureUser(jwt: string, name: string, username: string, id: string): Promise<User> {
+    public static async ensureUser(jwt: string, name: string, username: string, id: string, password: string): Promise<User> {
         var user: User = await User.FindByUsernameOrId(username, id);
         if (user !== null && (user._id === id || id === null)) { return user; }
         if (user !== null && id !== null) { await Config.db.DeleteOne(user._id, "users", jwt); }
         user = new User(); user._id = id; user.name = name; user.username = username;
-        await user.SetPassword(Math.random().toString(36).substr(2, 9));
+        if (password !== null && password !== undefined && password !== "") {
+            await user.SetPassword(password);
+        } else {
+            await user.SetPassword(Math.random().toString(36).substr(2, 9));
+        }
         user = await Config.db.InsertOne(user, "users", 0, false, jwt);
         user = User.assign(user);
         return user;

OpenFlow/src/index.ts

@@ -38,7 +38,7 @@ async function initDatabase(): Promise<boolean> {
         var jwt: string = TokenUser.rootToken();
         var admins: Role = await User.ensureRole(jwt, "admins", WellknownIds.admins);
         var users: Role = await User.ensureRole(jwt, "users", WellknownIds.users);
-        var root: User = await User.ensureUser(jwt, "root", "root", WellknownIds.root);
+        var root: User = await User.ensureUser(jwt, "root", "root", WellknownIds.root, null);
         root.addRight(WellknownIds.admins, "admins", [Rights.full_control]);
         root.removeRight(WellknownIds.admins, [Rights.delete]);
         root.addRight(WellknownIds.root, "root", [Rights.full_control]);

VERSION

@@ -1 +1 @@
-0.0.242
+0.0.243