The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Deprecate `authContext` in favor of `RawAuthContext` ( currently type proxy ) (#27067)
BOHEUSbde7ed498dc4
diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.tsindex 1752886a4c9..891d327fd71 100644--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts@@ -12,10 +12,8 @@ import {import { type AccessTokenJwtPayload } from 'src/engine/core-modules/auth/types/access-token-jwt-payload.type';import { type ApiKeyTokenJwtPayload } from 'src/engine/core-modules/auth/types/api-key-token-jwt-payload.type';import { ApplicationAccessTokenJwtPayload } from 'src/engine/core-modules/auth/types/application-access-token-jwt-payload.type';-import {- type AuthContext,- type AuthContextUser,-} from 'src/engine/core-modules/auth/types/auth-context.type';+import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';+import { type RawAuthContext } from 'src/engine/core-modules/auth/types/raw-auth-context.type';import { type JwtPayload } from 'src/engine/core-modules/auth/types/jwt-payload.type';import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/jwt-token-type.enum';import { type PlaygroundTokenJwtPayload } from 'src/engine/core-modules/auth/types/playground-token-jwt-payload.type';@@ -68,7 +66,7 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {private async validateApiKey(payload: ApiKeyTokenJwtPayload,- ): Promise<AuthContext> {+ ): Promise<RawAuthContext> {const workspace = await this.coreEntityCacheService.get('workspaceEntity',payload.sub,@@ -108,9 +106,9 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {private async validateAccessToken(payload: AccessTokenJwtPayload | PlaygroundTokenJwtPayload,- ): Promise<AuthContext> {+ ): Promise<RawAuthContext> {let user: AuthContextUser | null = null;- let context: AuthContext = {};+ let context: RawAuthContext = {};const workspace = await this.coreEntityCacheService.get('workspaceEntity',@@ -318,7 +316,7 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {private async validateWorkspaceAgnosticToken(payload: WorkspaceAgnosticTokenJwtPayload,- ): Promise<AuthContext> {+ ): Promise<RawAuthContext> {const user = await this.coreEntityCacheService.get('user', payload.sub);assertIsDefinedOrThrow(@@ -331,7 +329,7 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {private async validateApplicationToken(payload: ApplicationAccessTokenJwtPayload,- ): Promise<AuthContext> {+ ): Promise<RawAuthContext> {const workspace = await this.resolveWorkspaceForApplicationToken(payload);if (!isDefined(workspace)) {@@ -357,7 +355,7 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {);}- const context: AuthContext = { application, workspace };+ const context: RawAuthContext = { application, workspace };if (payload.userId && payload.userWorkspaceId) {const userContext = await this.resolveUserContext({@@ -460,7 +458,7 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {return !payload.type && !('workspaceId' in payload);}- async validate(payload: JwtPayload): Promise<AuthContext> {+ async validate(payload: JwtPayload): Promise<RawAuthContext> {const context = await this.dispatch(payload);return {@@ -471,7 +469,7 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {};}- private async dispatch(payload: JwtPayload): Promise<AuthContext> {+ private async dispatch(payload: JwtPayload): Promise<RawAuthContext> {if (payload.type === JwtTokenTypeEnum.API_KEY ||this.isLegacyApiKeyPayload(payload)diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.tsindex 40370302df0..446ea91ed7d 100644--- a/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.ts@@ -15,7 +15,7 @@ import {} from 'src/engine/core-modules/auth/auth.exception';import { type AuthToken } from 'src/engine/core-modules/auth/dto/auth-token.dto';import { JwtAuthStrategy } from 'src/engine/core-modules/auth/strategies/jwt.auth.strategy';-import { type AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';+import { type RawAuthContext } from 'src/engine/core-modules/auth/types/raw-auth-context.type';import { type AccessTokenJwtPayload } from 'src/engine/core-modules/auth/types/access-token-jwt-payload.type';import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/jwt-token-type.enum';import { type PlaygroundTokenJwtPayload } from 'src/engine/core-modules/auth/types/playground-token-jwt-payload.type';@@ -182,7 +182,7 @@ export class AccessTokenService {return { token, expiresAt };}- async validateToken(token: string): Promise<AuthContext> {+ async validateToken(token: string): Promise<RawAuthContext> {await this.jwtWrapperService.verifyJwtToken(token);const decoded = this.jwtWrapperService.decode<AccessTokenJwtPayload>(token);@@ -192,7 +192,7 @@ export class AccessTokenService {return context;}- async validateTokenByRequest(request: Request): Promise<AuthContext> {+ async validateTokenByRequest(request: Request): Promise<RawAuthContext> {const token = this.jwtWrapperService.extractJwtFromRequest()(request);if (token) {@@ -222,7 +222,7 @@ export class AccessTokenService {private async validateSessionToken(sessionToken: string,- ): Promise<AuthContext> {+ ): Promise<RawAuthContext> {const { payload, authenticatedAt } =await this.userSessionService.resolveSession(sessionToken);diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/workspace-agnostic-token.service.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/workspace-agnostic-token.service.tsindex 39797d3f0b7..481ba9635cf 100644--- a/packages/twenty-server/src/engine/core-modules/auth/token/services/workspace-agnostic-token.service.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/workspace-agnostic-token.service.ts@@ -11,7 +11,7 @@ import {AuthExceptionCode,} from 'src/engine/core-modules/auth/auth.exception';import { type AuthToken } from 'src/engine/core-modules/auth/dto/auth-token.dto';-import { type AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';+import { type RawAuthContext } from 'src/engine/core-modules/auth/types/raw-auth-context.type';import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/jwt-token-type.enum';import { type WorkspaceAgnosticTokenJwtPayload } from 'src/engine/core-modules/auth/types/workspace-agnostic-token-jwt-payload.type';import { JwtWrapperService } from 'src/engine/core-modules/jwt/services/jwt-wrapper.service';@@ -65,7 +65,7 @@ export class WorkspaceAgnosticTokenService {};}- async validateToken(token: string): Promise<AuthContext> {+ async validateToken(token: string): Promise<RawAuthContext> {try {await this.jwtWrapperService.verifyJwtToken(token);diff --git a/packages/twenty-server/src/engine/core-modules/auth/types/auth-context.type.ts b/packages/twenty-server/src/engine/core-modules/auth/types/auth-context.type.tsindex 02e956d78d6..556be637320 100644--- a/packages/twenty-server/src/engine/core-modules/auth/types/auth-context.type.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/types/auth-context.type.ts@@ -1,7 +1,2 @@-import { type RawAuthContext } from 'src/engine/core-modules/auth/types/raw-auth-context.type';-export { AUTH_CONTEXT_USER_SELECT_FIELDS } from 'src/engine/core-modules/auth/constants/auth-context-user-select-fields.constants';export { type FlatAuthContextUser as AuthContextUser } from 'src/engine/core-modules/auth/types/flat-auth-context-user.type';--// @deprecated Use WorkspaceAuthContext instead-export type AuthContext = RawAuthContext;diff --git a/packages/twenty-server/src/engine/core-modules/impersonation/impersonation.resolver.ts b/packages/twenty-server/src/engine/core-modules/impersonation/impersonation.resolver.tsindex 96221989fab..dfeb3212cb2 100644--- a/packages/twenty-server/src/engine/core-modules/impersonation/impersonation.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/impersonation/impersonation.resolver.ts@@ -11,7 +11,7 @@ import {AuthExceptionCode,} from 'src/engine/core-modules/auth/auth.exception';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';-import { type AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';+import { type RawAuthContext } from 'src/engine/core-modules/auth/types/raw-auth-context.type';import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';import { ImpersonationService } from 'src/engine/core-modules/impersonation/services/impersonation.service';@@ -89,7 +89,7 @@ export class ImpersonationResolver {@AllowSuspendedWorkspace()async stopImpersonation(@AuthImpersonationContext()- impersonationContext: AuthContext['impersonationContext'],+ impersonationContext: RawAuthContext['impersonationContext'],@AuthWorkspace() workspace: WorkspaceEntity,@Context() context: { req: Request },): Promise<StopImpersonationDTO> {diff --git a/packages/twenty-server/src/engine/core-modules/impersonation/services/impersonation.service.ts b/packages/twenty-server/src/engine/core-modules/impersonation/services/impersonation.service.tsindex a98414e196a..fae73467690 100644--- a/packages/twenty-server/src/engine/core-modules/impersonation/services/impersonation.service.ts+++ b/packages/twenty-server/src/engine/core-modules/impersonation/services/impersonation.service.ts@@ -10,7 +10,7 @@ import {AuthExceptionCode,} from 'src/engine/core-modules/auth/auth.exception';import { LoginTokenService } from 'src/engine/core-modules/auth/token/services/login-token.service';-import { type AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';+import { type RawAuthContext } from 'src/engine/core-modules/auth/types/raw-auth-context.type';import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/jwt-token-type.enum';import { WorkspaceDomainsService } from 'src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service';import { EventLogEmitterService } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.service';@@ -103,7 +103,7 @@ export class ImpersonationService {workspaceId,request,}: {- impersonationContext: AuthContext['impersonationContext'];+ impersonationContext: RawAuthContext['impersonationContext'];workspaceId: string;request: Request;}): Promise<{ canRestoreImpersonatorSession: boolean }> {diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/route/route-trigger.service.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/route/route-trigger.service.tsindex e46c1f66744..902ab199299 100644--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/route/route-trigger.service.ts+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/route/route-trigger.service.ts@@ -12,7 +12,7 @@ import { WorkspaceActivationStatus } from 'twenty-shared/workspace';import { AuthException } from 'src/engine/core-modules/auth/auth.exception';import { isUsageRefusedError } from 'src/engine/core-modules/billing/utils/is-usage-refused-error.util';import { AccessTokenService } from 'src/engine/core-modules/auth/token/services/access-token.service';-import { type AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';+import { type RawAuthContext } from 'src/engine/core-modules/auth/types/raw-auth-context.type';import { WorkspaceDomainsService } from 'src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service';import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';@@ -45,7 +45,7 @@ type RouteTriggerRequestContext = {workspace: RouteTriggerWorkspace;applicationId: string | null;isIsolatedOrigin: boolean;- authenticationContext: AuthContext | undefined;+ authenticationContext: RawAuthContext | undefined;};@Injectable()@@ -67,7 +67,7 @@ export class RouteTriggerService {}: {request: Request;workspaceFromHost: RouteTriggerWorkspace | undefined;- }): Promise<AuthContext | undefined> {+ }): Promise<RawAuthContext | undefined> {if (isDefined(workspaceFromHost) ||!isNonEmptyString(request.headers.authorization)diff --git a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts b/packages/twenty-server/src/engine/core-modules/user/user.resolver.tsindex 9a8b010a74e..62a3789e331 100644--- a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts@@ -20,10 +20,8 @@ import {AuthExceptionCode,} from 'src/engine/core-modules/auth/auth.exception';import { AvailableWorkspaces } from 'src/engine/core-modules/auth/dto/available-workspaces.dto';-import {- type AuthContext,- type AuthContextUser,-} from 'src/engine/core-modules/auth/types/auth-context.type';+import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';+import { type RawAuthContext } from 'src/engine/core-modules/auth/types/raw-auth-context.type';import { OnboardingStatus } from 'src/engine/core-modules/onboarding/enums/onboarding-status.enum';import {OnboardingService,@@ -147,7 +145,7 @@ export class UserResolver {@AuthUser() { id: userId }: AuthContextUser,@AuthWorkspace({ allowUndefined: true }) workspace: WorkspaceEntity,@AuthImpersonationContext()- impersonationContext: AuthContext['impersonationContext'],+ impersonationContext: RawAuthContext['impersonationContext'],@AuthIsUserSession() isUserSession: boolean,): Promise<UserEntity> {const user = await this.userRepository.findOne({