Fix/login process

packages/composables/__tests__/useCms.spec.ts

@@ -45,7 +45,9 @@ describe("Shopware composables", () => {
 
   it("should have failed on bad url settings", async () => {
     const { search, page, error } = useCms();
-    mockedGetPage.getPage.mockRejectedValueOnce("Something went wrong...");
+    mockedGetPage.getPage.mockRejectedValueOnce({
+      response: { statusText: "Something went wrong..." }
+    });
     expect(page.value).toEqual(null);
     await search();
     expect(page.value).toEqual(null);

packages/composables/__tests__/useUser.spec.ts

@@ -99,6 +99,21 @@ describe("Composables - useUser", () => {
         expect(error.value).toEqual("Bad user credentials");
       });
 
+      it("error message should be appriopriate to the 401 HTTP status code", async () => {
+        mockedApiClient.login.mockRejectedValueOnce({
+          response: {
+            status: 401
+          }
+        });
+        const { error, login } = useUser();
+        const result = await login({
+          username: "qwe@qwe.com",
+          password: "fakePassword"
+        });
+        expect(result).toEqual(false);
+        expect(error.value).toEqual(undefined);
+      });
+
       it("should login user succesfully", async () => {
         mockedApiClient.login.mockResolvedValueOnce({
           "sw-context-token": "qweqwe"

packages/composables/src/hooks/useCms/index.ts

@@ -42,8 +42,8 @@ export const useCms = (): any => {
       const result = await getPage(path, searchCriteria);
       vuexStore.commit("SET_PAGE", result);
     } catch (e) {
-      error.value = e;
       console.error("Problem with fetching CMS data", e.message);
+      error.value = (e.response && e.response.statusText) || e;
     } finally {
       loading.value = false;
     }

packages/default-theme/components/SwLogin.vue

@@ -6,7 +6,7 @@
         v-if="error"
         class="sw-login__alert"
         type="danger"
-        message="Cannot login with provided credentials"
+        message="Invalid credentials"
       />
       <SfInput
         v-model="email"
@@ -80,7 +80,7 @@ export default {
         return
       }
       const loggedIn = await this.clientLogin({
-        username: this.login,
+        username: this.email,
         password: this.password
       })
       if (loggedIn) this.$emit('success')

packages/default-theme/pages/login.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="login">
-    <SwLogin class="login__component" />
+    <SwLogin class="login__component" @success="redirectToMyAccount"/>
   </div>
 </template>
 <script>
@@ -19,6 +19,9 @@ export default {
   computed: {
   },
   methods: {
+    redirectToMyAccount() {
+      this.$router.push("/account")
+    }
   }
 }
 </script>