feat: update Auth.setMarket to accept string values and modify relate…

…d scope formatting
atoms-studio · Nov 6, 2024 · a9a4577 · a9a4577
1 parent e22db36
commit a9a4577
Show file tree

Hide file tree

Showing 19 changed files with 131 additions and 119 deletions.
diff --git a/__tests__/api.spec.ts b/__tests__/api.spec.ts
@@ -237,7 +237,7 @@ describe('api', () => {
         access_token: 'asdasd',
         expires_in: 7200,
       })
-      await setMarket(9528)
+      await setMarket('9528')
 
       const config = await createRequest('/test', 'get')
       expect(config).toHaveProperty('headers', {
@@ -250,7 +250,7 @@ describe('api', () => {
         access_token: 'qwerty',
         refresh_token: 'asdasd',
         expires_in: 7200,
-        scope: 'market:1',
+        scope: 'market:code:1',
         created_at: Date.now() - 60 * 1000,
         owner_id: 'zxcVBnMASd',
         owner_type: 'customer',

diff --git a/__tests__/auth/customer.spec.ts b/__tests__/auth/customer.spec.ts
@@ -57,12 +57,12 @@ describe('auth:customer', () => {
       token_type: 'bearer',
       expires_in: 7200,
       refresh_token: 'your-refresh-token',
-      scope: 'market:1',
+      scope: 'market:code:1',
       created_at: createdAt,
       owner_id: 'zxcVBnMASd',
       owner_type: 'customer',
     })
-    await setMarket(1)
+    await setMarket('1')
 
     const response = await loginAsCustomer('asd', 'asd')
     expect(response).toHaveProperty('id', 'zxcVBnMASd')
@@ -87,13 +87,13 @@ describe('auth:customer', () => {
       token_type: 'bearer',
       expires_in: 7200,
       refresh_token: 'your-refresh-token',
-      scope: 'market:7777',
+      scope: 'market:code:7777',
       created_at: createdAt,
       owner_id: 'zxcVBnMASd',
       owner_type: 'customer',
     })
 
-    await setMarket([7777])
+    await setMarket(['7777'])
 
     await loginAsCustomer('asdasd', 'asdasd')
     expect(currentCustomerData).toEqual({
@@ -116,12 +116,12 @@ describe('auth:customer', () => {
       token_type: 'bearer',
       expires_in: 7200,
       refresh_token: 'your-refresh-token',
-      scope: 'market:7777',
+      scope: 'market:code:7777',
       created_at: createdAt,
       owner_id: 'zxcVBnMASd',
       owner_type: 'customer',
     })
-    setMarket([7777])
+    setMarket(['7777'])
 
     await loginAsCustomer('asdasd', 'asdasd')
     expect(currentCustomerData).toEqual({
@@ -155,13 +155,13 @@ describe('auth:customer', () => {
       token_type: 'bearer',
       expires_in: 7200,
       refresh_token: 'your-refresh-token',
-      scope: 'market:7777',
+      scope: 'market:code:7777',
       created_at: createdAt,
       owner_id: 'zxcVBnMASd',
       owner_type: 'customer',
     })
 
-    await setMarket([7777])
+    await setMarket(['7777'])
 
     await loginAsCustomer('asdasd', 'asdasd')
     expect(isCustomerLoggedIn()).toBe(true)
@@ -185,13 +185,13 @@ describe('auth:customer', () => {
       token_type: 'bearer',
       expires_in: 7200,
       refresh_token: 'your-refresh-token',
-      scope: 'market:7777',
+      scope: 'market:code:7777',
       created_at: createdAt,
       owner_id: 'zxcVBnMASd',
       owner_type: 'customer',
     })
 
-    await setMarket([7777])
+    await setMarket(['7777'])
 
     await loginAsCustomer('asdasd', 'asdasd')
     expect(getCustomerToken()).toEqual({
@@ -223,13 +223,13 @@ describe('auth:customer', () => {
       token_type: 'bearer',
       expires_in: 7200,
       refresh_token: 'your-refresh-token',
-      scope: 'market:7778',
+      scope: 'market:code:7778',
       created_at: createdAt,
       owner_id: 'zxcVBnMASd',
       owner_type: 'customer',
     })
 
-    await setMarket([7778])
+    await setMarket(['7778'])
 
     const badResult = await refreshCustomer()
     expect(badResult).toEqual({
@@ -279,26 +279,26 @@ describe('auth:customer', () => {
       token_type: 'bearer',
       expires_in: 7200,
       refresh_token: 'your-refresh-token',
-      scope: 'market:7778',
+      scope: 'market:code:7778',
       created_at: createdAt,
       owner_id: 'zxcVBnMASd',
       owner_type: 'customer',
     })
 
-    await setMarket([77738])
+    await setMarket(['77738'])
 
     expect(async () => {
       await useCustomerSession(
         'your-access-token',
         'your-refresh-token',
-        'market:123',
+        'market:code:123',
       )
     }).rejects.toThrow('Invalid session data')
 
     const result = await useCustomerSession(
       'your-access-token',
       'your-refresh-token',
-      'market:77738',
+      'market:code:77738',
     )
     expect(result).toEqual({
       id: 'zxcVBnMASd',
@@ -337,12 +337,12 @@ describe('auth:customer', () => {
       token_type: 'bearer',
       expires_in: 7200,
       refresh_token: 'your-refresh-token',
-      scope: 'market:1',
+      scope: 'market:code:1',
       created_at: createdAt,
       owner_id: 'zxcVBnMASd',
       owner_type: 'customer',
     })
-    await setMarket(1)
+    await setMarket('1')
 
     await loginAsCustomer('asd', 'asd')
 

diff --git a/__tests__/auth/guest.spec.ts b/__tests__/auth/guest.spec.ts
@@ -16,7 +16,7 @@ describe('auth:guest', () => {
       access_token: 'your-592-access-token',
       token_type: 'bearer',
       expires_in: 7200,
-      scope: 'market:592',
+      scope: 'market:code:592',
       created_at: Date.now(),
     })
   })
@@ -58,10 +58,10 @@ describe('auth:guest', () => {
       access_token: 'your-access-token',
       token_type: 'bearer',
       expires_in: 7200,
-      scope: 'market:1234',
+      scope: 'market:code:1234',
       created_at: createdAt,
     })
-    await setMarket(1)
+    await setMarket('1')
 
     const response = await loginAsGuest()
     expect(response).toHaveProperty('token', 'your-access-token')
@@ -82,11 +82,11 @@ describe('auth:guest', () => {
       access_token: 'your-7777-access-token',
       token_type: 'bearer',
       expires_in: 7200,
-      scope: 'market:7777',
+      scope: 'market:code:7777',
       created_at: createdAt,
     })
 
-    await setMarket([7777])
+    await setMarket(['7777'])
 
     await loginAsGuest()
     expect(tokenCache.has('7777')).toBe(true)
@@ -103,11 +103,11 @@ describe('auth:guest', () => {
       access_token: 'your-access-token',
       token_type: 'bearer',
       expires_in: 7200,
-      scope: 'market:1234',
+      scope: 'market:code:1234',
       created_at: Date.now(),
     })
 
-    await setMarket([19])
+    await setMarket(['19'])
     await loginAsGuest()
     expect(axios.post).toHaveBeenCalledTimes(1)
 
@@ -125,10 +125,10 @@ describe('auth:guest', () => {
       access_token: 'your-access-token',
       token_type: 'bearer',
       expires_in: 7200,
-      scope: 'market:1234',
+      scope: 'market:code:1234',
       created_at: createdAt,
     })
-    await setMarket(1)
+    await setMarket('1')
 
     const response = await refreshGuest()
     expect(response).toHaveProperty('token', 'your-access-token')

diff --git a/__tests__/auth/integration.spec.ts b/__tests__/auth/integration.spec.ts
@@ -20,7 +20,7 @@ describe('auth:integration', () => {
       access_token: 'your-592-access-token',
       token_type: 'bearer',
       expires_in: 7200,
-      scope: 'market:592',
+      scope: 'market:code:592',
       created_at: Date.now(),
     })
   })
@@ -67,10 +67,10 @@ describe('auth:integration', () => {
       access_token: 'your-access-token',
       token_type: 'bearer',
       expires_in: 7200,
-      scope: 'market:1234',
+      scope: 'market:code:1234',
       created_at: createdAt,
     })
-    await setMarket(1)
+    await setMarket('1')
 
     const response = await loginAsIntegration()
     expect(response).toHaveProperty('token', 'your-access-token')
@@ -114,11 +114,11 @@ describe('auth:integration', () => {
       access_token: 'your-7777-access-token',
       token_type: 'bearer',
       expires_in: 7200,
-      scope: 'market:7777',
+      scope: 'market:code:7777',
       created_at: createdAt,
     })
 
-    await setMarket([7777])
+    await setMarket(['7777'])
 
     await loginAsIntegration()
     const key = `${INTEGRATION_PREFIX}7777`
@@ -137,11 +137,11 @@ describe('auth:integration', () => {
       access_token: 'your-access-token',
       token_type: 'bearer',
       expires_in: 7200,
-      scope: 'market:1234',
+      scope: 'market:code:1234',
       created_at: Date.now(),
     })
 
-    await setMarket([19])
+    await setMarket(['19'])
     await loginAsIntegration()
     expect(axios.post).toHaveBeenCalledTimes(1)
 

diff --git a/__tests__/auth/market.spec.ts b/__tests__/auth/market.spec.ts
@@ -19,7 +19,7 @@ describe('auth:market', () => {
       access_token: 'your-7777-access-token',
       token_type: 'bearer',
       expires_in: 7200,
-      scope: 'market:7777',
+      scope: 'market:code:7777',
       created_at: Date.now(),
     })
   })
@@ -30,40 +30,40 @@ describe('auth:market', () => {
   })
 
   it('sets the current market', async () => {
-    await setMarket(123)
-    expect(getMarket()).toEqual([123])
+    await setMarket('123')
+    expect(getMarket()).toEqual(['123'])
   })
 
   it('handles both single and array inputs', async () => {
-    await setMarket(123)
-    expect(getMarket()).toEqual([123])
+    await setMarket('123')
+    expect(getMarket()).toEqual(['123'])
 
-    await setMarket([123, 456])
-    expect(getMarket()).toEqual([123, 456])
+    await setMarket(['123', '456'])
+    expect(getMarket()).toEqual(['123', '456'])
   })
 
   it('returns the scope based on current market', async () => {
-    await setMarket(777)
-    expect(getScope()).toEqual('market:777')
+    await setMarket('777')
+    expect(getScope()).toEqual('market:code:777')
 
-    await setMarket([987, 333])
-    expect(getScope()).toEqual('market:987 market:333')
+    await setMarket(['987', '333'])
+    expect(getScope()).toEqual('market:code:987 market:code:333')
   })
 
   it('sets current market by value', async () => {
-    const market = [567]
+    const market = ['567']
     await setMarket(market)
-    expect(getMarket()).toEqual([567])
+    expect(getMarket()).toEqual(['567'])
 
-    market.push(432)
-    expect(getMarket()).toEqual([567])
+    market.push('432')
+    expect(getMarket()).toEqual(['567'])
   })
 
   it('logs out current customer when changing market', async () => {
     const originalFn = resetSession
     ;(resetSession as any) = jest.fn()
 
-    await setMarket(918)
+    await setMarket('918')
     expect(resetSession).toHaveBeenCalledTimes(1)
     ;(resetSession as any) = originalFn
   })
@@ -72,7 +72,7 @@ describe('auth:market', () => {
     const originalFn = loginAsGuest
     ;(loginAsGuest as any) = jest.fn()
 
-    await setMarket(918)
+    await setMarket('918')
     expect(loginAsGuest).toHaveBeenCalledTimes(1)
     ;(loginAsGuest as any) = originalFn
   })