From 6de85c84f2604980ee25814821a50a421f669fcb Mon Sep 17 00:00:00 2001 From: Jonas Cosandey Date: Thu, 26 Aug 2021 09:07:06 +0200 Subject: [PATCH] fix(ldap-roles): rename all remaining ldap roles --- .gitignore | 1 + frontend/app/ui/application/controller.js | 3 ++- frontend/app/ui/subscriptions/confirm/route.js | 3 ++- frontend/app/ui/subscriptions/detail/controller.js | 6 +++++- frontend/app/ui/subscriptions/own/controller.js | 6 +++++- frontend/app/ui/subscriptions/reload/controller.js | 8 ++++++-- frontend/app/ui/subscriptions/reload/route.js | 10 ++++++++-- frontend/config/environment.js | 2 ++ 8 files changed, 31 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 6a6b58c5..69baa560 100644 --- a/.gitignore +++ b/.gitignore @@ -16,5 +16,6 @@ provisioning/rt4/var/mason_data provisioning/rt4/var/rt4 millis-test-sync frontend/root +frontend/tmp ldap/lib ldap/slapd.d diff --git a/frontend/app/ui/application/controller.js b/frontend/app/ui/application/controller.js index 39fb768c..2a096f99 100644 --- a/frontend/app/ui/application/controller.js +++ b/frontend/app/ui/application/controller.js @@ -1,6 +1,7 @@ import Controller from "@ember/controller"; import { action } from "@ember/object"; import { inject as service } from "@ember/service"; +import ENV from "customer-center/config/environment"; export default class ApplicationController extends Controller { @service account; @@ -8,7 +9,7 @@ export default class ApplicationController extends Controller { @service intl; get showConfirmInMenu() { - return this.account.isInGroup("admin"); + return this.account.isInGroup(ENV.auth.adminRole); } get languages() { diff --git a/frontend/app/ui/subscriptions/confirm/route.js b/frontend/app/ui/subscriptions/confirm/route.js index df2f872b..6604bc05 100644 --- a/frontend/app/ui/subscriptions/confirm/route.js +++ b/frontend/app/ui/subscriptions/confirm/route.js @@ -1,4 +1,5 @@ import { inject as service } from "@ember/service"; +import ENV from "customer-center/config/environment"; import AuthenticatedRoute from "customer-center/routes/-authenticated"; export default class SubscriptionsConfirmRoute extends AuthenticatedRoute { @@ -10,7 +11,7 @@ export default class SubscriptionsConfirmRoute extends AuthenticatedRoute { beforeModel(transition) { super.beforeModel(transition); - if (!this.account.isInGroup("admin")) { + if (!this.account.isInGroup(ENV.auth.adminRole)) { this.notify.error(this.intl.t("page.subscriptions.confirm.no-access")); this.transitionTo("subscriptions.index"); } diff --git a/frontend/app/ui/subscriptions/detail/controller.js b/frontend/app/ui/subscriptions/detail/controller.js index 774fd636..8a937445 100644 --- a/frontend/app/ui/subscriptions/detail/controller.js +++ b/frontend/app/ui/subscriptions/detail/controller.js @@ -2,6 +2,7 @@ import Controller from "@ember/controller"; import { action, get } from "@ember/object"; import { inject as service } from "@ember/service"; import { tracked } from "@glimmer/tracking"; +import ENV from "customer-center/config/environment"; import { task } from "ember-concurrency-decorators"; export default class SubscriptionsDetailController extends Controller { @@ -16,7 +17,10 @@ export default class SubscriptionsDetailController extends Controller { @tracked reportsNext; get showReloadButton() { - return this.account.isInGroups("one", ["admin", "adsy-customer"]); + return this.account.isInGroups("one", [ + ENV.auth.adminRole, + ENV.auth.customerRole, + ]); } get breadcrumbs() { diff --git a/frontend/app/ui/subscriptions/own/controller.js b/frontend/app/ui/subscriptions/own/controller.js index 38bfca6d..b7a0aadd 100644 --- a/frontend/app/ui/subscriptions/own/controller.js +++ b/frontend/app/ui/subscriptions/own/controller.js @@ -1,6 +1,7 @@ import Controller from "@ember/controller"; import { alias } from "@ember/object/computed"; import { inject as service } from "@ember/service"; +import ENV from "customer-center/config/environment"; export default class SubscriptionsOwnController extends Controller { @service account; @@ -9,7 +10,10 @@ export default class SubscriptionsOwnController extends Controller { @alias("model") projects; get showReloadLink() { - return this.account.isInGroups("one", ["admin", "adsy-customer"]); + return this.account.isInGroups("one", [ + ENV.auth.adminRole, + ENV.auth.customerRole, + ]); } breadcrumbs = [ diff --git a/frontend/app/ui/subscriptions/reload/controller.js b/frontend/app/ui/subscriptions/reload/controller.js index 767429d6..8b7db2ce 100644 --- a/frontend/app/ui/subscriptions/reload/controller.js +++ b/frontend/app/ui/subscriptions/reload/controller.js @@ -3,6 +3,7 @@ import { action } from "@ember/object"; import { inject as service } from "@ember/service"; import { isEmpty } from "@ember/utils"; import { tracked } from "@glimmer/tracking"; +import ENV from "customer-center/config/environment"; import { Changeset } from "ember-changeset"; import moment from "moment"; import UIkit from "uikit"; @@ -18,11 +19,14 @@ export default class SubscriptionsReloadController extends Controller { @tracked changeset; get showForm() { - return this.account.isInGroup("admin"); + return this.account.isInGroup(ENV.auth.adminRole); } get showPackages() { - return this.account.isInGroups("all", ["timed", "adsy-customer"]); + return this.account.isInGroups("all", [ + ENV.auth.timedRole, + ENV.auth.customerRole, + ]); } get breadcrumbs() { diff --git a/frontend/app/ui/subscriptions/reload/route.js b/frontend/app/ui/subscriptions/reload/route.js index 2224036c..e60cf100 100644 --- a/frontend/app/ui/subscriptions/reload/route.js +++ b/frontend/app/ui/subscriptions/reload/route.js @@ -1,4 +1,5 @@ import { inject as service } from "@ember/service"; +import ENV from "customer-center/config/environment"; import AuthenticatedRoute from "customer-center/routes/-authenticated"; export default class SubscriptionsReloadRoute extends AuthenticatedRoute { @@ -11,7 +12,12 @@ export default class SubscriptionsReloadRoute extends AuthenticatedRoute { super.beforeModel(transition); // Normal users cannot recharge the subscription. - if (!this.account.isInGroups("one", ["admin", "adsy-customer"])) { + if ( + !this.account.isInGroups("one", [ + ENV.auth.adminRole, + ENV.auth.customerRole, + ]) + ) { this.notify.error(this.intl.t("page.subscriptions.reload.no-access")); this.transitionTo( "subscriptions.detail", @@ -25,7 +31,7 @@ export default class SubscriptionsReloadRoute extends AuthenticatedRoute { // Customers get a list of packages to choose from. let packages = []; - if (this.account.isInGroup("adsy-customer")) { + if (this.account.isInGroup(ENV.auth.customerRole)) { const billing_type = project.billingType.get("id"); packages = await this.timed.getReloadPackages(billing_type); } diff --git a/frontend/config/environment.js b/frontend/config/environment.js index 2b133137..881032bc 100644 --- a/frontend/config/environment.js +++ b/frontend/config/environment.js @@ -18,6 +18,8 @@ module.exports = function (environment) { auth: { adminRole: env("AUTH_ROLE_ADMIN", "admin"), employeeRole: env("AUTH_ROLE_EMPLOYEE", "employees"), + timedRole: env("AUTH_ROLE_TIMED", "timed"), + customerRole: env("AUTH_ROLE_CUSTOMER", "adsy-customer"), }, EmberENV: {