admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(sso): adjust callback URL generation for SAML and OIDC (#9460)

Browse Source 
Updated SAML-specific callback URL handling to include the ID, while
OIDC URLs now use the server base URL from config. Also added a debug
log in SSO authentication and cleaned up redirection URL logic in the
frontend.
This commit is contained in:
Antoine Moreaux
2025-01-08 17:03:30 +01:00
committed by GitHub
parent 8475b55172
commit 27b58e9f43
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/twenty-front/src/modules/settings/security/components/SettingsSSOOIDCForm.tsx
View File

@ -7,6 +7,7 @@ import { useTheme } from '@emotion/react';
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import { Controller, useFormContext } from 'react-hook-form'; import { Controller, useFormContext } from 'react-hook-form';
import { Button, H2Title, IconCopy, Section } from 'twenty-ui'; import { Button, H2Title, IconCopy, Section } from 'twenty-ui';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
const StyledInputsContainer = styled.div` const StyledInputsContainer = styled.div`
display: flex; display: flex;
@ -36,7 +37,7 @@ export const SettingsSSOOIDCForm = () => {
const theme = useTheme(); const theme = useTheme();
const authorizedUrl = window.location.origin; const authorizedUrl = window.location.origin;
const redirectionUrl = `${window.location.origin}/auth/oidc/callback`; const redirectionUrl = `${REACT_APP_SERVER_BASE_URL}/auth/oidc/callback`;
return ( return (
<> <>

6
packages/twenty-server/src/engine/core-modules/sso/services/sso.service.ts
View File

@ -159,7 +159,11 @@ export class SSOService {
) { ) {
const callbackURL = new URL(this.environmentService.get('SERVER_URL')); const callbackURL = new URL(this.environmentService.get('SERVER_URL'));
callbackURL.pathname = `/auth/${identityProvider.type.toLowerCase()}/callback/${identityProvider.id}`; callbackURL.pathname = `/auth/${identityProvider.type.toLowerCase()}/callback`;
if (identityProvider.type === IdentityProviderType.SAML) {
callbackURL.pathname += `/${identityProvider.id}`;
}
return callbackURL.toString(); return callbackURL.toString();
} }