Skip to content

Commit 931e6de

Browse files
committed
auto delete nodered role when deleting user
1 parent fdebe1d commit 931e6de

4 files changed

Lines changed: 16 additions & 1 deletion

File tree

OpenFlow/src/LoginProvider.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ export class LoginProvider {
210210
domain: Config.domain,
211211
allow_user_registration: Config.allow_user_registration,
212212
allow_personal_nodered: Config.allow_personal_nodered,
213+
auto_create_personal_nodered_group: Config.auto_create_personal_nodered_group,
213214
namespace: Config.namespace,
214215
nodered_domain_schema: Config.nodered_domain_schema
215216
}

OpenFlow/src/User.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ export class User extends Base {
5353
users.AddMember(user);
5454

5555
if (Config.auto_create_personal_nodered_group) {
56+
var name = user.username;
57+
name = name.split("@").join("").split(".").join("");
58+
name = name.toLowerCase();
59+
5660
var noderedadmins = await User.ensureRole(jwt, name + "noderedadmins", null);
5761
noderedadmins.addRight(user._id, user.username, [Rights.full_control]);
5862
noderedadmins.removeRight(user._id, [Rights.delete]);

OpenFlow/src/public/Controllers.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,16 @@ module openflow {
732732
await this.api.Delete(this.collection, model);
733733
this.models = this.models.filter(function (m: any): boolean { return m._id !== model._id; });
734734
this.loading = false;
735+
var name = model.username;
736+
name = name.split("@").join("").split(".").join("");
737+
name = name.toLowerCase();
738+
739+
var list = await this.api.Query("users", { _role: "role", name: name + "noderedadmins" });
740+
if (list.length == 1) {
741+
console.log("Deleting " + name + "noderedadmins")
742+
await this.api.Delete("users", list[0]._id);
743+
}
744+
735745
if (!this.$scope.$$phase) { this.$scope.$apply(); }
736746
}
737747
}

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.0.351
1+
0.0.352

0 commit comments

Comments
 (0)