Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

UI bugfix: Remove the ability to edit gateway service user in UI (#1964)

Wouter Voorberg1c3323e54136
diff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.ts
index 4d87a32cd..727668ac3 100644
--- a/ui/app/manager/src/pages/page-users.ts
+++ b/ui/app/manager/src/pages/page-users.ts
@@ -337,6 +337,11 @@ export class PageUsers extends Page<AppStateKeyed> {
showSnackbar(undefined, "noUsernameSet", "dismiss");
return false;
}
+ // New service users with the 'gateway-' prefix are not allowed
+ if(user.serviceAccount && (user.email.startsWith('gateway-') || user.username.startsWith('gateway-'))) {
+ showSnackbar(undefined, "noGatewayUsername", "dismiss")
+ return false;
+ }
if (user.password === "") {
// Means a validation failure shouldn't get here
@@ -768,6 +773,7 @@ export class PageUsers extends Page<AppStateKeyed> {
const btnElem = ev.currentTarget as OrMwcInput;
const secretElem = this.shadowRoot.getElementById(secretInputId) as OrMwcInput;
if (!btnElem || !secretElem) {
+ showSnackbar(undefined, "errorOccurred");
return;
}
btnElem.disabled = true;
@@ -847,6 +853,7 @@ export class PageUsers extends Page<AppStateKeyed> {
protected getSingleUserTemplate(user: UserModel, compositeRoleOptions: string[], realmRoleOptions: [string, string][], suffix: string, readonly: boolean = true): TemplateResult {
const isServiceUser = user.serviceAccount;
const isSameUser = user.username === manager.username;
+ const isGatewayServiceUser = isServiceUser && user.username?.startsWith("gateway-");
const implicitRoleNames = user.loaded ? this.getImplicitUserRoles(user) : [];
return html`
<div class="row">
@@ -912,10 +919,11 @@ export class PageUsers extends Page<AppStateKeyed> {
.value="${user.secret}"
.type="${InputType.TEXT}"></or-mwc-input>
<or-mwc-input ?readonly="${!user.id || readonly}"
+ ?disabled="${isGatewayServiceUser}"
.label="${i18next.t("regenerateSecret")}"
.type="${InputType.BUTTON}"
@or-mwc-input-changed="${(ev) => {
- this._regenerateSecret(ev, user, "password-" + suffix);
+ this._regenerateSecret(ev, user, "new-password-" + suffix).catch(() => showSnackbar(undefined, 'errorOccurred'));
this.onUserChanged(suffix);
}}"></or-mwc-input>
`, () => html`
@@ -964,7 +972,7 @@ export class PageUsers extends Page<AppStateKeyed> {
<!-- realm roles -->
<or-mwc-input
?readonly="${readonly}"
- ?disabled="${isSameUser}"
+ ?disabled="${isSameUser || isGatewayServiceUser}"
class = "validate"
.value="${user.realmRoles}"
.type="${InputType.SELECT}" multiple
@@ -978,7 +986,7 @@ export class PageUsers extends Page<AppStateKeyed> {
<!-- composite client roles -->
<or-mwc-input
?readonly="${readonly}"
- ?disabled="${isSameUser}"
+ ?disabled="${isSameUser || isGatewayServiceUser}"
class = "validate"
.value="${user.roles && user.roles.length > 0 ? user.roles.filter(r => this._compositeRoles.some(cr => cr.name === r)) : undefined}"
.type="${InputType.SELECT}" multiple
@@ -997,7 +1005,7 @@ export class PageUsers extends Page<AppStateKeyed> {
return html`
<or-mwc-input
?readonly="${readonly}"
- ?disabled="${implicitRoleNames.find(name => r.name === name)}"
+ ?disabled="${implicitRoleNames.find(name => r.name === name) || isGatewayServiceUser}"
class = "validate"
.value="${!!user.roles.find(userRole => userRole === r.name) || implicitRoleNames.some(implicitRoleName => implicitRoleName === r.name)}"
.type="${InputType.CHECKBOX}"
@@ -1019,7 +1027,7 @@ export class PageUsers extends Page<AppStateKeyed> {
<!-- Asset-User links -->
<div>
<span>${i18next.t("linkedAssets")}:</span>
- <or-mwc-input outlined ?disabled="${readonly}" style="margin-left: 4px;"
+ <or-mwc-input outlined ?disabled="${readonly || isGatewayServiceUser}" style="margin-left: 4px;"
.type="${InputType.BUTTON}"
.label="${i18next.t("selectRestrictedAssets", {number: user.userAssetLinks.length})}"
@or-mwc-input-changed="${(ev: MouseEvent) => this._openAssetSelector(ev, user, readonly, suffix)}"></or-mwc-input>
@@ -1030,7 +1038,7 @@ export class PageUsers extends Page<AppStateKeyed> {
${when(!(readonly && !this._saveUserPromise), () => html`
<div class="row button-row">
- ${when((!isSameUser && user.id), () => html`
+ ${when((!isSameUser && !isGatewayServiceUser && user.id), () => html`
<or-mwc-input style="margin: 0;" outlined ?disabled="${readonly}"
.label="${i18next.t("delete")}"
.type="${InputType.BUTTON}"
diff --git a/ui/app/shared/locales/en/or.json b/ui/app/shared/locales/en/or.json
index a427680bb..447a7e026 100644
--- a/ui/app/shared/locales/en/or.json
+++ b/ui/app/shared/locales/en/or.json
@@ -652,6 +652,7 @@
"search": "Search",
"noEmailSet": "Create user failed, no email set.",
"noUsernameSet": "Create user failed, no username set",
+ "noGatewayUsername": "You cannot start your username or email with 'gateway-'",
"createUserFailed": "Create user failed",
"saveUserFailed": "Save user failed",
"saveUserSucceeded": "Saved user successfully!",
diff --git a/ui/app/shared/locales/nl/or.json b/ui/app/shared/locales/nl/or.json
index ea308fd5e..cf78ae037 100644
--- a/ui/app/shared/locales/nl/or.json
+++ b/ui/app/shared/locales/nl/or.json
@@ -651,6 +651,7 @@
"search": "Zoeken",
"noEmailSet": "Gebruiker aanmaken mislukt, geen email ingevuld.",
"noUsernameSet": "Gebruiker aanmaken mislukt, geen gebruikersnaam ingevuld.",
+ "noGatewayUsername": "Gebruikersnaam en email mogen niet beginnen met 'gateway-'",
"createUserFailed": "Aanmaken gebruiker mislukt",
"saveUserFailed": "Opslaan gebruiker mislukt",
"saveUserSucceeded": "Gebruiker succesvol opgeslagen!",