Remove unnecessary store (#468)

adempiere · Apr 28, 2020 · dc7221d · dc7221d
1 parent 1c133bc
commit dc7221d
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 164 deletions.
diff --git a/src/store/modules/ADempiere/enrollment.js b/src/store/modules/ADempiere/enrollment.js
diff --git a/src/views/login/forgotPassword.vue b/src/views/login/forgotPassword.vue
@@ -49,6 +49,10 @@
 
 <script>
 import { loginMixin } from '@/views/login/loginMixin'
+import router from '@/router'
+import { showMessage } from '@/utils/ADempiere/notification'
+import language from '@/lang'
+import { forgotPassword } from '@/api/ADempiere/enrollment'
 
 export default {
   name: 'ForgotPassword',
@@ -68,10 +72,31 @@ export default {
     handleSubmit() {
       if (!this.isEmptyValue(this.forgotForm.userName)) {
         this.loading = true
-        this.$store.dispatch('forgotPassword', this.forgotForm.userName)
-          .finally(() => {
-            this.loading = false
+        forgotPassword(this.forgotForm.userName)
+          .then(forgotPasswordResponse => {
+            if (forgotPasswordResponse.responseTypeStatus === 'OK') {
+              showMessage({
+                message: language.t('login.passwordResetSendLink') + this.forgotForm.userName,
+                type: 'success'
+              })
+              router.push({
+                path: 'login'
+              })
+            } else {
+              showMessage({
+                message: language.t('login.unexpectedError'),
+                type: 'error'
+              })
+            }
           })
+          .catch(error => {
+            showMessage({
+              message: language.t('login.unexpectedError'),
+              type: 'error'
+            })
+            console.warn(`Forgot Password - Error ${error.code}: ${error.message}`)
+          })
+          .finally(this.loading = false)
       }
     }
   }

diff --git a/src/views/login/setPassword.vue b/src/views/login/setPassword.vue
@@ -79,7 +79,10 @@
 
 <script>
 import { loginMixin } from '@/views/login/loginMixin'
-
+import { resetPasswordFromToken } from '@/api/ADempiere/enrollment'
+import { showMessage } from '@/utils/ADempiere/notification'
+import language from '@/lang'
+import router from '@/router'
 export default {
   name: 'ChangePassword',
   mixins: [loginMixin],
@@ -165,19 +168,45 @@ export default {
     handleSubmit() {
       if (!this.isEmptyValue(this.changePasswordForm.password) && !this.isEmptyValue(this.changePasswordForm.passwordConfirm)) {
         this.loading = true
-        let actionType = 'resetPasswordFromToken'
-        if (this.formName === 'createPassword') {
-          actionType = 'createPasswordFromToken'
-        }
-        this.$store.dispatch(actionType, {
+        this.createPasswordFromToken({
           token: this.$route.query.token,
           password: this.changePasswordForm.password
         })
-          .finally(() => {
-            this.loading = false
-          })
       }
     },
+    createPasswordFromToken({
+      token,
+      password
+    }) {
+      resetPasswordFromToken({
+        token: token,
+        password: password
+      })
+        .then(createPasswordResponse => {
+          if (createPasswordResponse.responseTypeStatus === 'OK') {
+            showMessage({
+              message: language.t('login.createPasswordSuccessful'),
+              type: 'success'
+            })
+          } else {
+            showMessage({
+              message: language.t('login.unexpectedError'),
+              type: 'error'
+            })
+          }
+          router.push({
+            path: 'login'
+          })
+        })
+        .catch(error => {
+          showMessage({
+            message: language.t('login.unexpectedError'),
+            type: 'error'
+          })
+          console.warn(`Create Password - Error ${error.code}: ${error.message}`)
+        })
+        .finally(this.loading = false)
+    },
     verifyToken() {
       if (this.$route.query && this.$route.query.token && !this.isEmptyValue(this.$route.query.token)) {
         return true

diff --git a/src/views/login/userEnrollment.vue b/src/views/login/userEnrollment.vue
@@ -119,6 +119,10 @@
 
 <script>
 import { loginMixin } from '@/views/login/loginMixin'
+import router from '@/router'
+import { showMessage } from '@/utils/ADempiere/notification'
+import language from '@/lang'
+import { enrollmentUser } from '@/api/ADempiere/enrollment'
 
 export default {
   name: 'UserEnrollment',
@@ -253,10 +257,24 @@ export default {
         if (this.isShowPassword) {
           dataToSubmit.password = this.enrollmentUserForm.password
         }
-        this.$store.dispatch('enrollmentUser', dataToSubmit)
-          .finally(() => {
-            this.loading = false
+        enrollmentUser(dataToSubmit)
+          .then(() => {
+            showMessage({
+              message: language.t('login.userEnrollmentSuccessful'),
+              type: 'success'
+            })
+            router.push({
+              path: 'login'
+            })
           })
+          .catch(error => {
+            showMessage({
+              message: language.t('login.unexpectedError'),
+              type: 'error'
+            })
+            console.warn(`Enrollment User - Error ${error.code}: ${error.message}`)
+          })
+          .finally(this.loading = false)
       } else {
         console.log('error submit!!')
         return false