Merge remote-tracking branch 'origin/main' into fix/input-styles-in-profile

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: {

scripts/data/swagger-spec.json

@@ -1211,6 +1211,20 @@
         },
         "tags": ["health"]
       }
+    },
+    "/api/v1/system/app-updates/check": {
+      "post": {
+        "operationId": "SystemController_checkForAppUpdate",
+        "parameters": [],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": { "schema": { "$ref": "#/components/schemas/CheckUpdateDto" } }
+          }
+        },
+        "responses": { "201": { "description": "" } },
+        "tags": ["system"]
+      }
     }
   },
   "info": {
@@ -1829,7 +1843,7 @@
         "properties": {
           "accessToken": {
             "type": "string",
-            "example": "eyJhbGciOiJSUzI1NiIsImtpZCI6IjFlOGI2ZTFlYTI1Y2I2M2Q0ZTI5YWI1Y2M2ZDZmODBlZjRmNDY2NjciLCJ0eXAiOiJKV1QifQ.eyJhenAiOiIxMjM0NTY3ODkwMTIzNDU2Nzg5MC5hcHBzLmdvb2dsZXVzZXJjb250ZW50LmNvbSIsImF1ZCI6IjEyMzQ1Njc4OTAxMjM0NTY3ODkwLmFwcHMuZ29vZ2xldXNlcmNvbnRlbnQuY29tIiwiZXhwIjoxNjUxNTc2MDAwLCJpYXQiOjE2NTE1NzI0MDAsImlzcyI6ImFjY291bnRzLmdvb2dsZS5jb20iLCJzdWIiOiIxMjM0NTY3ODkwMTIzNDU2Nzg5MCIsImVtYWlsIjoianVzdHVzZXJAZ21haWwuY29tIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsIm5hbWUiOiJKdXN0IFVzZXIiLCJwaWN0dXJlIjoiaHR0cHM6Ly9leGFtcGxlLmNvbS9qdXN0dXNlci9waG90by5qcGciLCJnaXZlbl9uYW1lIjoiSnVzdCIsImZhbWlseV9uYW1lIjoiVXNlciJ9.QWxsYWtoemF0aGtqZGxza2FqaGRsa2FqZGxza2FqZGhza2FqaGRrc2FqaGtqZHNhbGtqZHNhbGtqZGhsYWtqZHNhbGtqaGRsYWtqaGRza2FqaGRrc2FqaGRrc2FqaGRrc2Fq",
+            "example": "EAAJ3MZA...ZDZD",
             "description": "Google Access token obtained after user authentication using Google OAuth. Use this token to authenticate the request to the application."
           }
         },
@@ -1915,6 +1929,23 @@
           }
         },
         "required": ["status", "info", "error", "details"]
+      },
+      "CheckUpdateDto": {
+        "type": "object",
+        "properties": {
+          "os": {
+            "type": "string",
+            "example": "ios",
+            "description": "The operating system for which to check the update. Can be either \"android\" or \"ios\".",
+            "enum": ["android", "ios"]
+          },
+          "currentVersion": {
+            "type": "string",
+            "example": "1.2.0",
+            "description": "The current version of the app installed on the device."
+          }
+        },
+        "required": ["os", "currentVersion"]
       }
     }
   },

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/system/system.msw.ts

@@ -0,0 +1,22 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/**
+ * Generated by orval 🍺
+ * Do not edit manually.
+ * API
+ * API documentation for the starter-kit project in NestJS by BinarApps. The API allows management of users, sessions and offers various functions for logged in users. Contains examples of authentication, authorization, and CRUD for selected resources.
+ * OpenAPI spec version: 1.0
+ */
+import { HttpResponse, delay, http } from 'msw'
+
+export const getSystemControllerCheckForAppUpdateMockHandler = () => {
+  return http.post('*/api/v1/system/app-updates/check', async () => {
+    await delay(1000)
+    return new HttpResponse(null, {
+      status: 200,
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    })
+  })
+}
+export const getSystemMock = () => [getSystemControllerCheckForAppUpdateMockHandler()]