feat: allow accessing raw response from error

PlusAuth · Apr 20, 2024 · dfef284 · dfef284
1 parent a184d7f
commit dfef284
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/src/ui/utils/fetch.ts b/src/ui/utils/fetch.ts
@@ -57,7 +57,8 @@ export function createFetchWrapper(baseUrl?: string) {
             if (contentType && contentType.includes('json')) {
               response = JSON.parse(value)
             } else {
-              response = value
+              // noinspection JSPrimitiveTypeWrapperUsage
+              response = new String(value)
             }
             if (rawResponse.ok) {
               resolve(response)
@@ -69,7 +70,12 @@ export function createFetchWrapper(baseUrl?: string) {
               window.location.replace(response.location);
               return false;
             } else {
-              reject(response ? response : rawResponse.statusText)
+              // noinspection JSPrimitiveTypeWrapperUsage
+              const errorResponse = response || new String(rawResponse.statusText)
+              Object.defineProperty(errorResponse, '$raw', {
+                value: rawResponse
+              })
+              reject(errorResponse)
             }
           })
         }).catch(reject)

diff --git a/src/ui/utils/form_generics.ts b/src/ui/utils/form_generics.ts
@@ -128,6 +128,14 @@ export function useGenericForm(
                 path: `errors.${e.error}`,
                 args: e,
               }
+            } else if(e.error === 'too_many_requests' && e.$raw?.headers?.get){
+              const retryAfter = e.$raw.headers.get('retry-after')
+              form.value.toggleAlert({
+                path: `errors.${e.error}`,
+                args: {
+                  retry: retryAfter
+                }
+              })
             } else {
               form.value.toggleAlert({
                 path: `errors.${e.error}`,

diff --git a/src/ui/views/Login.vue b/src/ui/views/Login.vue
@@ -139,15 +139,6 @@ export default defineComponent({
                 finalFields.password.errors = `errors.${e.error}`;
               }
               break;
-            case 'too_many_requests':
-              const retryAfter = e._raw.headers.get('retry-after')
-              form.value.toggleAlert({
-                path: `errors.${e.error}`,
-                args: {
-                  retry: retryAfter
-                }
-              })
-              break;
             default:
               throw e
           }