diff --git a/ui/src/config/section/account.js b/ui/src/config/section/account.js index f4655235f1c..6c973d92211 100644 --- a/ui/src/config/section/account.js +++ b/ui/src/config/section/account.js @@ -54,7 +54,8 @@ export default { icon: 'plus', label: 'label.add.account', listView: true, - args: ['username', 'password', 'confirmpassword', 'email', 'firstname', 'lastname', 'domainid', 'account', 'roleid', 'timezone', 'networkdomain'] + popup: true, + component: () => import('@/views/iam/AddAccount.vue') }, { api: 'ldapCreateAccount', diff --git a/ui/src/config/section/user.js b/ui/src/config/section/user.js index 689b2299684..176e36f219c 100644 --- a/ui/src/config/section/user.js +++ b/ui/src/config/section/user.js @@ -70,6 +70,14 @@ export default { dataView: true, show: (record) => { return record.state === 'enabled' } }, + { + api: 'authorizeSamlSso', + icon: 'form', + label: 'Configure SAML SSO Authorization', + dataView: true, + popup: true, + component: () => import('@/views/iam/ConfigureSamlSsoAuth.vue') + }, { api: 'deleteUser', icon: 'delete', diff --git a/ui/src/locales/en.json b/ui/src/locales/en.json index 7008ce0e8cf..9626d59e3a8 100644 --- a/ui/src/locales/en.json +++ b/ui/src/locales/en.json @@ -1659,6 +1659,8 @@ "label.rule.number": "Rule Number", "label.rules": "Rules", "label.running": "Running VMs", +"label.saml.disable": "SAML Disable", +"label.saml.enable": "SAML Enable", "label.s3.access.key": "Access Key", "label.s3.bucket": "Bucket", "label.s3.connection.timeout": "Connection Timeout", diff --git a/ui/src/views/iam/AddAccount.vue b/ui/src/views/iam/AddAccount.vue new file mode 100644 index 00000000000..2c9130d00fd --- /dev/null +++ b/ui/src/views/iam/AddAccount.vue @@ -0,0 +1,419 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + + + + diff --git a/ui/src/views/iam/AddLdapAccount.vue b/ui/src/views/iam/AddLdapAccount.vue index ce91f0ceff0..e41c11a7de7 100644 --- a/ui/src/views/iam/AddLdapAccount.vue +++ b/ui/src/views/iam/AddLdapAccount.vue @@ -112,6 +112,25 @@ :placeholder="apiParams.group.description" /> +
+ + + + + + + {{ idp.orgName }} + + + +
+
{{ $t('label.close') }} {{ $t('label.add') }} @@ -139,6 +158,8 @@ export default { listDomains: [], listRoles: [], timeZoneMap: [], + listIdps: [], + selectedIdp: '', filters: [], selectedFilter: '', listLoading: false, @@ -146,7 +167,8 @@ export default { domainLoading: false, roleLoading: false, loading: false, - searchQuery: undefined + searchQuery: undefined, + samlEnable: false } }, beforeCreate () { @@ -168,6 +190,7 @@ export default { this.dataSource = [] this.listDomains = [] this.listRoles = [] + this.listIdps = [] this.columns = [ { title: this.$t('label.name'), @@ -224,11 +247,13 @@ export default { const [ listTimeZone, listDomains, - listRoles + listRoles, + listIdps ] = await Promise.all([ this.fetchTimeZone(), this.fetchListDomains(), - this.fetchListRoles() + this.fetchListRoles(), + ('listIdps' in this.$store.getters.apis) ? this.fetchIdps() : [] ]).catch(error => { this.$notifyError(error) }).finally(() => { @@ -239,6 +264,7 @@ export default { this.timeZoneMap = listTimeZone && listTimeZone.length > 0 ? listTimeZone : [] this.listDomains = listDomains && listDomains.length > 0 ? listDomains : [] this.listRoles = listRoles && listRoles.length > 0 ? listRoles : [] + this.listIdps = listIdps && listIdps.length > 0 ? listIdps : [] }, fetchTimeZone (value) { return new Promise((resolve, reject) => { @@ -299,6 +325,19 @@ export default { }) }) }, + fetchIdps () { + return new Promise((resolve, reject) => { + api('listIdps').then(json => { + const listIdps = json.listidpsresponse.idp || [] + if (listIdps.length !== 0) { + this.selectedIdp = listIdps[0].id + } + resolve(listIdps) + }).catch(error => { + reject(error) + }) + }) + }, handleSubmit (e) { e.preventDefault() this.form.validateFields((err, values) => { @@ -338,13 +377,13 @@ export default { }) } this.loading = true - Promise.all(promises).then(response => { - for (let i = 0; i < response.length; i++) { + Promise.all(promises).then(responses => { + for (const response of responses) { if (apiName === 'ldapCreateAccount' && values.samlEnable) { const users = response.createaccountresponse.account.user - const entity = values.samlEntity - if (users && entity) { - this.authorizeUsersForSamlSSO(users, entity) + const entityId = values.samlEntity + if (users && entityId) { + this.authorizeUsersForSamlSSO(users, entityId) } } else if (apiName === 'importLdapUsers' && response.ldapuserresponse && values.samlEnable) { this.$notification.error({ @@ -355,12 +394,11 @@ export default { if (apiName === 'ldapCreateAccount') { this.$notification.success({ message: this.$t('label.add.ldap.account'), - description: response[i].createaccountresponse.account.name + description: response.createaccountresponse.account.name }) } } } - this.$emit('refresh-data') this.handleClose() }).catch(error => { @@ -393,13 +431,13 @@ export default { handleClose () { this.$emit('close-action') }, - authorizeUsersForSamlSSO (users, entity) { + authorizeUsersForSamlSSO (users, entityId) { const promises = [] for (var i = 0; i < users.length; i++) { const params = {} params.enable = true params.userid = users[i].id - params.entityid = entity + params.entityid = entityId promises.push(new Promise((resolve, reject) => { api('authorizeSamlSso', params).catch(error => { reject(error) diff --git a/ui/src/views/iam/ConfigureSamlSsoAuth.vue b/ui/src/views/iam/ConfigureSamlSsoAuth.vue new file mode 100644 index 00000000000..d8e213a166b --- /dev/null +++ b/ui/src/views/iam/ConfigureSamlSsoAuth.vue @@ -0,0 +1,138 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + + + +