feat(*): add subdomain management for multiworkpsace #8680
Merged
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
Reorganized the sign-in-up code for better readability and maintainability. Introduced validation for workspace invitations and moved some utility functions to dedicated methods. Added a migration for new auth provider columns in the workspace entity.
Removed unused `EnvironmentService` and redundant `code` property in exceptions for clarity. Simplified email validation in `workspace-invitation.service.ts`. Refactored tests to remove unnecessary `targetWorkspaceSubdomain` property.
Removed redundant services from auth and core modules to streamline the code. Added debug log statements in sign-in-up service and skipped certain test cases temporarily for evaluation.
Enhanced Logo component to accept dynamic size and an optional twenty logo display. This allows for more flexible and customizable logo dimensions, and the inclusion of Twenty's logo can now be controlled via props.
Changed StyledMainLogo type to use Pick for logo prop. This ensures only the required 'logo' property is passed, improving type safety and code clarity.
Consolidated the size prop inside the StyledMainLogo component call. This removes redundancy and aligns with component usage patterns in the codebase.
Eliminate debug logging for workspace invite tokens and validation. This cleanup improves readability and reduces console clutter during runtime.
…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.
Updated the Logo component to accept primary and secondary logos, replacing the workspaceLogo prop. Adjusted the getImageAbsoluteURI utility function for type safety and URL handling.
Use the new `Spacing` type to ensure consistent spacing units across the theme and Logo components. This change streamlines unit handling and improves type safety throughout the codebase.
…ninup # Conflicts: # packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts
…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.
…facto/improve-signinup # Conflicts: # packages/twenty-server/src/engine/core-modules/auth/dto/available-workspaces.output.ts # packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts # packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts # packages/twenty-server/src/engine/core-modules/user/services/user.service.ts # packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
Removed the redundant `code` property from WorkspaceInvitationException. Adjusted the import order in WorkspaceResolver to comply with coding standards.
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.
…facto/improve-signinup
Replace user object with user ID in saveDefaultWorkspace method call to fix incorrect parameter type. This ensures that the function operates as expected and prevents potential errors in default workspace assignment.
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.
Deleted outdated user and workspace validation logic, and removed legacy verify-auth controller. Updated Microsoft and Google auth controllers to handle errors correctly and redirect. Added subdomain handling in various components to support multi-workspace setup.
...ront/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdownButton.tsx
Show resolved
Hide resolved
| const currentWorkspace = useRecoilValue(currentWorkspaceState); | ||
| const isMultiWorkspaceEnabled = useRecoilValue(isMultiWorkspaceEnabledState); | ||
| const { enqueueSnackBar } = useSnackBar(); | ||
| const { redirectToHome, redirectToWorkspace } = useUrlManager(); | ||
|
|
||
| const switchWorkspace = async (workspaceId: string) => { |
packages/twenty-front/src/modules/workspace/components/WorkspaceProviderEffect.tsx
Show resolved
Hide resolved
| isDefined(workspacePublicData?.subdomain) && | ||
| workspacePublicData.subdomain !== getWorkspaceSubdomain | ||
| ) { | ||
| redirectToWorkspace(workspacePublicData.subdomain); |
There was a problem hiding this comment.
double check, I think it's should not happen
.../twenty-server/src/database/commands/upgrade-version/0-33/0-33-generate-subdomain.command.ts
Outdated
Show resolved
Hide resolved
packages/twenty-front/src/modules/workspace/components/WorkspaceProviderEffect.tsx
Show resolved
Hide resolved
.../twenty-server/src/database/commands/upgrade-version/0-34/0-34-generate-subdomain.command.ts
Outdated
Show resolved
Hide resolved
packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
Outdated
Show resolved
Hide resolved
packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts
Outdated
Show resolved
Hide resolved
packages/twenty-server/src/engine/core-modules/auth/controllers/google-apis-auth.controller.ts
Outdated
Show resolved
Hide resolved
packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts
Show resolved
Hide resolved
packages/twenty-server/src/engine/core-modules/auth/token/token.module.ts
Outdated
Show resolved
Hide resolved
packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts
Show resolved
Hide resolved
| @@ -133,7 +137,24 @@ export class WorkspaceInvitationService { | |||
| ); | |||
| } | |||
|
|
|||
| // QUERY METHODS | |||
| async findInvitationByWorkspaceSubdomainAndUserEmail({ | |||
| subdomain, | |||
There was a problem hiding this comment.
Overall, I feel that subdomain / domain logic should stay in DomainManager module and that we should keep passing workspaceId in the rest of the code
...es/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.module.ts
Outdated
Show resolved
Hide resolved
| private readonly urlManagerService: UrlManagerService, | ||
| ) {} | ||
|
|
||
| async getAuthProvidersByWorkspaceId(workspaceId: string) { |
There was a problem hiding this comment.
I would create a module in auth/workspace-auth-provider.module.ts that would only have this
There was a problem hiding this comment.
I move it into an utils instead of a module. Is it ok?
packages/twenty-server/src/engine/core-modules/workspace/services/workspace-getters.service.ts
Outdated
Show resolved
Hide resolved
packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
Outdated
Show resolved
Hide resolved
packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts
Outdated
Show resolved
Hide resolved
packages/twenty-website/src/content/developers/self-hosting/self-hosting-var.mdx
Outdated
Show resolved
Hide resolved
Refactored the getDomainNameByEmail function into its own file for better separation of concerns and reusability. The addition of unit tests ensures that the function behaves correctly, improving code reliability. Also corrected a typo in the self-hosting documentation.
… manager usage Remove the unused WorkspaceGettersService to simplify workspace handling. Replace UrlManagerService with DomainManagerService across multiple modules for improved domain management. Ensure proper retrieval of auth providers by workspace encapsulated in a new utility function for better maintainability and clarity.
charlesBochet
merged commit 844d218
into
feat/add-is-multi-workspace-flag
6 of 11 checks passed
charlesBochet
deleted the
feat/add-subdomain-management-for-multiworpsace
branch
|
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.