add new authorisatrion routes

Author: ricardovanlaarhoven

README.md

@@ -10,15 +10,14 @@ vue add kingscode-scaffold
 npm run serve
 ```
 
-Mind that some of the choices you make in the `vue create my-app` and 
-later in the `vue add vuetify` will be overwritten by vuetify or the kings code scaffold.
+Mind that some choices you make in the `vue create my-app` and 
+later in the `vue add vuetify` will be overwritten by vuetify, or the kings code scaffold.
 
 
 ## Configuration
 
-```
-Notice: it does not matter which choice you make with options that are not documented.
- ```
+> Notice: it does not matter which choice you make with options that are not documented.
+
 
 ### Vue:
 We'd recommend you to choose

generator/templates/Authorisation/src/api/endpoints/authorisation/login.js

@@ -2,7 +2,7 @@ import { post } from '../../implementation/app';
 
 export default function (email, password) {
   return post('auth/login', {
-    email: email,
-    password: password,
+    email,
+    password,
   });
 }

generator/templates/Authorisation/src/api/endpoints/authorisation/password.js

@@ -2,15 +2,15 @@ import { post } from '../../implementation/app';
 
 function passwordForgotten(email) {
   return post('password/forgotten', {
-    email: email,
+    email,
   });
 }
 
 function passwordReset(token, email, password, passwordConfirmation) {
   return post('password/reset', {
-    token: token,
-    email: email,
-    password: password,
+    token,
+    email,
+    password,
     password_confirmation: passwordConfirmation,
   });
 }

generator/templates/Authorisation/src/api/endpoints/authorisation/password/forgotten.js

@@ -0,0 +1,7 @@
+import { post } from '@/api/implementation/app';
+
+export default function (email) {
+  return post('password/forgotten', {
+    email,
+  });
+}

generator/templates/Authorisation/src/api/endpoints/authorisation/password/reset.js

@@ -0,0 +1,10 @@
+import { post } from '@/api/implementation/app';
+
+export default async function (email, token, password, passwordConfirmation) {
+  return post('password/reset', {
+    email,
+    token,
+    password,
+    password_confirmation: passwordConfirmation,
+  });
+}

generator/templates/Authorisation/src/api/endpoints/authorisation/register.js

@@ -1,22 +1,24 @@
 import { post } from '../../implementation/app';
 
-function register(email, name) {
-  return post('registration', {
+function verify(token, email, password, passwordConfirmation) {
+  return post('registration/verify', {
+    token,
     email,
-    name,
+    password,
+    password_confirmation: passwordConfirmation,
   });
 }
 
-function verify(token, email, password, passwordConfirmation) {
-  return post('registration/verify', {
-    token: token,
+function acceptInvitation(email, token, password, passwordConfirmation) {
+  return post('invitation/accept', {
     email: email,
     password: password,
     password_confirmation: passwordConfirmation,
+    token: token,
   });
 }
 
 export {
-  register,
   verify,
+  acceptInvitation,
 };

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

@@ -51,7 +51,6 @@
 
 <script>
 import { getRateLimitMinutes } from '@/api/util/response';
-import { getOrganisationFromUrl } from '@/application/util/url.js';
 import KFieldGroup from '@/components/crud/fields/KFieldGroup.vue';
 import KTextField from '@/components/crud/fields/KTextField.vue';
 import { mapGetters } from 'vuex';
@@ -124,11 +123,6 @@ export default {
       tokenElement.value = token;
       form.appendChild(tokenElement);
 
-      const organisationElement = document.createElement('input');
-      organisationElement.name = 'organisation';
-      organisationElement.value = getOrganisationFromUrl();
-      form.appendChild(organisationElement);
-
       document.body.appendChild(form);
       form.submit();
     },

generator/templates/Authorisation/src/components/Authorisation/PasswordForgottenCard.vue

@@ -42,7 +42,6 @@
 import KFieldGroup from '@/components/crud/fields/KFieldGroup.vue';
 import KTextField from '@/components/crud/fields/KTextField.vue';
 import ForgottenRequest from '../../api/endpoints/authorisation/password/forgotten';
-import { getOrganisationFromUrl } from '../../application/util/url.js';
 
 export default {
   name: 'PasswordForgottenCard',
@@ -71,7 +70,7 @@ export default {
       this.alertMessage = '';
       this.alertType = 'error';
 
-      ForgottenRequest(this.form.email, getOrganisationFromUrl())
+      ForgottenRequest(this.form.email)
           .then(() => {
             this.alertMessage = this.$t('authorisation.passwordForgotten.successMessage');
             this.alertType = 'success';

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

@@ -45,7 +45,6 @@
 
 <script>
 import { getRateLimitMinutes } from '@/api/util/response.js';
-import { getOrganisationFromUrl } from '@/application/util/url.js';
 import KFieldGroup from '@/components/crud/fields/KFieldGroup.vue';
 import KTextField from '@/components/crud/fields/KTextField.vue';
 import resetRequest from '../../api/endpoints/authorisation/password/reset';
@@ -89,7 +88,7 @@ export default {
       this.alertType = 'error';
       this.errorMessage = '';
 
-      resetRequest(this.form.email, this.token, this.form.password, this.form.passwordConfirmation, getOrganisationFromUrl())
+      resetRequest(this.form.email, this.token, this.form.password, this.form.passwordConfirmation)
           .then(() => {
             this.alertType = 'success';
             this.alertMessage = this.$t('authorisation.passwordReset.successMessage');

generator/templates/Authorisation/src/routes/routes/authorisation.js

@@ -0,0 +1,36 @@
+export default {
+  path: '',
+  component: () => import('@/templates/Authorisation'),
+  children: [
+    {
+      path: 'login',
+      name: 'login',
+      component: () => import('@/views/authorisation/Login.vue'),
+    },
+    {
+      path: 'auth/callback',
+      name: 'auth.callback',
+      component: () => import('@/views/authorisation/AuthorisationCallback.vue'),
+    },
+    {
+      path: 'password/forgotten',
+      name: 'password.forgotten',
+      component: () => import('@/views/authorisation/PasswordForgotten.vue'),
+    },
+    {
+      path: 'password/reset/:token',
+      name: 'password.reset',
+      component: () => import('@/views/authorisation/PasswordReset.vue'),
+    },
+    {
+      path: 'invitation/accept/:token',
+      name: 'invitation.accept',
+      component: () => import('@/views/authorisation/InvitationAccept.vue'),
+    },
+    {
+      path: 'registration/verify',
+      name: 'registration.verify',
+      component: () => import('@/views/authorisation/RegistrationVerify.vue'),
+    },
+  ],
+};