Merge branch 'KCI-141' into KCI-140

Author: martn001

generator/templates/Authorisation/src/components/authorisation/LoginCard.vue

@@ -10,6 +10,13 @@
         >
           {{ errorMessage }}
         </v-alert>
+        <v-alert v-if="$route.query.message"
+                 class="mb-10"
+                 transition="fade-transition"
+                 type="success"
+        >
+          {{ $t(`authorisation.login.messages.${$route.query.message}`) }}
+        </v-alert>
         <k-field-group language-prefix="authorisation.fields">
           <KTextField field="email"
                       autofocus

generator/templates/Authorisation/src/components/authorisation/PasswordResetCard.vue

@@ -90,8 +90,7 @@ export default {
 
       resetRequest(this.form.email, this.token, this.form.password, this.form.passwordConfirmation)
           .then(() => {
-            this.alertType = 'success';
-            this.alertMessage = this.$t('authorisation.passwordReset.successMessage');
+            this.$router.push({name: 'login', query: {message: 'passwordResetSuccess'}});
           })
           .catch((error) => {
             this.alertType = 'error';

generator/templates/Authorisation/src/locales/nl/authorisation.json

@@ -1,7 +1,12 @@
 {
     "login": {
         "title": "Inloggen",
-        "successMessage": "Je bent ingelogd, we sturen je nu door."
+        "successMessage": "Je bent ingelogd, we sturen je nu door.",
+        "messages": {
+            "invitationAcceptSuccess": "Je account is geactiveerd, je kunt nu inloggen.",
+            "passwordResetSuccess": "Je wachtwoord is veranderd, je kunt nu inloggen.",
+            "registrationVerify": "Je registratie is voltooid, je kunt nu inloggen."
+        }
     },
     "registrationVerify": {
         "title": "Registratie afronden",

generator/templates/Authorisation/src/views/authorisation/InvitationAccept.vue

@@ -115,8 +115,7 @@ export default {
       this.isLoading = true;
       acceptInvitation(this.email, this.$route.params.token, this.password, this.passwordConfirmation)
           .then(() => {
-            this.alertType = 'success';
-            this.alertMessage = this.$t('authorisation.invitationAccept.successMessage');
+            this.$router.push({name: 'login', query: {message: 'invitationAcceptSuccess'}});
           })
           .catch((error) => {
             this.alertType = 'error';

generator/templates/Authorisation/src/views/authorisation/RegistrationVerify.vue

@@ -86,8 +86,7 @@ export default {
 
       verify(token, this.form.email, this.form.password, this.form.passwordConfirmation)
           .then(() => {
-            this.alertMessage = this.$t('authorisation.registrationVerify.successMessage');
-            this.alertType = 'success';
+            this.$router.push({name: 'login', query: {message: 'registrationVerify'}});
           })
           .catch((error) => {
             const { response } = error;