Skip to content

ui: fix create account/user with saml #5481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 21, 2021
Merged

ui: fix create account/user with saml #5481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
32243b1
ui: fix create user with saml
shwstppr Sep 21, 2021
1f0f09c
fix listIdp issue for add account/user
shwstppr Sep 21, 2021
8f8d3ae
Merge branch 'main' into fix-ui-create-user-saml
shwstppr Sep 21, 2021
a493ba1
label fix
shwstppr Sep 21, 2021
98c486f
fix idp selection
shwstppr Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions ui/src/views/iam/AddAccount.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
v-decorator="['networkdomain']"
:placeholder="apiParams.networkdomain.description" />
</a-form-item>
<div v-if="'authorizeSamlSso' in $store.getters.apis">
<div v-if="samlAllowed">
<a-form-item :label="$t('label.samlenable')">
<a-switch v-decorator="['samlenable']" @change="checked => { this.samlEnable = checked }" />
</a-form-item>
Expand All @@ -165,7 +165,7 @@
:filterOption="(input, option) => {
return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
}" >
<a-select-option v-for="(idp, idx) in idps" :key="idx">
<a-select-option v-for="idp in idps" :key="idp.id">
{{ idp.orgName }}
</a-select-option>
</a-select>
Expand Down Expand Up @@ -217,12 +217,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()
}
},
Expand Down Expand Up @@ -344,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 => {
Expand Down
47 changes: 25 additions & 22 deletions ui/src/views/iam/AddUser.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
</a-select-option>
</a-select>
</a-form-item>
<div v-if="'authorizeSamlSso' in $store.getters.apis">
<div v-if="samlAllowed">
<a-form-item :label="$t('label.samlenable')">
<a-switch v-decorator="['samlenable']" @change="checked => { this.samlEnable = checked }" />
</a-form-item>
Expand All @@ -156,7 +156,7 @@
:filterOption="(input, option) => {
return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
}" >
<a-select-option v-for="(idp, idx) in idps" :key="idx">
<a-select-option v-for="idp in idps" :key="idp.id">
{{ idp.orgName }}
</a-select-option>
</a-select>
Expand Down Expand Up @@ -208,6 +208,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
Expand All @@ -219,7 +224,7 @@ export default {
this.fetchAccount()
}
this.fetchTimeZone()
if ('listIdps' in this.$store.getters.apis) {
if (this.samlAllowed) {
this.fetchIdps()
}
},
Expand Down Expand Up @@ -318,26 +323,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 => {
Expand Down
4 changes: 2 additions & 2 deletions ui/src/views/iam/ConfigureSamlSsoAuth.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
<a-form-item :label="$t('label.samlentity')">
<a-select
v-decorator="['samlEntity', {
initialValue: selectedIdp,
initialValue: selectedIdp
}]"
showSearch
optionFilterProp="children"
:filterOption="(input, option) => {
return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
}" >
<a-select-option v-for="(idp, idx) in idps" :key="idx">
<a-select-option v-for="idp in idps" :key="idp.id">
{{ idp.orgName }}
</a-select-option>
</a-select>
Expand Down