From 395cc1035dd0df4109b7227192a32825a7be0203 Mon Sep 17 00:00:00 2001
From: Hendrix Bot <noreply@gitar.co>
Date: Thu, 14 Mar 2024 15:27:18 +0000
Subject: [PATCH] [Remix] Cleaning up stale feature flag:
 useMemoizedActiveTokens with value true

---
 src/lib/services/api-token-service.test.ts    |  1 -
 src/lib/services/api-token-service.ts         | 21 ++++++-------------
 src/lib/types/experimental.ts                 |  5 -----
 .../services/api-token-service.e2e.test.ts    |  2 --
 4 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/src/lib/services/api-token-service.test.ts b/src/lib/services/api-token-service.test.ts
index e579065702..394d294c20 100644
--- a/src/lib/services/api-token-service.test.ts
+++ b/src/lib/services/api-token-service.test.ts
@@ -31,7 +31,6 @@ test('Should init api token', async () => {
         },
         experimental: {
             flags: {
-                useMemoizedActiveTokens: true,
             },
         },
     });
diff --git a/src/lib/services/api-token-service.ts b/src/lib/services/api-token-service.ts
index fe9c09a7fc..ca48364673 100644
--- a/src/lib/services/api-token-service.ts
+++ b/src/lib/services/api-token-service.ts
@@ -35,7 +35,6 @@ import {
     extractUsernameFromUser,
     omitKeys,
 } from '../util';
-import EventService from '../features/events/event-service';
 
 const resolveTokenPermissions = (tokenType: string) => {
     if (tokenType === ApiTokenType.ADMIN) {
@@ -86,10 +85,6 @@ export class ApiTokenService {
         this.environmentStore = environmentStore;
         this.flagResolver = config.flagResolver;
         this.logger = config.getLogger('/services/api-token-service.ts');
-        if (!this.flagResolver.isEnabled('useMemoizedActiveTokens')) {
-            // This is probably not needed because the scheduler will run it
-            this.fetchActiveTokens();
-        }
         this.updateLastSeen();
         if (config.authentication.initApiTokens.length > 0) {
             process.nextTick(async () =>
@@ -128,16 +123,12 @@ export class ApiTokenService {
     }
 
     public async getAllActiveTokens(): Promise<IApiToken[]> {
-        if (this.flagResolver.isEnabled('useMemoizedActiveTokens')) {
-            if (!this.initialized) {
-                // unlikely this will happen but nice to have a fail safe
-                this.logger.info('Fetching active tokens before initialized');
-                await this.fetchActiveTokens();
-            }
-            return this.activeTokens;
-        } else {
-            return this.store.getAllActive();
-        }
+        if (!this.initialized) {
+              // unlikely this will happen but nice to have a fail safe
+              this.logger.info('Fetching active tokens before initialized');
+              await this.fetchActiveTokens();
+          }
+          return this.activeTokens;
     }
 
     private async initApiTokens(tokens: ILegacyApiTokenCreate[]) {
diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts
index 3912973a94..32e8036e81 100644
--- a/src/lib/types/experimental.ts
+++ b/src/lib/types/experimental.ts
@@ -45,7 +45,6 @@ export type IFlagKey =
     | 'showInactiveUsers'
     | 'inMemoryScheduledChangeRequests'
     | 'collectTrafficDataUsage'
-    | 'useMemoizedActiveTokens'
     | 'queryMissingTokens'
     | 'userAccessUIEnabled'
     | 'disableUpdateMaxRevisionId'
@@ -229,10 +228,6 @@ const flags: IFlags = {
         process.env.UNLEASH_EXPERIMENTAL_SHOW_INACTIVE_USERS,
         false,
     ),
-    useMemoizedActiveTokens: parseEnvVarBoolean(
-        process.env.UNLEASH_EXPERIMENTAL_MEMOIZED_ACTIVE_TOKENS,
-        false,
-    ),
     inMemoryScheduledChangeRequests: parseEnvVarBoolean(
         process.env.UNLEASH_EXPERIMENTAL_IN_MEMORY_SCHEDULED_CHANGE_REQUESTS,
         false,
diff --git a/src/test/e2e/services/api-token-service.e2e.test.ts b/src/test/e2e/services/api-token-service.e2e.test.ts
index 54e941ff79..83860e5763 100644
--- a/src/test/e2e/services/api-token-service.e2e.test.ts
+++ b/src/test/e2e/services/api-token-service.e2e.test.ts
@@ -5,7 +5,6 @@ import { createTestConfig } from '../../config/test-config';
 import { ApiTokenType, IApiToken } from '../../../lib/types/models/api-token';
 import { DEFAULT_ENV } from '../../../lib/util/constants';
 import { addDays, subDays } from 'date-fns';
-import ProjectService from '../../../lib/features/project/project-service';
 import { createProjectService } from '../../../lib/features';
 import { EventService } from '../../../lib/services';
 import { IUnleashStores } from '../../../lib/types';
@@ -20,7 +19,6 @@ beforeAll(async () => {
         server: { baseUriPath: '/test' },
         experimental: {
             flags: {
-                useMemoizedActiveTokens: true,
             },
         },
     });