fix(default-theme): show errors from API in right format (#1499)

vuestorefront · May 20, 2021 · 0fa8898 · 0fa8898 · vercel · May 20, 2021
1 parent ac8ead9
commit 0fa8898
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/packages/composables/src/hooks/useUser.ts b/packages/composables/src/hooks/useUser.ts
@@ -183,6 +183,8 @@ export const useUser = (rootContext: ApplicationVueContext): IUseUser => {
       return true;
     } catch (e) {
       const err: ClientApiError = e;
+      // temporary workaround - get rid of such hacks in the future
+      // TODO: https://github.com/vuestorefront/shopware-pwa/issues/1498
       errors.register = [err.message as string];
       broadcast(INTERCEPTOR_KEYS.ERROR, {
         methodName: `[${contextName}][register]`,

diff --git a/packages/default-theme/src/components/forms/SwRegistrationForm.vue b/packages/default-theme/src/components/forms/SwRegistrationForm.vue
@@ -272,7 +272,16 @@ export default {
     const { login, register, loading, error: userError, errors } = useUser(root)
     const { getCountries, error: countriesError } = useCountries(root)
     const { getSalutations, error: salutationsError } = useSalutations(root)
-    const formErrors = computed(() => errors.register)
+    // temporary fix for accessing the errors in right format
+    // TODO: https://github.com/vuestorefront/shopware-pwa/issues/1498
+    const formErrors = computed(() =>
+      getMessagesFromErrorsArray(
+        (Array.isArray(errors.register) &&
+          errors.register.length &&
+          errors.register[0]) ||
+          ([] as any)
+      )
+    )
 
     const state = reactive({
       firstName: "",