refactor: move 'getNextPageToken' to services layer

GaloyMoney · Feb 7, 2024 · ca20f97 · ca20f97
1 parent 99d1594
commit ca20f97
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 32 deletions.
diff --git a/core/api/src/domain/authentication/index.ts b/core/api/src/domain/authentication/index.ts
@@ -35,20 +35,6 @@ export const getSupportedCountries = ({
   return countries
 }
 
-export const getNextPageToken = (link: string): string | undefined => {
-  const links = link.split(",")
-  const nextLink = links.find((link) => link.includes('rel="next"'))
-
-  if (nextLink) {
-    const matches = nextLink.match(/page_token=([^;&>]+)/)
-    if (matches) {
-      return matches[1]
-    }
-  }
-
-  return undefined
-}
-
 export const checkedToEmailCode = (code: string): EmailCode | ApplicationError => {
   if (!/^[0-9]{6}$/.test(code)) return new EmailCodeInvalidError()
   return code as EmailCode

diff --git a/core/api/src/services/kratos/identity.ts b/core/api/src/services/kratos/identity.ts
@@ -7,7 +7,20 @@ import { getKratosPostgres, kratosAdmin, toDomainIdentity } from "./private"
 
 import { IdentifierNotFoundError } from "@/domain/authentication/errors"
 import { ErrorLevel } from "@/domain/shared"
-import { getNextPageToken } from "@/domain/authentication"
+
+export const getNextPageToken = (link: string): string | undefined => {
+  const links = link.split(",")
+  const nextLink = links.find((link) => link.includes('rel="next"'))
+
+  if (nextLink) {
+    const matches = nextLink.match(/page_token=([^;&>]+)/)
+    if (matches) {
+      return matches[1]
+    }
+  }
+
+  return undefined
+}
 
 export const IdentityRepository = (): IIdentityRepository => {
   const getIdentity = async (

diff --git a/core/api/test/unit/domain/authentication/index.spec.ts b/core/api/test/unit/domain/authentication/index.spec.ts
@@ -1,4 +1,4 @@
-import { getNextPageToken, getSupportedCountries } from "@/domain/authentication"
+import { getSupportedCountries } from "@/domain/authentication"
 
 describe("getSupportedCountries", () => {
   it("returns supported countries", () => {
@@ -20,19 +20,3 @@ describe("getSupportedCountries", () => {
     ])
   })
 })
-
-describe("decoding link header", () => {
-  const withNext =
-    '</admin/clients?page_size=5&page_token=euKoY1BqY3J8GVax>; rel="first",</admin/clients?page_size=5&page_token=h9LfEKUiFoLH2R0A>; rel="next"'
-
-  const withoutNext =
-    '</admin/clients?page_size=5&page_token=euKoY1BqY3J8GVax>; rel="first"'
-
-  it("try decoding link successfully", () => {
-    expect(getNextPageToken(withNext)).toBe("h9LfEKUiFoLH2R0A")
-  })
-
-  it("should be undefined when no more next is present", () => {
-    expect(getNextPageToken(withoutNext)).toBe(undefined)
-  })
-})
diff --git a/core/api/test/unit/services/kratos/identity.spec.ts b/core/api/test/unit/services/kratos/identity.spec.ts
@@ -0,0 +1,17 @@
+import { getNextPageToken } from "@/services/kratos"
+
+describe("decoding link header", () => {
+  const withNext =
+    '</admin/clients?page_size=5&page_token=euKoY1BqY3J8GVax>; rel="first",</admin/clients?page_size=5&page_token=h9LfEKUiFoLH2R0A>; rel="next"'
+
+  const withoutNext =
+    '</admin/clients?page_size=5&page_token=euKoY1BqY3J8GVax>; rel="first"'
+
+  it("try decoding link successfully", () => {
+    expect(getNextPageToken(withNext)).toBe("h9LfEKUiFoLH2R0A")
+  })
+
+  it("should be undefined when no more next is present", () => {
+    expect(getNextPageToken(withoutNext)).toBe(undefined)
+  })
+})