feat(auth): refactor auth + allow to configure auth methods by workspace #8654
+2,862
−1,397
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…t-auth-methods-by-workspace # Conflicts: # packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpForm.tsx # packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUpForm.ts
Remove unused imports from SignInUpGlobalScopeForm.tsx to improve code readability and reduce clutter. This change simplifies the module by eliminating unnecessary dependencies.
Suppress eslint warnings for console.error in error handling. This ensures cleaner code and maintains log output for better debugging.
Correct the expected state in useAuth test to reflect the accurate status of authProviders. This includes setting 'google' and 'password' to true, and initializing 'sso' as an empty array.
There was a problem hiding this comment.
PR Summary
This PR implements workspace-specific authentication configuration, replacing the global auth settings with per-workspace controls for Google, Microsoft, Password, and SSO authentication methods.
- Added
isGoogleAuthEnabled,isMicrosoftAuthEnabled,isPasswordAuthEnabledfields to/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.tsfor per-workspace auth control - Replaced global
IS_SIGN_UP_DISABLEDwithIS_MULTIWORKSPACE_ENABLEDin server environment variables to support subdomain-based workspace access - Added new
WorkspaceProviderEffectcomponent in/packages/twenty-front/src/modules/workspace/components/WorkspaceProviderEffect.tsxto manage workspace-specific auth state - Added
getPublicWorkspaceDataBySubdomainquery in workspace resolver to fetch workspace-specific auth configuration - Implemented SSO identity provider management with new types and mutations in
/packages/twenty-server/src/engine/core-modules/sso/for OIDC and SAML support
88 file(s) reviewed, 66 comment(s)
Edit PR Review Bot Settings | Greptile
packages/twenty-front/src/modules/app/components/AppRouterProviders.tsx
Outdated
Show resolved
Hide resolved
packages/twenty-front/src/modules/auth/graphql/queries/getPublicWorkspaceDataBySubdomain.ts
Show resolved
Hide resolved
packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpEmailField.tsx
Show resolved
Hide resolved
packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx
Outdated
Show resolved
Hide resolved
packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx
Show resolved
Hide resolved
packages/twenty-server/src/engine/core-modules/workspace/workspace.exception.ts
Outdated
Show resolved
Hide resolved
packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts
Outdated
Show resolved
Hide resolved
…lect-auth-methods-by-workspace
…lect-auth-methods-by-workspace # Conflicts: # packages/twenty-front/src/generated/graphql.tsx
Updated SSO identity provider type and added types for workspace queries. Removed deprecated mutations and queries related to SSO identity providers and JWT generation. Added new fields and types to support improved workspace querying and switching capabilities.
Move import of workspaceValidator to maintain consistent import structure. This enhances readability and aligns with the project's import organization standards.
Removed unused imports from SignInUpGlobalScopeForm and SettingsSecurityOptionsList components. This cleanup improves code readability and reduces potential maintenance overhead.
Added `GET_PUBLIC_WORKSPACE_DATA_BY_SUBDOMAIN` query mock handler to return mock workspace data. Also updated the button text check in SignInUp stories for consistency.
…main Introduced a GraphQL query mock for the GET_PUBLIC_WORKSPACE_DATA_BY_SUBDOMAIN query in the testing setup. This includes relevant mock data and necessary imports for thorough test coverage. Additionally, fixed a typo in the mock configuration from isMultiworkspaceEnabled to isMultiWorkspaceEnabled and updated enums for status and type in SSOIdentityProvider.
The Pull Request introduces new authentication provider columns to the Workspace entity and updates various services and modules to accommodate these changes. It also includes the creation of a new WorkspaceException class. - Adds new columns to the Workspace entity for managing authentication providers. - Modifies several services (AuthService, WorkspaceService, SignInUpService, etc.) to utilize the new columns. - Introduces WorkspaceException for better error handling in workspace-related operations. - Updates tests and modules to accommodate the new columns and exception. - Includes code format and refactoring for improved readability and maintainability.
| }, [authProviders, continueWithEmail, signInUpStep]); | ||
|
|
||
| useEffect(() => { | ||
| checkAuthProviders(); |
There was a problem hiding this comment.
we don't put useEffects in components, we can merge with that and discuss together how to fix it
packages/twenty-front/src/modules/settings/security/components/SettingsSecurityOptionsList.tsx
Show resolved
Hide resolved
|
|
||
| useEffect(() => { | ||
| try { | ||
| if (isDefined(workspacePublicData?.logo)) { |
There was a problem hiding this comment.
weird to do that in a useEffect and manipulating the DOM, can't we edit the head direclty?
| import { User } from 'src/engine/core-modules/user/user.entity'; | ||
| import { CustomException } from 'src/utils/custom-exception'; | ||
|
|
||
| const assertIsExist = ( |
There was a problem hiding this comment.
it means if it does not exist it throws.
There was a problem hiding this comment.
isExist = return false
assertIsExist = throw
...r/src/engine/core-modules/workspace-invitation/utils/cast-appToken-to-workspaceInvitation.ts
Show resolved
Hide resolved
charlesBochet
approved these changes
Nov 26, 2024
|
Thanks @AMoreaux for your contribution! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.