Merge pull request #185 from Geode-solutions/fix/captcha_on_desktop

fix(captcha): patch validated on desktop mode

Author: JulienChampagnol

.github/workflows/CICD.yml

@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Unit tests
         run: |
-          npm i
+          npm ci
           npm run test
 
   build:

.gitignore

@@ -26,4 +26,4 @@ logs
 .pytest_cache
 __snapshots__
 coverage
-package-lock.json
+# package-lock.json

components/FileUploader.vue

@@ -80,6 +80,7 @@
     await Promise.all(promise_array)
     files_uploaded.value = true
     emit("files_uploaded", internal_files.value)
+
     toggle_loading()
   }
 

components/ObjectSelector.vue

@@ -72,25 +72,14 @@
     var promise_array = []
     for (const filename of filenames) {
       const params = { filename, supported_feature }
-      const promise = new Promise((resolve, reject) => {
-        api_fetch(
-          { schema, params },
-          {
-            request_error_function: () => {
-              reject()
-            },
-            response_function: (response) => {
-              resolve(response._data.allowed_objects)
-            },
-            response_error_function: () => {
-              reject()
-            },
-          },
-        )
-      })
+      const promise = api_fetch({ schema, params })
       promise_array.push(promise)
     }
-    const values = await Promise.all(promise_array)
+    const responses = await Promise.all(promise_array)
+    let values = []
+    for (const response of responses) {
+      values.push(response.data.value.allowed_objects)
+    }
     const all_keys = [...new Set(values.flatMap((value) => Object.keys(value)))]
     const common_keys = all_keys.filter(
       (i) => !values.some((j) => !Object.keys(j).includes(i)),
@@ -119,7 +108,6 @@
       emit("increment_step")
     }
   }
-
   await get_allowed_objects()
 </script>
 

components/Recaptcha.vue

@@ -22,7 +22,7 @@
   onMounted(() => {
     if (process.client) {
       const config = useRuntimeConfig()
-      if (config.public.NODE_ENV !== "production") {
+      if (config.public.NODE_ENV !== "production" || !infra_store.is_cloud) {
         infra_store.$patch({ is_captcha_validated: true })
       }
     }

composables/api_fetch.js

@@ -29,46 +29,41 @@ export function api_fetch(
   if (schema.max_retry) {
     request_options.max_retry = schema.max_retry
   }
-  return new Promise((resolve, reject) => {
-    useFetch(schema.$id, {
-      baseURL: geode_store.base_url,
-      ...request_options,
-      async onRequestError({ error }) {
+  return useFetch(schema.$id, {
+    baseURL: geode_store.base_url,
+    ...request_options,
+    async onRequestError({ error }) {
+      await geode_store.stop_request()
+      await feedback_store.add_error(
+        error.code,
+        schema.$id,
+        error.message,
+        error.stack,
+      )
+      if (request_error_function) {
+        await request_error_function(error)
+      }
+    },
+    async onResponse({ response }) {
+      if (response.ok) {
         await geode_store.stop_request()
-        await feedback_store.add_error(
-          error.code,
-          schema.$id,
-          error.message,
-          error.stack,
-        )
-        if (request_error_function) {
-          await request_error_function(error)
+        if (response_function) {
+          await response_function(response)
         }
-        reject(error)
-      },
-      async onResponse({ response }) {
-        if (response.ok) {
-          await geode_store.stop_request()
-          if (response_function) {
-            await response_function(response)
-          }
-          resolve(response)
-        }
-      },
-      async onResponseError({ response }) {
-        await geode_store.stop_request()
-        await feedback_store.add_error(
-          response.status,
-          schema.$id,
-          response._data.name,
-          response._data.description,
-        )
-        if (response_error_function) {
-          await response_error_function(response)
-        }
-        reject(response)
-      },
-    })
+      }
+    },
+    async onResponseError({ response }) {
+      await geode_store.stop_request()
+      await feedback_store.add_error(
+        response.status,
+        schema.$id,
+        response._data.name,
+        response._data.description,
+      )
+      if (response_error_function) {
+        await response_error_function(response)
+      }
+    },
   })
 }
 

composables/upload_file.js

@@ -1,7 +1,10 @@
+import { useAppConfig } from "nuxt/app"
+
 export async function upload_file(
   { route, file },
   { request_error_function, response_function, response_error_function } = {},
 ) {
+  console.log("upload_file", route, file)
   const feedback_store = use_feedback_store()
   const geode_store = use_geode_store()
   if (!(file instanceof File)) {
@@ -17,17 +20,22 @@ export async function upload_file(
   }
 
   geode_store.start_request()
-  return useFetch(route, {
+  return $fetch(route, {
     baseURL: geode_store.base_url,
     ...request_options,
+    onRequest({ request }) {
+      console.log("onRequest", request)
+    },
     onRequestError({ error }) {
+      console.log("onRequestError", error)
       geode_store.stop_request()
       feedback_store.add_error(error.code, route, error.message, error.stack)
       if (request_error_function) {
         request_error_function(error)
       }
     },
     onResponse({ response }) {
+      console.log("onResponse", response)
       if (response.ok) {
         geode_store.stop_request()
         if (response_function) {
@@ -36,6 +44,7 @@ export async function upload_file(
       }
     },
     onResponseError({ response }) {
+      console.log("onResponseError", response)
       geode_store.stop_request()
       feedback_store.add_error(
         response.status,

eslint.config.cjs

@@ -0,0 +1,13 @@
+module.exports = {
+  env: {
+    node: true,
+    browser: true,
+    es2021: true,
+  },
+  extends: [
+    "eslint:recommended",
+    "plugin:vue/recommended",
+    "plugin:vuetify/recommended",
+    "plugin:nuxt/recommended",
+  ],
+}