From c593990b227d7bfec3ffe7762164973d8a53f193 Mon Sep 17 00:00:00 2001
From: Iain Sproat <68657+iainsproat@users.noreply.github.com>
Date: Tue, 25 Feb 2025 09:27:24 +0000
Subject: [PATCH] Move ratelimiter from services to utils

---
 packages/server/modules/auth/index.ts                           | 2 +-
 packages/server/modules/auth/strategies/local.ts                | 2 +-
 packages/server/modules/auth/tests/auth.spec.js                 | 2 +-
 packages/server/modules/core/errors/ratelimit.ts                | 2 +-
 packages/server/modules/core/graph/resolvers/commits.ts         | 2 +-
 packages/server/modules/core/graph/resolvers/projects.ts        | 2 +-
 packages/server/modules/core/graph/resolvers/streams.ts         | 2 +-
 packages/server/modules/core/graph/resolvers/versions.ts        | 2 +-
 packages/server/modules/core/rest/ratelimiter.ts                | 2 +-
 packages/server/modules/core/tests/ratelimiter.spec.ts          | 2 +-
 packages/server/modules/core/{services => utils}/ratelimiter.ts | 0
 packages/server/modules/gendo/graph/resolvers/index.ts          | 2 +-
 .../server/modules/workspaces/graph/resolvers/workspaces.ts     | 2 +-
 13 files changed, 12 insertions(+), 12 deletions(-)
 rename packages/server/modules/core/{services => utils}/ratelimiter.ts (100%)

diff --git a/packages/server/modules/auth/index.ts b/packages/server/modules/auth/index.ts
index 9ed05608d..13920b6d6 100644
--- a/packages/server/modules/auth/index.ts
+++ b/packages/server/modules/auth/index.ts
@@ -30,7 +30,7 @@ import azureAdStrategyBuilderFactory from '@/modules/auth/strategies/azureAd'
 import googleStrategyBuilderFactory from '@/modules/auth/strategies/google'
 import localStrategyBuilderFactory from '@/modules/auth/strategies/local'
 import oidcStrategyBuilderFactory from '@/modules/auth/strategies/oidc'
-import { getRateLimitResult } from '@/modules/core/services/ratelimiter'
+import { getRateLimitResult } from '@/modules/core/utils/ratelimiter'
 import { passportAuthenticateHandlerBuilderFactory } from '@/modules/auth/services/passportService'
 import {
   countAdminUsersFactory,
diff --git a/packages/server/modules/auth/strategies/local.ts b/packages/server/modules/auth/strategies/local.ts
index f20daa91f..805f639e4 100644
--- a/packages/server/modules/auth/strategies/local.ts
+++ b/packages/server/modules/auth/strategies/local.ts
@@ -1,7 +1,7 @@
 import {
   getRateLimitResult,
   throwIfRateLimited
-} from '@/modules/core/services/ratelimiter'
+} from '@/modules/core/utils/ratelimiter'
 import { getIpFromRequest } from '@/modules/shared/utils/ip'
 import { UserInputError } from '@/modules/core/errors/userinput'
 
diff --git a/packages/server/modules/auth/tests/auth.spec.js b/packages/server/modules/auth/tests/auth.spec.js
index de7d69bc0..2d32514a5 100644
--- a/packages/server/modules/auth/tests/auth.spec.js
+++ b/packages/server/modules/auth/tests/auth.spec.js
@@ -3,7 +3,7 @@ const chai = require('chai')
 const request = require('supertest')
 
 const { TIME } = require('@speckle/shared')
-const { RATE_LIMITERS, createConsumer } = require('@/modules/core/services/ratelimiter')
+const { RATE_LIMITERS, createConsumer } = require('@/modules/core/utils/ratelimiter')
 const { beforeEachContext, initializeTestServer } = require('@/test/hooks')
 const { createStreamInviteDirectly } = require('@/test/speckle-helpers/inviteHelper')
 const { RateLimiterMemory } = require('rate-limiter-flexible')
diff --git a/packages/server/modules/core/errors/ratelimit.ts b/packages/server/modules/core/errors/ratelimit.ts
index c177576b8..9fbbc8010 100644
--- a/packages/server/modules/core/errors/ratelimit.ts
+++ b/packages/server/modules/core/errors/ratelimit.ts
@@ -1,4 +1,4 @@
-import { RateLimitBreached } from '@/modules/core/services/ratelimiter'
+import { RateLimitBreached } from '@/modules/core/utils/ratelimiter'
 import { BaseError } from '@/modules/shared/errors'
 import { Options } from 'verror'
 
diff --git a/packages/server/modules/core/graph/resolvers/commits.ts b/packages/server/modules/core/graph/resolvers/commits.ts
index 9fd7988ba..b261b63d5 100644
--- a/packages/server/modules/core/graph/resolvers/commits.ts
+++ b/packages/server/modules/core/graph/resolvers/commits.ts
@@ -17,7 +17,7 @@ import {
   createCommitByBranchNameFactory,
   updateCommitAndNotifyFactory
 } from '@/modules/core/services/commit/management'
-import { throwIfRateLimited } from '@/modules/core/services/ratelimiter'
+import { throwIfRateLimited } from '@/modules/core/utils/ratelimiter'
 import {
   batchDeleteCommitsFactory,
   batchMoveCommitsFactory
diff --git a/packages/server/modules/core/graph/resolvers/projects.ts b/packages/server/modules/core/graph/resolvers/projects.ts
index 54fbdea14..8233f07f6 100644
--- a/packages/server/modules/core/graph/resolvers/projects.ts
+++ b/packages/server/modules/core/graph/resolvers/projects.ts
@@ -46,7 +46,7 @@ import {
 } from '@/modules/core/repositories/streams'
 import { getUserFactory, getUsersFactory } from '@/modules/core/repositories/users'
 import { createNewProjectFactory } from '@/modules/core/services/projects'
-import { throwIfRateLimited } from '@/modules/core/services/ratelimiter'
+import { throwIfRateLimited } from '@/modules/core/utils/ratelimiter'
 import {
   addOrUpdateStreamCollaboratorFactory,
   isStreamCollaboratorFactory,
diff --git a/packages/server/modules/core/graph/resolvers/streams.ts b/packages/server/modules/core/graph/resolvers/streams.ts
index 24c1a3936..8cdf04168 100644
--- a/packages/server/modules/core/graph/resolvers/streams.ts
+++ b/packages/server/modules/core/graph/resolvers/streams.ts
@@ -3,7 +3,7 @@ import {
   StreamSubscriptions
 } from '@/modules/shared/utils/subscriptions'
 import { authorizeResolver, validateScopes } from '@/modules/shared'
-import { throwIfRateLimited } from '@/modules/core/services/ratelimiter'
+import { throwIfRateLimited } from '@/modules/core/utils/ratelimiter'
 import {
   getPendingProjectCollaboratorsFactory,
   inviteUsersToProjectFactory
diff --git a/packages/server/modules/core/graph/resolvers/versions.ts b/packages/server/modules/core/graph/resolvers/versions.ts
index 6f89ead35..455c114db 100644
--- a/packages/server/modules/core/graph/resolvers/versions.ts
+++ b/packages/server/modules/core/graph/resolvers/versions.ts
@@ -19,7 +19,7 @@ import {
   markCommitReceivedAndNotifyFactory,
   updateCommitAndNotifyFactory
 } from '@/modules/core/services/commit/management'
-import { throwIfRateLimited } from '@/modules/core/services/ratelimiter'
+import { throwIfRateLimited } from '@/modules/core/utils/ratelimiter'
 import {
   createCommitFactory,
   deleteCommitsFactory,
diff --git a/packages/server/modules/core/rest/ratelimiter.ts b/packages/server/modules/core/rest/ratelimiter.ts
index 07e4dc2cb..6d8133f46 100644
--- a/packages/server/modules/core/rest/ratelimiter.ts
+++ b/packages/server/modules/core/rest/ratelimiter.ts
@@ -4,7 +4,7 @@ import {
   throwIfRateLimited,
   type RateLimitBreached,
   type RateLimiterMapping
-} from '@/modules/core/services/ratelimiter'
+} from '@/modules/core/utils/ratelimiter'
 import { isRateLimiterEnabled } from '@/modules/shared/helpers/envHelper'
 import { getRequestPath } from '@/modules/core/helpers/server'
 import { getTokenFromRequest } from '@/modules/shared/middleware'
diff --git a/packages/server/modules/core/tests/ratelimiter.spec.ts b/packages/server/modules/core/tests/ratelimiter.spec.ts
index e0a357244..e7f418a53 100644
--- a/packages/server/modules/core/tests/ratelimiter.spec.ts
+++ b/packages/server/modules/core/tests/ratelimiter.spec.ts
@@ -11,7 +11,7 @@ import {
   allActions,
   RateLimitAction,
   throwIfRateLimited
-} from '@/modules/core/services/ratelimiter'
+} from '@/modules/core/utils/ratelimiter'
 import { expect } from 'chai'
 import httpMocks from 'node-mocks-http'
 import { RateLimiterMemory } from 'rate-limiter-flexible'
diff --git a/packages/server/modules/core/services/ratelimiter.ts b/packages/server/modules/core/utils/ratelimiter.ts
similarity index 100%
rename from packages/server/modules/core/services/ratelimiter.ts
rename to packages/server/modules/core/utils/ratelimiter.ts
diff --git a/packages/server/modules/gendo/graph/resolvers/index.ts b/packages/server/modules/gendo/graph/resolvers/index.ts
index 264d9f4bb..77836b9f7 100644
--- a/packages/server/modules/gendo/graph/resolvers/index.ts
+++ b/packages/server/modules/gendo/graph/resolvers/index.ts
@@ -7,7 +7,7 @@ import {
   filteredSubscribe,
   publish
 } from '@/modules/shared/utils/subscriptions'
-import { throwIfRateLimited } from '@/modules/core/services/ratelimiter'
+import { throwIfRateLimited } from '@/modules/core/utils/ratelimiter'
 import { uploadFileStreamFactory } from '@/modules/blobstorage/services/management'
 import {
   updateBlobFactory,
diff --git a/packages/server/modules/workspaces/graph/resolvers/workspaces.ts b/packages/server/modules/workspaces/graph/resolvers/workspaces.ts
index e147bc6e9..4451b0102 100644
--- a/packages/server/modules/workspaces/graph/resolvers/workspaces.ts
+++ b/packages/server/modules/workspaces/graph/resolvers/workspaces.ts
@@ -154,7 +154,7 @@ import { getUserFactory, getUsersFactory } from '@/modules/core/repositories/use
 import { getServerInfoFactory } from '@/modules/core/repositories/server'
 import { commandFactory } from '@/modules/shared/command'
 import { withTransaction } from '@/modules/shared/helpers/dbHelper'
-import { throwIfRateLimited } from '@/modules/core/services/ratelimiter'
+import { throwIfRateLimited } from '@/modules/core/utils/ratelimiter'
 import { getRegionDb } from '@/modules/multiregion/utils/dbSelector'
 import {
   listUserExpiredSsoSessionsFactory,