Merge branch 'release/6.0.25'

* release/6.0.25:
  fixes #947

public/js/app.js.LICENSE.txt

@@ -22,7 +22,7 @@
  */
 
 /*!
- * FilePond 4.25.1
+ * FilePond 4.25.2
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */

public/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/js/app.js": "/js/app.js?id=e494ab5415f2d400ab5b",
+    "/js/app.js": "/js/app.js?id=1f146fac7da574b2b159",
     "/css/app.css": "/css/app.css?id=17b9084a51cfbf270aa4"
 }

resources/js/components/modals/AvatarModal.vue

@@ -68,6 +68,7 @@ import FilePondPluginFileValidateType from 'filepond-plugin-file-validate-type';
 import FilePondPluginImageExifOrientation from 'filepond-plugin-image-exif-orientation';
 import FilePondPluginImagePreview from 'filepond-plugin-image-preview';
 import FilePondPluginImageValidateSize from 'filepond-plugin-image-validate-size';
+import { store } from '../../store';
 
 const FilePond = vueFilePond(
     FilePondPluginFileValidateType,
@@ -106,7 +107,8 @@ export default {
 
         getServerOptions() {
             return {
-                url: `${this.settings.path}/api/uploads`,
+                // TODO: This check shouldn't need to be here
+                url: this.settings.path === '/' ? `/api/uploads` : `${this.settings.path}/api/uploads`,
                 headers: {
                     'X-CSRF-TOKEN': document.head.querySelector('meta[name="csrf-token"]').content,
                 },

resources/js/mixins/request.js

@@ -22,6 +22,7 @@ export default {
                 switch (error.response.status) {
                     case 401:
                     case 405:
+                        // TODO: This check needs to be rewritten
                         if (store.state.settings.path === '/') {
                             window.location.href = `/logout`;
                         } else {