From 862e180050e39840b8b68ad59212a9688abb45e2 Mon Sep 17 00:00:00 2001 From: Nancy Butler <42977925+mantis-toboggan-md@users.noreply.github.com> Date: Wed, 19 May 2021 13:11:26 -0700 Subject: [PATCH] github style, detailed authz message --- assets/translations/en-us.yaml | 4 +++- edit/auth/github.vue | 8 ++------ pages/c/_cluster/auth/config/index.vue | 22 +++++++++++++++++++--- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/assets/translations/en-us.yaml b/assets/translations/en-us.yaml index 4bc8f4e18e..722dd1c133 100644 --- a/assets/translations/en-us.yaml +++ b/assets/translations/en-us.yaml @@ -228,7 +228,7 @@ authConfig: unrestricted: Allow any valid user allowedPrincipalIds: title: Authorized Users & Groups - associatedWarning: 'Note: The {provider} user you authenticate as will be associated as an alternate way to login to the {vendor} user you are currently logged in as ({username}).' + associatedWarning: 'Note: The {provider} user you authenticate as will be associated as an alternate way to login to the {vendor} user you are currently logged in as ({username}); all the global permissions, project, and cluster role bindings of this {vendor} user will also apply to the {provider} user.' github: clientId: label: Client ID @@ -381,6 +381,8 @@ authConfig: enabled: 'The {provider} authentication provider is currently enabled.' testAndEnable: Test and Enable Authentication noneEnabled: Local Authentication is always enabled, but you may select another additional authentication provider from those shown below. + localEnabled: '{vendor} is configured to allow access to accounts in its local database.' + manageLocal: Manage Accounts authGroups: actions: diff --git a/edit/auth/github.vue b/edit/auth/github.vue index e0577e3ceb..6aa0e2eebe 100644 --- a/edit/auth/github.vue +++ b/edit/auth/github.vue @@ -7,7 +7,7 @@ import LabeledInput from '@/components/form/LabeledInput'; import Banner from '@/components/Banner'; import CopyToClipboard from '@/components/CopyToClipboard'; import AllowedPrincipals from '@/components/auth/AllowedPrincipals'; -import { NORMAN, MANAGEMENT } from '@/config/types'; +import { MANAGEMENT } from '@/config/types'; import { findBy } from '@/utils/array'; import AuthConfig from '@/mixins/auth-config'; import AuthBanner from '@/components/auth/AuthBanner'; @@ -69,10 +69,6 @@ export default { return `${ this.model.tls ? 'https://' : 'http://' }${ this.model.hostname }`; }, - principal() { - return this.$store.getters['rancher/byId'](NORMAN.PRINCIPAL, this.$store.getters['auth/principalId']) || {}; - }, - displayName() { return this.t(`model.authConfig.provider.${ NAME }`); }, @@ -170,7 +166,7 @@ export default { :labels="[ t(`authConfig.${NAME}.target.public`), t(`authConfig.${NAME}.target.private`)]" /> -
+
@@ -77,7 +86,14 @@ export default {

{{ displayName }}

- + + {{ t('authConfig.localEnabled') }} + + {{ t('authConfig.manageLocal') }} + +
+ {{ t('authConfig.noneEnabled') }} +