Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-03-10 22:22:45 -05:00
Code Issues Activity

fix(console): profile social linking in cloud env should use correct URL without double slashes (#3300)

Browse source
This commit is contained in:
Charles Zhao 2023-03-06 18:32:28 +08:00 • committed by GitHub
parent 5cfbe87a04
commit 11471c4308
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/console/src/pages/Profile/components/LinkAccountSection/index.tsx
View file

@ -49,8 +49,9 @@ const LinkAccountSection = ({ user, onUpdate }: Props) => {
const getSocialAuthorizationUri = useCallback( const getSocialAuthorizationUri = useCallback(
async (connectorId: string) => { async (connectorId: string) => {
const adminTenantEndpointUrl = new URL(adminTenantEndpoint);
const state = buildIdGenerator(8)(); const state = buildIdGenerator(8)();
const redirectUri = `${adminTenantEndpoint}/callback/${connectorId}`; const redirectUri = new URL(`/callback/${connectorId}`, adminTenantEndpointUrl).toString();
const { redirectTo } = await api const { redirectTo } = await api
.post('me/social/authorization-uri', { json: { connectorId, state, redirectUri } }) .post('me/social/authorization-uri', { json: { connectorId, state, redirectUri } })
.json<{ redirectTo: string }>(); .json<{ redirectTo: string }>();
@ -67,6 +68,8 @@ const LinkAccountSection = ({ user, onUpdate }: Props) => {
return []; return [];
} }
const adminTenantEndpointUrl = new URL(adminTenantEndpoint);
return connectors.map(({ id, name, logo, logoDark, target }) => { return connectors.map(({ id, name, logo, logoDark, target }) => {
const logoSrc = theme === AppearanceMode.DarkMode && logoDark ? logoDark : logo; const logoSrc = theme === AppearanceMode.DarkMode && logoDark ? logoDark : logo;
const relatedUserDetails = user.identities[target]?.details; const relatedUserDetails = user.identities[target]?.details;
@ -108,7 +111,7 @@ const LinkAccountSection = ({ user, onUpdate }: Props) => {
const authUri = await getSocialAuthorizationUri(id); const authUri = await getSocialAuthorizationUri(id);
const callback = new URL( const callback = new URL(
`${getBasename()}/handle-social`, `${getBasename()}/handle-social`,
`${adminTenantEndpoint}` adminTenantEndpointUrl
).toString(); ).toString();
const queries = new URLSearchParams({ const queries = new URLSearchParams({
@ -118,7 +121,7 @@ const LinkAccountSection = ({ user, onUpdate }: Props) => {
}); });
const newWindow = popupWindow( const newWindow = popupWindow(
`${adminTenantEndpoint}/springboard?${queries.toString()}`, new URL(`/springboard?${queries.toString()}`, adminTenantEndpointUrl).toString(),
'Link social account with Logto', 'Link social account with Logto',
600, 600,
640 640