Skip to content

Commit e88194d

Browse files
committed
strip email chars from name
1 parent cf19226 commit e88194d

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

OpenFlow/src/Messages/Message.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -513,25 +513,26 @@ export class Message {
513513
if (exists == null) { throw new Error("Unknown name " + msg.name) }
514514
name = msg.name;
515515
}
516+
name = name.replace("@", "_").replace(".", "_");
516517
var namespace = Config.namespace;
517518
var hostname = Config.nodered_domain_schema.replace("$nodered_id$", name);
518519

519520
// var noderedusers = await User.ensureRole(cli.jwt, name + "noderedusers", null);
520521
// noderedusers.addRight(cli.user._id, cli.user.username, [Rights.full_control]);
521522
// noderedusers.removeRight(cli.user._id, [Rights.delete]);
522523
// noderedusers.AddMember(cli.user);
523-
var nodereduser: User = await User.ensureUser(cli.jwt, "nodered" + name, "nodered" + name, null);
524-
nodereduser.addRight(cli.user._id, cli.user.username, [Rights.full_control]);
525-
nodereduser.removeRight(cli.user._id, [Rights.delete]);
526-
await nodereduser.Save(cli.jwt);
524+
// var nodereduser: User = await User.ensureUser(cli.jwt, "nodered" + name, "nodered" + name, null);
525+
// nodereduser.addRight(cli.user._id, cli.user.username, [Rights.full_control]);
526+
// nodereduser.removeRight(cli.user._id, [Rights.delete]);
527+
// await nodereduser.Save(cli.jwt);
527528

528529
var noderedadmins = await User.ensureRole(cli.jwt, name + "noderedadmins", null);
529530
noderedadmins.addRight(cli.user._id, cli.user.username, [Rights.full_control]);
530531
noderedadmins.removeRight(cli.user._id, [Rights.delete]);
531532
noderedadmins.AddMember(cli.user);
532-
noderedadmins.addRight(nodereduser._id, nodereduser.username, [Rights.full_control]);
533-
noderedadmins.removeRight(nodereduser._id, [Rights.delete]);
534-
noderedadmins.AddMember(nodereduser);
533+
// noderedadmins.addRight(nodereduser._id, nodereduser.username, [Rights.full_control]);
534+
// noderedadmins.removeRight(nodereduser._id, [Rights.delete]);
535+
// noderedadmins.AddMember(nodereduser);
535536
await noderedadmins.Save(cli.jwt);
536537

537538
var deployment = await KubeUtil.instance().GetDeployment(namespace, name);
@@ -636,6 +637,7 @@ export class Message {
636637
if (exists == null) { throw new Error("Unknown name " + msg.name) }
637638
name = msg.name;
638639
}
640+
name = name.replace("@", "_").replace(".", "_");
639641
var namespace = Config.namespace;
640642
var hostname = Config.nodered_domain_schema.replace("$nodered_id$", name);
641643

@@ -698,6 +700,7 @@ export class Message {
698700
if (exists == null) { throw new Error("Unknown name " + msg.name) }
699701
name = msg.name;
700702
}
703+
name = name.replace("@", "_").replace(".", "_");
701704
var namespace = Config.namespace;
702705
// var hostname = Config.nodered_domain_schema.replace("$nodered_id$", name);
703706

@@ -732,6 +735,7 @@ export class Message {
732735
if (exists == null) { throw new Error("Unknown name " + msg.name) }
733736
name = msg.name;
734737
}
738+
name = name.replace("@", "_").replace(".", "_");
735739
var namespace = Config.namespace;
736740
// var hostname = Config.nodered_domain_schema.replace("$nodered_id$", name);
737741

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.0.218
1+
0.0.219

0 commit comments

Comments
 (0)