llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-04 05:10:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: integrate Storage config into providers (#198)

Browse Source 
Signed-off-by: Kininaru <shiftregister233@outlook.com>
This commit is contained in:
Kininaru
2021-07-26 11:39:49 +08:00
committed by GitHub
parent 1c01a34814
commit 3d493b8d8f
12 changed files with 224 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
web/src/ProviderEditPage.js
View File

@ -83,6 +83,14 @@ class ProviderEditPage extends React.Component {
{id: 'Default', name: 'Default'},
]
);
} else if (provider.category === "Storage") {
return (
[
{id: 'Default', name: 'Default'},
{id: 'Aliyun', name: 'Aliyun'},
{id: 'AWSS3', name: 'AWS s3'},
]
);
} else {
return (
[
@ -143,6 +151,7 @@ class ProviderEditPage extends React.Component {
{id: 'OAuth', name: 'OAuth'},
{id: 'Email', name: 'Email'},
{id: 'SMS', name: 'SMS'},
{id: 'Storage', name: 'Storage'},
].map((providerCategory, index) => <Option key={index} value={providerCategory.id}>{providerCategory.name}</Option>)
}
</Select>
@ -180,6 +189,52 @@ class ProviderEditPage extends React.Component {
}} />
</Col>
</Row>
{this.state.provider.category === "Storage" ? (
<div>
<Row style={{marginTop: '20px'}} >
<Col style={{marginTop: '5px'}} span={2}>
{Setting.getLabel(i18next.t("provider:Endpoint"), i18next.t("provider:Endpoint - Tooltip"))} :
</Col>
<Col span={22} >
<Input value={this.state.provider.endpoint} onChange={e => {
this.updateProviderField('endpoint', e.target.value);
}} />
</Col>
</Row>
<Row style={{marginTop: '20px'}} >
<Col style={{marginTop: '5px'}} span={2}>
{Setting.getLabel(i18next.t("provider:Bucket"), i18next.t("provider:Bucket - Tooltip"))} :
</Col>
<Col span={22} >
<Input value={this.state.provider.bucket} onChange={e => {
this.updateProviderField('bucket', e.target.value);
}} />
</Col>
</Row>
<Row style={{marginTop: '20px'}} >
<Col style={{marginTop: '5px'}} span={2}>
{Setting.getLabel(i18next.t("provider:Domain"), i18next.t("provider:Domain - Tooltip"))} :
</Col>
<Col span={22} >
<Input value={this.state.provider.domain} onChange={e => {
this.updateProviderField('domain', e.target.value);
}} />
</Col>
</Row>
{this.state.provider.type === "AWSS3" ? (
<Row style={{marginTop: '20px'}} >
<Col style={{marginTop: '5px'}} span={2}>
{Setting.getLabel(i18next.t("provider:Region"), i18next.t("provider:Region - Tooltip"))} :
</Col>
<Col span={22} >
<Input value={this.state.provider.regionId} onChange={e => {
this.updateProviderField('regionId', e.target.value);
}} />
</Col>
</Row>
) : null}
</div>
) : null}
{
this.state.provider.category === "Email" ? (
<React.Fragment>

3
web/src/common/OAuthWidget.js
View File

@ -84,7 +84,8 @@ class OAuthWidget extends React.Component {
getUserProperty(user, providerType, propertyName) {
const key = `oauth_${providerType}_${propertyName}`;
return user.properties[key]
if (user.properties === null) return "";
return user.properties[key];
}
unlinkUser(providerType) {

10
web/src/locales/en/data.json
View File

@ -184,7 +184,15 @@
"Template Code - Tooltip": "Unique string-style identifier",
"Provider URL": "Provider URL",
"Provider URL - Tooltip": "Unique string-style identifier",
"Edit Provider": "Edit Provider"
"Edit Provider": "Edit Provider",
"Endpoint": "Endpoint",
"Endpoint - Tooltip": "Storage bucket endpoint",
"Bucket": "Bucket",
"Bucket - Tooltip": "Storage bucket name",
"Domain": "Domain",
"Domain - Tooltip": "Storage endpoint custom domain",
"Region": "Region",
"Region - Tooltip": "Storage region"
},
"user":
{