From 32243b1325bacad8ef655ac081cc962fde97ec8c Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 21 Sep 2021 12:00:01 +0530 Subject: [PATCH 1/4] ui: fix create user with saml Fixes #5478 Signed-off-by: Abhishek Kumar --- ui/src/views/iam/AddUser.vue | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/ui/src/views/iam/AddUser.vue b/ui/src/views/iam/AddUser.vue index a2838a39c630..129b83ee6f31 100644 --- a/ui/src/views/iam/AddUser.vue +++ b/ui/src/views/iam/AddUser.vue @@ -314,26 +314,24 @@ export default { message: this.$t('label.create.user'), description: `${this.$t('message.success.create.user')} ${params.username}` }) - const users = response.createuserresponse.user.user - if (values.samlenable && users) { - for (var i = 0; i < users.length; i++) { - api('authorizeSamlSso', { - enable: values.samlenable, - entityid: values.samlentity, - userid: users[i].id - }).then(response => { - this.$notification.success({ - message: this.$t('label.samlenable'), - description: this.$t('message.success.enable.saml.auth') - }) - }).catch(error => { - this.$notification.error({ - message: this.$t('message.request.failed'), - description: (error.response && error.response.headers && error.response.headers['x-description']) || error.message, - duration: 0 - }) + const user = response.createuserresponse.user + if (values.samlenable && user) { + api('authorizeSamlSso', { + enable: values.samlenable, + entityid: values.samlentity, + userid: user.id + }).then(response => { + this.$notification.success({ + message: this.$t('label.samlenable'), + description: this.$t('message.success.enable.saml.auth') }) - } + }).catch(error => { + this.$notification.error({ + message: this.$t('message.request.failed'), + description: (error.response && error.response.headers && error.response.headers['x-description']) || error.message, + duration: 0 + }) + }) } this.closeAction() }).catch(error => { From 1f0f09cf40ed1903830d1c2caa9fad2719ba4fde Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 21 Sep 2021 13:12:16 +0530 Subject: [PATCH 2/4] fix listIdp issue for add account/user Fixes #5477 Signed-off-by: Abhishek Kumar --- ui/src/views/iam/AddAccount.vue | 9 +++++++-- ui/src/views/iam/AddUser.vue | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ui/src/views/iam/AddAccount.vue b/ui/src/views/iam/AddAccount.vue index 7ab09c970183..3d01bb0e29d9 100644 --- a/ui/src/views/iam/AddAccount.vue +++ b/ui/src/views/iam/AddAccount.vue @@ -147,7 +147,7 @@ v-decorator="['networkdomain']" :placeholder="apiParams.networkdomain.description" /> -
+
@@ -215,12 +215,17 @@ export default { created () { this.fetchData() }, + computed: { + samlAllowed () { + return 'authorizeSamlSso' in this.$store.getters.apis + } + }, methods: { fetchData () { this.fetchDomains() this.fetchRoles() this.fetchTimeZone() - if ('listIdps' in this.$store.getters.apis) { + if (this.samlAllowed) { this.fetchIdps() } }, diff --git a/ui/src/views/iam/AddUser.vue b/ui/src/views/iam/AddUser.vue index 129b83ee6f31..674fbd13764d 100644 --- a/ui/src/views/iam/AddUser.vue +++ b/ui/src/views/iam/AddUser.vue @@ -136,7 +136,7 @@ -
+
@@ -204,6 +204,11 @@ export default { this.apiParams = this.$getApiParams('createUser', 'authorizeSamlSso') this.fetchData() }, + computed: { + samlAllowed () { + return 'authorizeSamlSso' in this.$store.getters.apis + } + }, methods: { fetchData () { this.account = this.$route.query && this.$route.query.account ? this.$route.query.account : null @@ -215,7 +220,7 @@ export default { this.fetchAccount() } this.fetchTimeZone() - if ('listIdps' in this.$store.getters.apis) { + if (this.samlAllowed) { this.fetchIdps() } }, From a493ba194f988fb1c4d3369b096d25d1deda572f Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 21 Sep 2021 13:24:04 +0530 Subject: [PATCH 3/4] label fix Signed-off-by: Abhishek Kumar --- ui/src/views/iam/AddAccount.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/views/iam/AddAccount.vue b/ui/src/views/iam/AddAccount.vue index a42760bc0c5c..2c713cdc23a1 100644 --- a/ui/src/views/iam/AddAccount.vue +++ b/ui/src/views/iam/AddAccount.vue @@ -349,7 +349,7 @@ export default { userid: users[i].id }).then(response => { this.$notification.success({ - message: this.$t('samlenable'), + message: this.$t('label.samlenable'), description: this.$t('message.success.enable.saml.auth') }) }).catch(error => { From 98c486f42f77070bb9e5fe21286b61b4bf5737a7 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 21 Sep 2021 15:38:57 +0530 Subject: [PATCH 4/4] fix idp selection Signed-off-by: Abhishek Kumar --- ui/src/views/iam/AddAccount.vue | 2 +- ui/src/views/iam/AddUser.vue | 2 +- ui/src/views/iam/ConfigureSamlSsoAuth.vue | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/src/views/iam/AddAccount.vue b/ui/src/views/iam/AddAccount.vue index 2c713cdc23a1..89ebcb68a85a 100644 --- a/ui/src/views/iam/AddAccount.vue +++ b/ui/src/views/iam/AddAccount.vue @@ -165,7 +165,7 @@ :filterOption="(input, option) => { return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 }" > - + {{ idp.orgName }} diff --git a/ui/src/views/iam/AddUser.vue b/ui/src/views/iam/AddUser.vue index 77ab491ed042..ec0e1b87ef20 100644 --- a/ui/src/views/iam/AddUser.vue +++ b/ui/src/views/iam/AddUser.vue @@ -156,7 +156,7 @@ :filterOption="(input, option) => { return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 }" > - + {{ idp.orgName }} diff --git a/ui/src/views/iam/ConfigureSamlSsoAuth.vue b/ui/src/views/iam/ConfigureSamlSsoAuth.vue index 715a0d136c34..546cf9a0ecb1 100644 --- a/ui/src/views/iam/ConfigureSamlSsoAuth.vue +++ b/ui/src/views/iam/ConfigureSamlSsoAuth.vue @@ -31,14 +31,14 @@ - + {{ idp.orgName }}