Merge pull request #54 from binarapps/fix/mocked-data-on-mobile

Fix mocked data on mobile

Author: MateuszRostkowski

App.tsx

@@ -11,7 +11,6 @@ import { enableAndroidBackgroundNotificationListener, startMockedServer } from '
 import * as Device from 'expo-device'
 import 'expo-router/entry'
 
-// FIXME: moking not working on mobile app - follow this discussion https://github.com/mswjs/msw/issues/2026
 const ENABLE_MOCKED_SERVER = false
 
 if (ENABLE_MOCKED_SERVER) {

App.web.tsx

@@ -10,7 +10,6 @@ import '@baca/i18n'
 import { startMockedServer } from '@baca/services'
 import 'expo-router/entry'
 
-// FIXME: moking not working on mobile app - follow this discussion https://github.com/mswjs/msw/issues/2026
 const ENABLE_MOCKED_SERVER = false
 
 if (ENABLE_MOCKED_SERVER) {

orval.config.ts

@@ -8,7 +8,11 @@ export default defineConfig({
       target: 'src/api/query/model.ts',
       schemas: 'src/api/types',
       client: 'react-query',
-      mock: true,
+      // solution for not working mocked data on mobile - it removes automatically added "*" to address url at the beginning
+      mock: {
+        baseUrl: '',
+        type: 'msw',
+      },
       clean: true,
       prettier: true,
       override: {

src/api/query/articles/articles.msw.ts

@@ -149,7 +149,7 @@ export const getArticlesControllerUpdateResponseMock = (
 })
 
 export const getArticlesControllerCreateMockHandler = (overrideResponse?: ArticleEntity) => {
-  return http.post('*/api/v1/articles', async () => {
+  return http.post('/api/v1/articles', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(
@@ -166,7 +166,7 @@ export const getArticlesControllerCreateMockHandler = (overrideResponse?: Articl
 }
 
 export const getArticlesControllerFindAllMockHandler = (overrideResponse?: ArticleEntity[]) => {
-  return http.get('*/api/v1/articles', async () => {
+  return http.get('/api/v1/articles', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(
@@ -183,7 +183,7 @@ export const getArticlesControllerFindAllMockHandler = (overrideResponse?: Artic
 }
 
 export const getArticlesControllerFindDraftsMockHandler = (overrideResponse?: ArticleEntity[]) => {
-  return http.get('*/api/v1/articles/drafts', async () => {
+  return http.get('/api/v1/articles/drafts', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(
@@ -200,7 +200,7 @@ export const getArticlesControllerFindDraftsMockHandler = (overrideResponse?: Ar
 }
 
 export const getArticlesControllerFindOneMockHandler = (overrideResponse?: ArticleEntity) => {
-  return http.get('*/api/v1/articles/:id', async () => {
+  return http.get('/api/v1/articles/:id', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(
@@ -217,7 +217,7 @@ export const getArticlesControllerFindOneMockHandler = (overrideResponse?: Artic
 }
 
 export const getArticlesControllerUpdateMockHandler = (overrideResponse?: ArticleEntity) => {
-  return http.patch('*/api/v1/articles/:id', async () => {
+  return http.patch('/api/v1/articles/:id', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(
@@ -234,7 +234,7 @@ export const getArticlesControllerUpdateMockHandler = (overrideResponse?: Articl
 }
 
 export const getArticlesControllerRemoveMockHandler = () => {
-  return http.delete('*/api/v1/articles/:id', async () => {
+  return http.delete('/api/v1/articles/:id', async () => {
     await delay(1000)
     return new HttpResponse(null, {
       status: 200,

src/api/query/auth-social/auth-social.msw.ts

@@ -144,7 +144,7 @@ export const getAuthAppleControllerLoginResponseMock = (
 })
 
 export const getAuthGoogleControllerLoginMockHandler = (overrideResponse?: AuthEntity) => {
-  return http.post('*/api/v1/auth/google/login', async () => {
+  return http.post('/api/v1/auth/google/login', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(
@@ -161,7 +161,7 @@ export const getAuthGoogleControllerLoginMockHandler = (overrideResponse?: AuthE
 }
 
 export const getAuthFacebookControllerLoginMockHandler = (overrideResponse?: AuthEntity) => {
-  return http.post('*/api/v1/auth/facebook/login', async () => {
+  return http.post('/api/v1/auth/facebook/login', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(
@@ -178,7 +178,7 @@ export const getAuthFacebookControllerLoginMockHandler = (overrideResponse?: Aut
 }
 
 export const getAuthAppleControllerLoginMockHandler = (overrideResponse?: AuthEntity) => {
-  return http.post('*/api/v1/auth/apple/login', async () => {
+  return http.post('/api/v1/auth/apple/login', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(

src/api/query/auth/auth.msw.ts

@@ -135,7 +135,7 @@ export const getAuthControllerRefreshResponseMock = (
 })
 
 export const getAuthControllerLoginMockHandler = (overrideResponse?: AuthEntity) => {
-  return http.post('*/api/v1/auth/email/login', async () => {
+  return http.post('/api/v1/auth/email/login', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(overrideResponse ? overrideResponse : getAuthControllerLoginResponseMock()),
@@ -150,7 +150,7 @@ export const getAuthControllerLoginMockHandler = (overrideResponse?: AuthEntity)
 }
 
 export const getAuthControllerRegisterMockHandler = (overrideResponse?: UserEntity) => {
-  return http.post('*/api/v1/auth/email/register', async () => {
+  return http.post('/api/v1/auth/email/register', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(overrideResponse ? overrideResponse : getAuthControllerRegisterResponseMock()),
@@ -165,7 +165,7 @@ export const getAuthControllerRegisterMockHandler = (overrideResponse?: UserEnti
 }
 
 export const getAuthControllerConfirmEmailMockHandler = () => {
-  return http.post('*/api/v1/auth/email/confirm', async () => {
+  return http.post('/api/v1/auth/email/confirm', async () => {
     await delay(1000)
     return new HttpResponse(null, {
       status: 200,
@@ -177,7 +177,7 @@ export const getAuthControllerConfirmEmailMockHandler = () => {
 }
 
 export const getAuthControllerResendVerificationEmailMockHandler = () => {
-  return http.post('*/api/v1/auth/email/resend', async () => {
+  return http.post('/api/v1/auth/email/resend', async () => {
     await delay(1000)
     return new HttpResponse(null, {
       status: 200,
@@ -189,7 +189,7 @@ export const getAuthControllerResendVerificationEmailMockHandler = () => {
 }
 
 export const getAuthControllerForgotPasswordMockHandler = () => {
-  return http.post('*/api/v1/auth/forgot/password', async () => {
+  return http.post('/api/v1/auth/forgot/password', async () => {
     await delay(1000)
     return new HttpResponse(null, {
       status: 200,
@@ -201,7 +201,7 @@ export const getAuthControllerForgotPasswordMockHandler = () => {
 }
 
 export const getAuthControllerResetPasswordMockHandler = () => {
-  return http.post('*/api/v1/auth/reset/password', async () => {
+  return http.post('/api/v1/auth/reset/password', async () => {
     await delay(1000)
     return new HttpResponse(null, {
       status: 200,
@@ -213,7 +213,7 @@ export const getAuthControllerResetPasswordMockHandler = () => {
 }
 
 export const getAuthControllerEmailChangeMockHandler = () => {
-  return http.post('*/api/v1/auth/email/change', async () => {
+  return http.post('/api/v1/auth/email/change', async () => {
     await delay(1000)
     return new HttpResponse(null, {
       status: 200,
@@ -225,7 +225,7 @@ export const getAuthControllerEmailChangeMockHandler = () => {
 }
 
 export const getAuthControllerConfirmEmailChangeMockHandler = () => {
-  return http.post('*/api/v1/auth/email/change-confirm', async () => {
+  return http.post('/api/v1/auth/email/change-confirm', async () => {
     await delay(1000)
     return new HttpResponse(null, {
       status: 200,
@@ -237,7 +237,7 @@ export const getAuthControllerConfirmEmailChangeMockHandler = () => {
 }
 
 export const getAuthControllerMeMockHandler = (overrideResponse?: UserEntity) => {
-  return http.get('*/api/v1/auth/me', async () => {
+  return http.get('/api/v1/auth/me', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(overrideResponse ? overrideResponse : getAuthControllerMeResponseMock()),
@@ -252,7 +252,7 @@ export const getAuthControllerMeMockHandler = (overrideResponse?: UserEntity) =>
 }
 
 export const getAuthControllerUpdateMockHandler = () => {
-  return http.patch('*/api/v1/auth/me', async () => {
+  return http.patch('/api/v1/auth/me', async () => {
     await delay(1000)
     return new HttpResponse(null, {
       status: 200,
@@ -264,7 +264,7 @@ export const getAuthControllerUpdateMockHandler = () => {
 }
 
 export const getAuthControllerDeleteMockHandler = () => {
-  return http.delete('*/api/v1/auth/me', async () => {
+  return http.delete('/api/v1/auth/me', async () => {
     await delay(1000)
     return new HttpResponse(null, {
       status: 200,
@@ -276,7 +276,7 @@ export const getAuthControllerDeleteMockHandler = () => {
 }
 
 export const getAuthControllerRefreshMockHandler = (overrideResponse?: RefreshEntity) => {
-  return http.post('*/api/v1/auth/refresh', async () => {
+  return http.post('/api/v1/auth/refresh', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(overrideResponse ? overrideResponse : getAuthControllerRefreshResponseMock()),
@@ -291,7 +291,7 @@ export const getAuthControllerRefreshMockHandler = (overrideResponse?: RefreshEn
 }
 
 export const getAuthControllerLogoutMockHandler = () => {
-  return http.post('*/api/v1/auth/logout', async () => {
+  return http.post('/api/v1/auth/logout', async () => {
     await delay(1000)
     return new HttpResponse(null, {
       status: 200,
@@ -303,7 +303,7 @@ export const getAuthControllerLogoutMockHandler = () => {
 }
 
 export const getAuthControllerLogoutAllMockHandler = () => {
-  return http.post('*/api/v1/auth/logout/all', async () => {
+  return http.post('/api/v1/auth/logout/all', async () => {
     await delay(1000)
     return new HttpResponse(null, {
       status: 200,

src/api/query/files/files.msw.ts

@@ -26,7 +26,7 @@ export const getFilesControllerUploadFileResponseMock = (
 })
 
 export const getFilesControllerUploadFileMockHandler = (overrideResponse?: FileEntity) => {
-  return http.post('*/api/v1/files/upload', async () => {
+  return http.post('/api/v1/files/upload', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(
@@ -43,7 +43,7 @@ export const getFilesControllerUploadFileMockHandler = (overrideResponse?: FileE
 }
 
 export const getFilesControllerDownloadMockHandler = () => {
-  return http.get('*/api/v1/files/:fileName', async () => {
+  return http.get('/api/v1/files/:fileName', async () => {
     await delay(1000)
     return new HttpResponse(null, {
       status: 200,
@@ -55,7 +55,7 @@ export const getFilesControllerDownloadMockHandler = () => {
 }
 
 export const getFilesControllerDeleteFileMockHandler = () => {
-  return http.delete('*/api/v1/files/:fileName', async () => {
+  return http.delete('/api/v1/files/:fileName', async () => {
     await delay(1000)
     return new HttpResponse(null, {
       status: 200,

src/api/query/health/health.msw.ts

@@ -30,7 +30,7 @@ export const getHealthControllerCheckResponseMock = (overrideResponse: any = {})
 })
 
 export const getHealthControllerCheckMockHandler = (overrideResponse?: HealthEntity) => {
-  return http.get('*/api/v1/health', async () => {
+  return http.get('/api/v1/health', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(overrideResponse ? overrideResponse : getHealthControllerCheckResponseMock()),

src/api/query/users/users.msw.ts

@@ -193,7 +193,7 @@ export const getUsersControllerRemoveResponseMock = (overrideResponse: any = {})
 })
 
 export const getUsersControllerCreateMockHandler = (overrideResponse?: UserEntity) => {
-  return http.post('*/api/v1/users', async () => {
+  return http.post('/api/v1/users', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(overrideResponse ? overrideResponse : getUsersControllerCreateResponseMock()),
@@ -208,7 +208,7 @@ export const getUsersControllerCreateMockHandler = (overrideResponse?: UserEntit
 }
 
 export const getUsersControllerFindAllMockHandler = (overrideResponse?: UserEntity[]) => {
-  return http.get('*/api/v1/users', async () => {
+  return http.get('/api/v1/users', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(overrideResponse ? overrideResponse : getUsersControllerFindAllResponseMock()),
@@ -223,7 +223,7 @@ export const getUsersControllerFindAllMockHandler = (overrideResponse?: UserEnti
 }
 
 export const getUsersControllerFindOneMockHandler = (overrideResponse?: UserEntity) => {
-  return http.get('*/api/v1/users/:id', async () => {
+  return http.get('/api/v1/users/:id', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(overrideResponse ? overrideResponse : getUsersControllerFindOneResponseMock()),
@@ -238,7 +238,7 @@ export const getUsersControllerFindOneMockHandler = (overrideResponse?: UserEnti
 }
 
 export const getUsersControllerUpdateMockHandler = (overrideResponse?: UserEntity) => {
-  return http.patch('*/api/v1/users/:id', async () => {
+  return http.patch('/api/v1/users/:id', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(overrideResponse ? overrideResponse : getUsersControllerUpdateResponseMock()),
@@ -253,7 +253,7 @@ export const getUsersControllerUpdateMockHandler = (overrideResponse?: UserEntit
 }
 
 export const getUsersControllerRemoveMockHandler = (overrideResponse?: UserEntity) => {
-  return http.delete('*/api/v1/users/:id', async () => {
+  return http.delete('/api/v1/users/:id', async () => {
     await delay(1000)
     return new HttpResponse(
       JSON.stringify(overrideResponse ? overrideResponse : getUsersControllerRemoveResponseMock()),