Move authentication libs to more descriptive directories (#1596)

MarceloRGonc · web-flow · commit d18592ee0433 · 2025-11-11T15:04:23.000Z
Part of OPS-3003.
diff --git a/packages/server/api/src/app/ai/chat/context-enrichment.service.ts b/packages/server/api/src/app/ai/chat/context-enrichment.service.ts
@@ -10,9 +10,9 @@ import {
   VariableContext,
 } from '@openops/shared';
 import { engineRunner } from 'server-worker';
-import { accessTokenManager } from '../../../app/authentication/lib/access-token-manager';
 import { flowService } from '../../../app/flows/flow/flow.service';
 import { flowStepTestOutputService } from '../../../app/flows/step-test-output/flow-step-test-output.service';
+import { accessTokenManager } from '../../authentication/context/access-token-manager';
 
 type FlowData = {
   flow: PopulatedFlow;
diff --git a/packages/server/api/src/app/app-connection/app-connection-service/validate-auth.ts b/packages/server/api/src/app/app-connection/app-connection-service/validate-auth.ts
@@ -8,7 +8,7 @@ import {
   ProjectId,
 } from '@openops/shared';
 import { engineRunner } from 'server-worker';
-import { accessTokenManager } from '../../authentication/lib/access-token-manager';
+import { accessTokenManager } from '../../authentication/context/access-token-manager';
 import { findBlockByAuthProviderKey } from '../connection-providers-resolver';
 
 export const engineValidateAuth = async (
diff --git a/packages/server/api/src/app/authentication/authentication-service/hooks/community-authentication-hooks.ts b/packages/server/api/src/app/authentication/authentication-service/hooks/community-authentication-hooks.ts
@@ -16,7 +16,7 @@ import { openopsTables } from '../../../openops-tables';
 import { organizationService } from '../../../organization/organization.service';
 import { projectService } from '../../../project/project-service';
 import { userService } from '../../../user/user-service';
-import { accessTokenManager } from '../../lib/access-token-manager';
+import { accessTokenManager } from '../../context/access-token-manager';
 import { AuthenticationServiceHooks } from './authentication-service-hooks';
 
 export const communityAuthenticationServiceHooks: AuthenticationServiceHooks = {
diff --git a/packages/server/api/src/app/authentication/authentication-service/index.ts b/packages/server/api/src/app/authentication/authentication-service/index.ts
@@ -15,7 +15,7 @@ import { QueryFailedError } from 'typeorm';
 import { flagService } from '../../flags/flag.service';
 import { openopsTables } from '../../openops-tables';
 import { userService } from '../../user/user-service';
-import { passwordHasher } from '../lib/password-hasher';
+import { passwordHasher } from '../basic/password-hasher';
 import { authenticationServiceHooks as hooks } from './hooks';
 import { Provider } from './hooks/authentication-service-hooks';
 
diff --git a/packages/server/api/src/app/authentication/basic/password-hasher.ts b/packages/server/api/src/app/authentication/basic/password-hasher.ts
diff --git a/packages/server/api/src/app/authentication/context/access-token-manager.ts b/packages/server/api/src/app/authentication/context/access-token-manager.ts
diff --git a/packages/server/api/src/app/block-variable/block-variable-module.ts b/packages/server/api/src/app/block-variable/block-variable-module.ts
@@ -9,7 +9,7 @@ import {
   PrincipalType,
 } from '@openops/shared';
 import { engineRunner } from 'server-worker';
-import { accessTokenManager } from '../authentication/lib/access-token-manager';
+import { accessTokenManager } from '../authentication/context/access-token-manager';
 import { flowService } from '../flows/flow/flow.service';
 import { flowStepTestOutputService } from '../flows/step-test-output/flow-step-test-output.service';
 
diff --git a/packages/server/api/src/app/blocks/base-block-module.ts b/packages/server/api/src/app/blocks/base-block-module.ts
@@ -23,7 +23,7 @@ import {
   PrincipalType,
 } from '@openops/shared';
 import { engineRunner } from 'server-worker';
-import { accessTokenManager } from '../authentication/lib/access-token-manager';
+import { accessTokenManager } from '../authentication/context/access-token-manager';
 import { flagService } from '../flags/flag.service';
 import { flowService } from '../flows/flow/flow.service';
 import { flowStepTestOutputService } from '../flows/step-test-output/flow-step-test-output.service';
diff --git a/packages/server/api/src/app/core/security/authn/access-token-authn-handler.ts b/packages/server/api/src/app/core/security/authn/access-token-authn-handler.ts
@@ -6,7 +6,7 @@ import {
   PrincipalType,
 } from '@openops/shared';
 import { FastifyRequest } from 'fastify';
-import { accessTokenManager } from '../../../authentication/lib/access-token-manager';
+import { accessTokenManager } from '../../../authentication/context/access-token-manager';
 import { userService } from '../../../user/user-service';
 import { BaseSecurityHandler } from '../security-handler';
 
diff --git a/packages/server/api/src/app/flows/step-run/step-run-service.ts b/packages/server/api/src/app/flows/step-run/step-run-service.ts
@@ -13,7 +13,7 @@ import {
   UserId,
 } from '@openops/shared';
 import { engineRunner } from 'server-worker';
-import { accessTokenManager } from '../../authentication/lib/access-token-manager';
+import { accessTokenManager } from '../../authentication/context/access-token-manager';
 import { sendWorkflowTestBlockEvent } from '../../telemetry/event-models';
 import { flowVersionService } from '../flow-version/flow-version.service';
 import { flowStepTestOutputService } from '../step-test-output/flow-step-test-output.service';
diff --git a/packages/server/api/src/app/flows/trigger-events/trigger-event.service.ts b/packages/server/api/src/app/flows/trigger-events/trigger-event.service.ts
@@ -18,7 +18,7 @@ import {
 import dayjs from 'dayjs';
 import { engineRunner, webhookUtils } from 'server-worker';
 import { LessThan } from 'typeorm';
-import { accessTokenManager } from '../../authentication/lib/access-token-manager';
+import { accessTokenManager } from '../../authentication/context/access-token-manager';
 import { repoFactory } from '../../core/db/repo-factory';
 import { buildPaginator } from '../../helper/pagination/build-paginator';
 import { paginationHelper } from '../../helper/pagination/pagination-utils';
diff --git a/packages/server/api/src/app/flows/trigger/hooks/disable-trigger-hook.ts b/packages/server/api/src/app/flows/trigger/hooks/disable-trigger-hook.ts
@@ -18,7 +18,7 @@ import {
   webhookUtils,
 } from 'server-worker';
 import { appEventRoutingService } from '../../../app-event-routing/app-event-routing.service';
-import { accessTokenManager } from '../../../authentication/lib/access-token-manager';
+import { accessTokenManager } from '../../../authentication/context/access-token-manager';
 import { flowQueue } from '../../../workers/queue';
 import { triggerUtils } from './trigger-utils';
 
diff --git a/packages/server/api/src/app/flows/trigger/hooks/enable-trigger-hook.ts b/packages/server/api/src/app/flows/trigger/hooks/enable-trigger-hook.ts
@@ -28,7 +28,7 @@ import {
   webhookUtils,
 } from 'server-worker';
 import { appEventRoutingService } from '../../../app-event-routing/app-event-routing.service';
-import { accessTokenManager } from '../../../authentication/lib/access-token-manager';
+import { accessTokenManager } from '../../../authentication/context/access-token-manager';
 import { flowQueue } from '../../../workers/queue';
 import { triggerUtils } from './trigger-utils';
 
diff --git a/packages/server/api/src/app/user/user-service.ts b/packages/server/api/src/app/user/user-service.ts
@@ -17,7 +17,7 @@ import {
   UserStatus,
 } from '@openops/shared';
 import dayjs from 'dayjs';
-import { passwordHasher } from '../authentication/lib/password-hasher';
+import { passwordHasher } from '../authentication/basic/password-hasher';
 import { repoFactory } from '../core/db/repo-factory';
 import { sendUserCreatedEvent } from '../telemetry/event-models';
 import { UserEntity } from './user-entity';
diff --git a/packages/server/api/src/app/websockets/websockets.service.ts b/packages/server/api/src/app/websockets/websockets.service.ts
@@ -2,7 +2,7 @@ import { logger } from '@openops/server-shared';
 import { Principal, WebsocketServerEvent } from '@openops/shared';
 import cookie from 'cookie';
 import { Socket } from 'socket.io';
-import { accessTokenManager } from '../authentication/lib/access-token-manager';
+import { accessTokenManager } from '../authentication/context/access-token-manager';
 
 export type WebsocketListener<T> = (
   socket: Socket,
diff --git a/packages/server/api/src/app/worker.ts b/packages/server/api/src/app/worker.ts
@@ -7,7 +7,7 @@ import {
 import { isNil, WorkerMachineType } from '@openops/shared';
 import { FastifyInstance } from 'fastify';
 import { flowWorker } from 'server-worker';
-import { accessTokenManager } from './authentication/lib/access-token-manager';
+import { accessTokenManager } from './authentication/context/access-token-manager';
 
 export const setupWorker = async (app: FastifyInstance): Promise<void> => {
   const workerToken = await generateWorkerToken();
diff --git a/packages/server/api/src/app/workers/machine/machine-controller.ts b/packages/server/api/src/app/workers/machine/machine-controller.ts
@@ -10,7 +10,7 @@ import {
   WorkerMachineType,
   WorkerPrincipal,
 } from '@openops/shared';
-import { accessTokenManager } from '../../authentication/lib/access-token-manager';
+import { accessTokenManager } from '../../authentication/context/access-token-manager';
 import { organizationService } from '../../organization/organization.service';
 import { machineService } from './machine-service';
 
diff --git a/packages/server/api/src/app/workers/worker-controller.ts b/packages/server/api/src/app/workers/worker-controller.ts
@@ -22,7 +22,7 @@ import {
   ProgressUpdateType,
   RunEnvironment,
 } from '@openops/shared';
-import { accessTokenManager } from '../authentication/lib/access-token-manager';
+import { accessTokenManager } from '../authentication/context/access-token-manager';
 import { flowRunService } from '../flows/flow-run/flow-run-service';
 import { flowService } from '../flows/flow/flow.service';
 import { triggerEventService } from '../flows/trigger-events/trigger-event.service';
diff --git a/packages/server/api/test/integration/ce/authentication/password-hasher.test.ts b/packages/server/api/test/integration/ce/authentication/password-hasher.test.ts
@@ -1,5 +1,5 @@
 import bcrypt from 'bcrypt';
-import { passwordHasher } from '../../../../src/app/authentication/lib/password-hasher';
+import { passwordHasher } from '../../../../src/app/authentication/basic/password-hasher';
 
 const SCRYPT_SEPARATOR = '~';
 
diff --git a/packages/server/api/test/integration/ce/authentication/signup.test.ts b/packages/server/api/test/integration/ce/authentication/signup.test.ts
@@ -1,4 +1,4 @@
-import { accessTokenManager } from '../../../../src/app/authentication/lib/access-token-manager';
+import { accessTokenManager } from '../../../../src/app/authentication/context/access-token-manager';
 
 const authUserMock = jest.fn().mockResolvedValue({
   token: 'token',
diff --git a/packages/server/api/test/integration/ce/flows/consumer/flow-consume.test.ts b/packages/server/api/test/integration/ce/flows/consumer/flow-consume.test.ts
@@ -14,7 +14,7 @@ import {
 import { FastifyInstance } from 'fastify';
 import { nanoid } from 'nanoid';
 import { flowJobExecutor } from 'server-worker';
-import { accessTokenManager } from '../../../../../src/app/authentication/lib/access-token-manager';
+import { accessTokenManager } from '../../../../../src/app/authentication/context/access-token-manager';
 import { databaseConnection } from '../../../../../src/app/database/database-connection';
 import { setupServer } from '../../../../../src/app/server';
 import {
diff --git a/packages/server/api/test/integration/cloud/block-variable/block-variable-module.test.ts b/packages/server/api/test/integration/cloud/block-variable/block-variable-module.test.ts
@@ -28,7 +28,7 @@ const accessTokenManagerMock = {
   extractPrincipal: jest.fn(),
 };
 jest.mock(
-  '../../../../src/app/authentication/lib/access-token-manager',
+  '../../../../src/app/authentication/context/access-token-manager',
   () => ({
     accessTokenManager: accessTokenManagerMock,
   }),
diff --git a/packages/server/api/test/unit/ai/context-enrichment.service.test.ts b/packages/server/api/test/unit/ai/context-enrichment.service.test.ts
@@ -12,7 +12,7 @@ import {
   enrichContext,
   IncludeOptions,
 } from '../../../src/app/ai/chat/context-enrichment.service';
-import { accessTokenManager } from '../../../src/app/authentication/lib/access-token-manager';
+import { accessTokenManager } from '../../../src/app/authentication/context/access-token-manager';
 import { flowService } from '../../../src/app/flows/flow/flow.service';
 import { flowStepTestOutputService } from '../../../src/app/flows/step-test-output/flow-step-test-output.service';
 
@@ -25,11 +25,14 @@ jest.mock('@openops/server-shared', () => ({
   }),
 }));
 
-jest.mock('../../../src/app/authentication/lib/access-token-manager', () => ({
-  accessTokenManager: {
-    generateEngineToken: jest.fn(),
-  },
-}));
+jest.mock(
+  '../../../src/app/authentication/context/access-token-manager',
+  () => ({
+    accessTokenManager: {
+      generateEngineToken: jest.fn(),
+    },
+  }),
+);
 
 jest.mock('../../../src/app/flows/flow/flow.service', () => ({
   flowService: {
diff --git a/packages/server/api/test/unit/flow-run-cleaner.test.ts b/packages/server/api/test/unit/flow-run-cleaner.test.ts
@@ -1,6 +1,6 @@
 import { flowTimeoutSandbox, logger, QueueName } from '@openops/server-shared';
 import { FlowRunStatus } from '@openops/shared';
-import { accessTokenManager } from '../../src/app/authentication/lib/access-token-manager';
+import { accessTokenManager } from '../../src/app/authentication/context/access-token-manager';
 import { flowRunService } from '../../src/app/flows/flow-run/flow-run-service';
 import { expiredFlowRunCleaner } from '../../src/app/workers/redis/flow-run-cleaner';
 import { redisQueue } from '../../src/app/workers/redis/redis-queue';
@@ -13,7 +13,7 @@ jest.mock('@openops/server-shared', () => ({
   },
 }));
 
-jest.mock('../../src/app/authentication/lib/access-token-manager', () => ({
+jest.mock('../../src/app/authentication/context/access-token-manager', () => ({
   accessTokenManager: {
     generateWorkerToken: jest.fn(),
   },
diff --git a/packages/server/api/test/unit/trigger-event.service.test.ts b/packages/server/api/test/unit/trigger-event.service.test.ts
@@ -5,7 +5,7 @@ import {
   TriggerType,
 } from '@openops/shared';
 import { engineRunner, webhookUtils } from 'server-worker';
-import { accessTokenManager } from '../../src/app/authentication/lib/access-token-manager';
+import { accessTokenManager } from '../../src/app/authentication/context/access-token-manager';
 import { triggerEventService } from '../../src/app/flows/trigger-events/trigger-event.service';
 
 const mockRepo = {
@@ -24,7 +24,7 @@ jest.mock('server-worker', () => ({
   webhookUtils: { getWebhookUrl: jest.fn() },
 }));
 
-jest.mock('../../src/app/authentication/lib/access-token-manager', () => ({
+jest.mock('../../src/app/authentication/context/access-token-manager', () => ({
   accessTokenManager: { generateEngineToken: jest.fn() },
 }));
 
diff --git a/packages/server/api/test/unit/websockets-service.test.ts b/packages/server/api/test/unit/websockets-service.test.ts
@@ -1,5 +1,5 @@
 const extractPrincipalMock = jest.fn();
-jest.mock('../../src/app/authentication/lib/access-token-manager', () => ({
+jest.mock('../../src/app/authentication/context/access-token-manager', () => ({
   accessTokenManager: {
     extractPrincipal: extractPrincipalMock,
   },
