diff --git a/src/client/keystone/index.js b/src/client/keystone/index.js
index 6578223c..ed199783 100644
--- a/src/client/keystone/index.js
+++ b/src/client/keystone/index.js
@@ -105,6 +105,11 @@ class KeystoneClient extends Base {
{
key: 'groups',
},
+ {
+ name: 'applicationCredentials',
+ key: 'application_credentials',
+ responseKey: 'application_credential',
+ },
],
extendOperations: [
{
diff --git a/src/components/Layout/GlobalHeader/OpenRc.jsx b/src/components/Layout/GlobalHeader/OpenRc.jsx
index b16c7fd7..8678a0bd 100644
--- a/src/components/Layout/GlobalHeader/OpenRc.jsx
+++ b/src/components/Layout/GlobalHeader/OpenRc.jsx
@@ -12,19 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-/* eslint-disable no-useless-escape */
-import React from 'react';
import { inject, observer } from 'mobx-react';
-import { Typography } from 'antd';
import { ModalAction } from 'containers/Action';
import { allCanReadPolicy } from 'resources/policy';
import globalAuthCatalogStore from 'stores/keystone/catalog';
-import { getOpenRc } from 'resources/openstack-rc';
+import { getCredentialOpenRc, getPwdOpenRc } from 'resources/openstack-rc';
import FileSaver from 'file-saver';
-import styles from './index.less';
-// import { DownSquareOutlined } from '@ant-design/icons';
-
-const { Paragraph } = Typography;
@inject('rootStore')
@observer
@@ -37,67 +30,20 @@ export default class OpenRc extends ModalAction {
static title = t('Get OpenRC file');
- componentDidMount() {
- this.getData();
- }
-
- async getData() {
- await this.store.fetchList({});
- this.exportRcFile();
- }
-
get name() {
return t('Get OpenRC file');
}
- getModalSize() {
- return 'large';
- }
-
- get token() {
- const key = 'keystone_token';
- const item = localStorage.getItem(key);
- try {
- return JSON.parse(item) || {};
- } catch (e) {
- return {};
- }
- }
-
get showNotice() {
return false;
}
- get tokenValue() {
- return this.token.value || '';
- }
-
- get tokenExpiry() {
- const { expires } = this.token;
- return expires || 0;
- }
-
get user() {
const { user } = this.props.rootStore;
return user;
}
- get project() {
- const {
- project: {
- id: projectId = '',
- name: projectName = '',
- domain: { name: projectDomainName } = {},
- } = {},
- } = this.user || {};
- return {
- projectId,
- projectName,
- projectDomainName,
- };
- }
-
- get openRc() {
+ getOpenRC(type) {
const {
project: {
id: projectId = '',
@@ -114,20 +60,29 @@ export default class OpenRc extends ModalAction {
const authUrl = endpoints.filter(
(endpoint) => endpoint.interface === 'public'
)[0].url;
- const openstackRc = getOpenRc({
- authUrl,
- projectId,
- projectName,
- projectDomain,
- userDomain,
- userName,
- region,
- });
+ let openstackRc = '';
+ if (type === 'password') {
+ openstackRc = getPwdOpenRc({
+ authUrl,
+ projectId,
+ projectName,
+ projectDomain,
+ userDomain,
+ userName,
+ region,
+ });
+ } else {
+ openstackRc = getCredentialOpenRc({
+ authUrl,
+ region,
+ });
+ }
+
return openstackRc;
}
- exportRcFile = () => {
- const blob = new Blob([this.openRc], {
+ exportRcFile = (data) => {
+ const blob = new Blob([data], {
type: 'text/plain;charset=utf-8',
});
FileSaver.saveAs(blob, 'openrc.sh');
@@ -135,7 +90,7 @@ export default class OpenRc extends ModalAction {
get defaultValue() {
const value = {
- token: this.tokenValue,
+ type: 'password',
};
return value;
}
@@ -144,34 +99,30 @@ export default class OpenRc extends ModalAction {
static allowed = () => Promise.resolve(true);
- get labelCol() {
- return {
- xs: { span: 0 },
- sm: { span: 0 },
- };
- }
-
- get wrapperCol() {
- return {
- xs: { span: 24 },
- sm: { span: 24 },
- };
- }
-
get formItems() {
return [
{
- name: 'token',
- label: '',
- type: 'label',
- component: (
-
- {this.openRc}
-
- ),
+ name: 'type',
+ label: t('Type'),
+ type: 'select',
+ options: [
+ {
+ label: t('Password Type'),
+ value: 'password',
+ },
+ {
+ label: t('Credential Type'),
+ value: 'credential',
+ },
+ ],
},
];
}
- onSubmit = () => Promise.resolve();
+ onSubmit = (values) => {
+ const { type } = values;
+ return this.store.fetchList().then(() => {
+ return this.exportRcFile(this.getOpenRC(type));
+ });
+ };
}
diff --git a/src/components/Tables/Base/index.jsx b/src/components/Tables/Base/index.jsx
index 33e33ff1..e8c50d04 100644
--- a/src/components/Tables/Base/index.jsx
+++ b/src/components/Tables/Base/index.jsx
@@ -44,6 +44,7 @@ import { getNoValue } from 'utils/index';
import { columnRender } from 'utils/render';
import { getLocalStorageItem, setLocalStorageItem } from 'utils/local-storage';
import { inject } from 'mobx-react';
+import globalRootStore from 'stores/root';
import CustomColumns from './CustomColumns';
import ItemActionButtons from './ItemActionButtons';
import PrimaryActionButtons from './PrimaryActionButtons';
@@ -331,7 +332,11 @@ export default class BaseTable extends React.Component {
return (
<>
- {projectId}
+ {globalRootStore.hasAdminRole ? (
+ {projectId}
+ ) : (
+ projectId
+ )}
{value || '-'}
@@ -360,7 +365,14 @@ export default class BaseTable extends React.Component {
if (render) {
return render;
}
- const { linkPrefix, dataIndex, idKey, linkPrefixFunc, linkFunc } = column;
+ const {
+ linkPrefix,
+ dataIndex,
+ idKey,
+ linkPrefixFunc,
+ linkFunc,
+ hasNoDetail = false,
+ } = column;
const { rowKey } = this.props;
return (value, record) => {
const idValue = get(record, idKey || rowKey);
@@ -374,7 +386,15 @@ export default class BaseTable extends React.Component {
url = this.getLinkUrl(linkValue, idValue);
}
const nameValue = value || get(record, dataIndex) || '-';
- if (!url) {
+ if (hasNoDetail) {
+ return (
+
+
{idValue}
+
{nameValue}
+
+ {roles.map((i) => (
+
+ {i.name}
+
+ ))}
+
+ );
+ return (
+
+
+
+ );
+ },
+ isHideable: true,
+ },
+ ];
+ return ret;
+ };
+
+ get searchFilters() {
+ const filters = [
+ {
+ label: t('Name'),
+ name: 'name',
+ },
+ ];
+ return filters;
+ }
+}
diff --git a/src/pages/user-center/routes/index.js b/src/pages/user-center/routes/index.js
index ca8ae664..d6b7aa3c 100644
--- a/src/pages/user-center/routes/index.js
+++ b/src/pages/user-center/routes/index.js
@@ -15,6 +15,7 @@
import BaseLayout from 'layouts/Basic';
import E404 from 'pages/base/containers/404';
+import Credentials from '../containers/Credentials';
import UserCenter from '../containers/UserCenter';
const PATH = '/user';
@@ -28,6 +29,11 @@ export default [
component: UserCenter,
exact: true,
},
+ {
+ path: `${PATH}/application-credentials`,
+ component: Credentials,
+ exact: true,
+ },
{ path: '*', component: E404 },
],
},
diff --git a/src/resources/openstack-rc.js b/src/resources/openstack-rc.js
index 83c6874a..ca23c39d 100644
--- a/src/resources/openstack-rc.js
+++ b/src/resources/openstack-rc.js
@@ -13,7 +13,7 @@
// limitations under the License.
// eslint-disable-next-line import/prefer-default-export
-export const getOpenRc = (data) => {
+export const getPwdOpenRc = (data) => {
const {
authUrl,
projectId,
@@ -36,7 +36,7 @@ export const getOpenRc = (data) => {
'# OpenStack API is version 3. For example, your cloud provider may implement\n' +
'# Image API v1.1, Block Storage API v2, and Compute API v2.0. OS_AUTH_URL is\n' +
'# only for the Identity API served through keystone.\n' +
- `export OS_AUTH_URL=${authUrl}\n` +
+ `export OS_AUTH_URL=${authUrl}/v3/\n` +
'\n' +
'# With the addition of Keystone we have standardized on the term **project**\n' +
'# as the entity that owns the resources.\n' +
@@ -70,3 +70,43 @@ export const getOpenRc = (data) => {
return openstackRc;
};
+
+export const getCredentialOpenRc = (data) => {
+ const { authUrl, region } = data;
+ const openstackRc =
+ '#!/usr/bin/env bash\n' +
+ '# To use an OpenStack cloud you need to authenticate against the Identity\n' +
+ '# service named keystone, which returns a **Token** and **Service Catalog**.\n' +
+ '# The catalog contains the endpoints for all services the user/tenant has\n' +
+ '# access to - such as Compute, Image Service, Identity, Object Storage, Block\n' +
+ '# Storage, and Networking (code-named nova, glance, keystone, swift,\n' +
+ '# cinder, and neutron).\n' +
+ '#\n' +
+ '# *NOTE*: Using the 3 *Identity API* does not necessarily mean any other\n' +
+ '# OpenStack API is version 3. For example, your cloud provider may implement\n' +
+ '# Image API v1.1, Block Storage API v2, and Compute API v2.0. OS_AUTH_URL is\n' +
+ '# only for the Identity API served through keystone.\n' +
+ `export OS_AUTH_URL=${authUrl}/v3/\n` +
+ '\n' +
+ '# With Keystone you pass the keystone password.\n' +
+ 'echo "Please enter your OpenStack Credential ID as OS_APPLICATION_CREDENTIAL_ID: "\n' +
+ 'read -sr OS_APPLICATION_CREDENTIAL_ID\n' +
+ 'export OS_APPLICATION_CREDENTIAL_ID=$OS_APPLICATION_CREDENTIAL_ID\n' +
+ 'echo "Please enter your OpenStack Credential Secret as OS_APPLICATION_CREDENTIAL_SECRET: "\n' +
+ 'read -sr OS_APPLICATION_CREDENTIAL_SECRET\n' +
+ 'export OS_APPLICATION_CREDENTIAL_SECRET=$OS_APPLICATION_CREDENTIAL_SECRET\n' +
+ '\n' +
+ "# Don't leave a blank variable, unset it if it was empty\n" +
+ 'if [ -z "$OS_REGION_NAME" ]; then unset OS_REGION_NAME; fi\n' +
+ 'export OS_INTERFACE=public\n' +
+ 'export OS_IDENTITY_API_VERSION=3\n' +
+ 'export OS_AUTH_TYPE=v3applicationcredential\n' +
+ '# If your configuration has multiple regions, we set that information here.\n' +
+ '# OS_REGION_NAME is optional and only valid in certain environments.\n' +
+ `export OS_REGION_NAME=${region}\n` +
+ '\n' +
+ '# If OS_AUTH_URL use private SSL, Please add CACERT file path \n' +
+ '# export OS_CACERT={crtPath}';
+
+ return openstackRc;
+};
diff --git a/src/resources/role.js b/src/resources/role.js
index 0fb867b0..e47a0a5e 100644
--- a/src/resources/role.js
+++ b/src/resources/role.js
@@ -16,8 +16,8 @@ const rolePermission = {
project_admin: t('Project Admin'),
project_reader: t('Project Reader'),
project_member: t('Project Member'),
- system_admin: t('Syetem Admin'),
- system_reader: t('Syetem Reader'),
+ system_admin: t('System Admin'),
+ system_reader: t('System Reader'),
};
export default rolePermission;
diff --git a/src/stores/keystone/credential.js b/src/stores/keystone/credential.js
new file mode 100644
index 00000000..378d3beb
--- /dev/null
+++ b/src/stores/keystone/credential.js
@@ -0,0 +1,66 @@
+// Copyright 2021 99cloud
+//
+// Licensed 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.
+
+import { action } from 'mobx';
+import client from 'client';
+import globalRootStore from 'stores/root';
+import globalUserStore from 'stores/keystone/user';
+import Base from '../base';
+
+export class CredentialStore extends Base {
+ get isSubResource() {
+ return true;
+ }
+
+ get client() {
+ return client.keystone.users.applicationCredentials;
+ }
+
+ get paramsFuncPage() {
+ return (params) => {
+ const { current, withPrice, id, ...rest } = params;
+ return rest;
+ };
+ }
+
+ @action
+ create(data) {
+ const body = {};
+ body[this.responseKey] = data;
+ return this.submitting(
+ this.client.create(globalRootStore.user.user.id, body)
+ );
+ }
+
+ async listDidFetch(items, allProjects) {
+ if (!allProjects) {
+ try {
+ const results = await globalUserStore.getUserProjects();
+ const projectNameMap = new Map();
+ results.forEach((p) => {
+ projectNameMap.set(p.id, p.name);
+ });
+ items.forEach((item) => {
+ item.project_name = projectNameMap.get(item.project_id) || '-';
+ });
+ } catch (e) {
+ return items;
+ }
+ }
+ return items;
+ }
+}
+
+const globalCredentialStore = new CredentialStore();
+export default globalCredentialStore;
diff --git a/src/stores/keystone/user.js b/src/stores/keystone/user.js
index d2584b60..a79a51a3 100644
--- a/src/stores/keystone/user.js
+++ b/src/stores/keystone/user.js
@@ -151,6 +151,7 @@ export class UserStore extends Base {
data: projects,
isLoading: false,
});
+ return projects;
}
@action