Merge pull request #21 from kingscode/KCI-87

Update scaffold

Author: ricardovanlaarhoven

generator/index.js

@@ -10,6 +10,7 @@ module.exports = (api, options) => {
             'vuex-persistedstate': '^2.5.4',
             'lodash.clonedeep': '^4.5.0',
             'css-vars-ponyfill': '^2.1.2',
+            'qs': '^6.9.4',
             'vue-router': '3.3.4',
         },
     });
@@ -19,12 +20,18 @@ module.exports = (api, options) => {
                 '@fortawesome/fontawesome-pro': '^5.8.1',
             },
         });
+    } else {
+        api.extendPackage({
+            dependencies: {
+                '@fortawesome/fontawesome-free': '^5.14.0',
+            },
+        });
     }
 
     if (options.useCrud) {
         api.extendPackage({
             dependencies: {
-                '@kingscode/vuetify-resource': '^1.4.1',
+                '@kingscode/vuetify-resource': '^2.0.3',
             },
         });
         api.render('./templates/Crud', options);

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

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

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

@@ -1,4 +1,4 @@
-import {post} from '../../implementation/app/wrapper.js';
+import {post} from '../../implementation/app';
 
 export default function () {
     return post('auth/logout');

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

@@ -1,4 +1,4 @@
-import {post} from '../../implementation/app/wrapper.js';
+import {post} from '../../implementation/app';
 
 function passwordForgotten(email) {
     return post('password/forgotten', {

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

@@ -1,7 +1,21 @@
-import {post} from '../../implementation/app/wrapper.js';
+import {post} from '../../implementation/app';
 
-export default function (email, name) {
+function register(email, name) {
     return post('registration', {
         email, name,
     });
 }
+
+function verify(token, email, password, passwordConfirmation) {
+    return post('registration/verify', {
+        token: token,
+        email: email,
+        password: password,
+        password_confirmation: passwordConfirmation,
+    });
+}
+
+export {
+    register,
+    verify,
+};

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

@@ -1,4 +1,4 @@
-import {post} from '../../implementation/app/wrapper.js';
+import {post} from '../../implementation/app';
 
 export default function (email) {
     return post('password/forgotten', {

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

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

generator/templates/Authorisation/src/api/endpoints/user.js

@@ -0,0 +1,28 @@
+import axios from '../implementation/app';
+
+/**
+ * @param user {User}
+ */
+function create(user) {
+    return axios.post('user', user);
+}
+
+/**
+ * @param user {User}
+ */
+function update(user) {
+    return axios.put(`user/${user.id}`, user);
+}
+
+/**
+ * @param userId {number}
+ */
+function destroy(userId) {
+    return axios.delete(`user/${userId}`);
+}
+
+export {
+    create,
+    update,
+    destroy,
+};

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

@@ -43,6 +43,7 @@
 <script>
 import LoginRequest from '../../api/endpoints/authorisation/login';
 import {mapGetters} from 'vuex';
+import {getRateLimitMinutes} from '../../api/util/response.js';
 
 export default {
     name: 'LoginCard',
@@ -61,7 +62,7 @@ export default {
     },
     computed: {
         ...mapGetters({
-            findError: 'Error/find',
+            findError: 'error/find',
         }),
     },
     methods: {
@@ -70,9 +71,20 @@ export default {
             LoginRequest(this.form.email, this.form.password)
                 .then(res => {
                     this.isRedirecting = true;
-                    this.redirectToAuthDispense(res.data.token);
+                    this.redirectToAuthDispense(res.data.data.token);
+                })
+                .catch(err => {
+                    const response = err.response;
+                    const status = response.status;
+
+                    if (status === 429) {
+                        this.errorMessage =
+                            `Je hebt te veel foutieve inlog pogingen gedaan.
+                             Probeer het over ${getRateLimitMinutes(response, 15)} minuten opnieuw`;
+                    } else {
+                        this.errorMessage = this.findError('email');
+                    }
                 })
-                .catch(() => this.errorMessage = this.findError('email'))
                 .finally(() => this.isLoading = false);
         },
         redirectToAuthDispense(token) {

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

@@ -49,16 +49,15 @@ export default {
             if (!this.isValid) return;
 
             this.isLoading = true;
+            this.alertMessage = '';
+            this.alertType = 'error';
 
             ForgottenRequest(this.form.email)
                 .then(() => {
                     this.alertMessage = 'Er is een wachtwoord vergeten mail verstuurd mits er een account bestaat met het gegeven email adres.';
                     this.alertType = 'success';
                 })
-                .catch(() => {
-                    this.alertMessage = 'De ingevulde gegevens kloppen niet.';
-                    this.alertType = 'error';
-                })
+                .catch(() => this.alertMessage = 'De ingevulde gegevens kloppen niet.')
                 .finally(() => this.isLoading = false);
         },
     },