Skip to content

Commit cb852f1

Browse files
updated generic oauth issuerUri and sourceMappings
1 parent 7ab4ae4 commit cb852f1

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

client/packages/lowcoder/src/pages/setting/idSource/OAuthForms/GenericOAuthForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ function GenericOAuthForm(props: GenericOAuthFormProp) {
115115
authType: AuthType.Generic,
116116
source: '',
117117
sourceName: '',
118-
issuer: res.data.issuer,
118+
issuerUri: res.data.issuer,
119119
authorizationEndpoint: res.data.authorization_endpoint,
120120
tokenEndpoint: res.data.token_endpoint,
121121
userInfoEndpoint: res.data.userinfo_endpoint,

client/packages/lowcoder/src/pages/setting/idSource/detail/index.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useState } from "react";
1+
import React, { useEffect, useState } from "react";
22
import { trans, transToNode } from "i18n";
33
import IdSourceApi, { ConfigItem } from "api/idSourceApi";
44
import { DetailContainer } from "pages/setting/theme/styledComponents";
@@ -48,6 +48,7 @@ type IdSourceDetailProps = {
4848
};
4949

5050
export const IdSourceDetail = (props: IdSourceDetailProps) => {
51+
const configDetail = props.location.state;
5152
const [form] = useForm();
5253
const [lock, setLock] = useState(() => {
5354
const config = props.location.state;
@@ -65,7 +66,14 @@ export const IdSourceDetail = (props: IdSourceDetailProps) => {
6566
return true;
6667
}
6768
});
68-
const configDetail = props.location.state;
69+
70+
useEffect(() => {
71+
if (configDetail.authType === AuthType.Generic) {
72+
sourceMappingKeys.forEach((sourceKey) => {
73+
form.setFieldValue(sourceKey, (configDetail as any).sourceMappings[sourceKey]);
74+
})
75+
}
76+
}, [configDetail]);
6977
const goList = () => {
7078
history.push(OAUTH_PROVIDER_SETTING);
7179
};

client/packages/lowcoder/src/pages/setting/idSource/idSourceConstants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export const authConfig = {
9494
sourceIcon: { label: "Source Icon", isIcon: true, isRequire: true, },
9595
sourceCategory: { label: "Source Category", isRequire: true, isList: true, options: AuthCategories },
9696
...clientIdandSecretConfig,
97-
issuer: { label: 'Issuer URI', isRequire: true },
97+
issuerUri: { label: 'Issuer URI', isRequire: true },
9898
authorizationEndpoint: { label: 'Authorization Endpoint', isRequire: true },
9999
tokenEndpoint: { label: 'Token Endpoint', isRequire: true },
100100
userInfoEndpoint: { label: 'UserInfo Endpoint', isRequire: true },

client/packages/lowcoder/src/pages/setting/idSource/list.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export const IdSourceList = (props: any) => {
7575
let res: ConfigItem[] = resp.data.data.filter((item: ConfigItem) =>
7676
IdSource.includes(item.authType)
7777
);
78-
res = _.uniqBy(res, 'authType');
78+
// res = _.uniqBy(res, 'authType');
7979
setConfigs(res);
8080
}
8181
})

0 commit comments

Comments
 (0)