Parcourir la source

Set up paths & namespace to match versioned routes

Bubka il y a 3 ans
Parent
commit
7efa86b232
47 fichiers modifiés avec 98 ajouts et 94 suppressions
  1. 1 1
      app/Api/v1/Controllers/Auth/ForgotPasswordController.php
  2. 2 2
      app/Api/v1/Controllers/Auth/PasswordController.php
  3. 2 2
      app/Api/v1/Controllers/Auth/RegisterController.php
  4. 1 1
      app/Api/v1/Controllers/Auth/ResetPasswordController.php
  5. 3 3
      app/Api/v1/Controllers/Auth/UserController.php
  6. 6 5
      app/Api/v1/Controllers/GroupController.php
  7. 2 1
      app/Api/v1/Controllers/IconController.php
  8. 3 2
      app/Api/v1/Controllers/QrCodeController.php
  9. 3 3
      app/Api/v1/Controllers/SettingController.php
  10. 11 10
      app/Api/v1/Controllers/TwoFAccountController.php
  11. 1 1
      app/Api/v1/Requests/GroupAssignRequest.php
  12. 1 1
      app/Api/v1/Requests/GroupStoreRequest.php
  13. 1 1
      app/Api/v1/Requests/QrCodeDecodeRequest.php
  14. 1 1
      app/Api/v1/Requests/SettingStoreRequest.php
  15. 1 1
      app/Api/v1/Requests/SettingUpdateRequest.php
  16. 1 1
      app/Api/v1/Requests/TwoFAccountBatchRequest.php
  17. 1 1
      app/Api/v1/Requests/TwoFAccountDynamicRequest.php
  18. 1 1
      app/Api/v1/Requests/TwoFAccountReorderRequest.php
  19. 1 1
      app/Api/v1/Requests/TwoFAccountStoreRequest.php
  20. 1 1
      app/Api/v1/Requests/TwoFAccountUpdateRequest.php
  21. 1 1
      app/Api/v1/Requests/TwoFAccountUriRequest.php
  22. 1 1
      app/Api/v1/Requests/UserPatchPwdRequest.php
  23. 1 1
      app/Api/v1/Requests/UserStoreRequest.php
  24. 1 1
      app/Api/v1/Requests/UserUpdateRequest.php
  25. 1 1
      app/Api/v1/Resources/GroupResource.php
  26. 2 2
      app/Api/v1/Resources/TwoFAccountCollection.php
  27. 1 1
      app/Api/v1/Resources/TwoFAccountReadResource.php
  28. 1 1
      app/Api/v1/Resources/TwoFAccountStoreResource.php
  29. 1 1
      app/Api/v1/Resources/UserResource.php
  30. 2 2
      app/Providers/RouteServiceProvider.php
  31. 4 4
      resources/js/components/OtpDisplayer.vue
  32. 7 7
      resources/js/views/Accounts.vue
  33. 2 2
      resources/js/views/Groups.vue
  34. 2 2
      resources/js/views/Start.vue
  35. 1 1
      resources/js/views/auth/Login.vue
  36. 1 1
      resources/js/views/auth/Register.vue
  37. 1 1
      resources/js/views/auth/password/Request.vue
  38. 1 1
      resources/js/views/auth/password/Reset.vue
  39. 1 1
      resources/js/views/groups/Create.vue
  40. 1 1
      resources/js/views/groups/Edit.vue
  41. 3 3
      resources/js/views/settings/Account.vue
  42. 2 2
      resources/js/views/settings/OAuth.vue
  43. 4 4
      resources/js/views/settings/Options.vue
  44. 1 1
      resources/js/views/settings/PATokens/Create.vue
  45. 6 6
      resources/js/views/twofaccounts/Create.vue
  46. 4 4
      resources/js/views/twofaccounts/Edit.vue
  47. 1 1
      resources/js/views/twofaccounts/QRcode.vue

+ 1 - 1
app/Api/v1/Controllers/Auth/ForgotPasswordController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\Api\v1\Controllers\Auth;
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;

+ 2 - 2
app/Api/v1/Controllers/Auth/PasswordController.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\Api\v1\Controllers\Auth;
 
-use App\Http\Requests\UserPatchPwdRequest;
+use App\Api\v1\Requests\UserPatchPwdRequest;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;

+ 2 - 2
app/Api/v1/Controllers/Auth/RegisterController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\Api\v1\Controllers\Auth;
 
 use App\User;
-use App\Http\Requests\UserStoreRequest;
+use App\Api\v1\Requests\UserStoreRequest;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Auth\Events\Registered;

+ 1 - 1
app/Api/v1/Controllers/Auth/ResetPasswordController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\Api\v1\Controllers\Auth;
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;

+ 3 - 3
app/Api/v1/Controllers/Auth/UserController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Api\v1\Controllers;
+namespace App\Api\v1\Controllers\Auth;
 
 use App\User;
-use App\Http\Requests\UserUpdateRequest;
-use App\Http\Resources\UserResource;
+use App\Api\v1\Requests\UserUpdateRequest;
+use App\Api\v1\Resources\UserResource;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;

+ 6 - 5
app/Api/v1/Controllers/GroupController.php

@@ -1,13 +1,14 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Api\v1\Controllers;
 
 use App\Group;
 use App\Services\GroupService;
-use App\Http\Requests\GroupStoreRequest;
-use App\Http\Requests\GroupAssignRequest;
-use App\Http\Resources\GroupResource;
-use App\Http\Resources\TwoFAccountCollection;
+use App\Api\v1\Requests\GroupStoreRequest;
+use App\Api\v1\Requests\GroupAssignRequest;
+use App\Api\v1\Resources\GroupResource;
+use App\Api\v1\Resources\TwoFAccountCollection;
+use App\Http\Controllers\Controller;
 
 class GroupController extends Controller
 {

+ 2 - 1
app/Api/v1/Controllers/IconController.php

@@ -1,9 +1,10 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Api\v1\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
+use App\Http\Controllers\Controller;
 
 
 class IconController extends Controller

+ 3 - 2
app/Api/v1/Controllers/QrCodeController.php

@@ -1,11 +1,12 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Api\v1\Controllers;
 
 use App\TwoFAccount;
 use App\Services\QrCodeService;
 use App\Services\TwoFAccountService;
-use App\Http\Requests\QrCodeDecodeRequest;
+use App\Api\v1\Requests\QrCodeDecodeRequest;
+use App\Http\Controllers\Controller;
 
 
 class QrCodeController extends Controller

+ 3 - 3
app/Api/v1/Controllers/SettingController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Api\v1\Controllers;
 
 use App\Exceptions\DbEncryptionException;
 use App\Services\DbEncryptionService;
 use App\Services\SettingServiceInterface;
-use App\Http\Requests\SettingStoreRequest;
-use App\Http\Requests\SettingUpdateRequest;
+use App\Api\v1\Requests\SettingStoreRequest;
+use App\Api\v1\Requests\SettingUpdateRequest;
 use App\Http\Controllers\Controller;
 
 

+ 11 - 10
app/Api/v1/Controllers/TwoFAccountController.php

@@ -1,22 +1,23 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Api\v1\Controllers;
 
 use App\TwoFAccount;
 use App\Exceptions\UndecipherableException;
-use App\Http\Requests\TwoFAccountReorderRequest;
-use App\Http\Requests\TwoFAccountStoreRequest;
-use App\Http\Requests\TwoFAccountUpdateRequest;
-use App\Http\Requests\TwoFAccountBatchRequest;
-use App\Http\Requests\TwoFAccountUriRequest;
-use App\Http\Requests\TwoFAccountDynamicRequest;
-use App\Http\Resources\TwoFAccountCollection;
-use App\Http\Resources\TwoFAccountReadResource;
-use App\Http\Resources\TwoFAccountStoreResource;
+use App\Api\v1\Requests\TwoFAccountReorderRequest;
+use App\Api\v1\Requests\TwoFAccountStoreRequest;
+use App\Api\v1\Requests\TwoFAccountUpdateRequest;
+use App\Api\v1\Requests\TwoFAccountBatchRequest;
+use App\Api\v1\Requests\TwoFAccountUriRequest;
+use App\Api\v1\Requests\TwoFAccountDynamicRequest;
+use App\Api\v1\Resources\TwoFAccountCollection;
+use App\Api\v1\Resources\TwoFAccountReadResource;
+use App\Api\v1\Resources\TwoFAccountStoreResource;
 use App\Services\GroupService;
 use App\Services\TwoFAccountService;
 use Illuminate\Support\Arr;
 use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
 
 class TwoFAccountController extends Controller
 {

+ 1 - 1
app/Api/v1/Requests/GroupAssignRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Api\v1\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

+ 1 - 1
app/Api/v1/Requests/GroupStoreRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Api\v1\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

+ 1 - 1
app/Api/v1/Requests/QrCodeDecodeRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Api\v1\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

+ 1 - 1
app/Api/v1/Requests/SettingStoreRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Api\v1\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

+ 1 - 1
app/Api/v1/Requests/SettingUpdateRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Api\v1\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

+ 1 - 1
app/Api/v1/Requests/TwoFAccountBatchRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Api\v1\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

+ 1 - 1
app/Api/v1/Requests/TwoFAccountDynamicRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Api\v1\Requests;
 
 use Illuminate\Support\Arr;
 use Illuminate\Foundation\Http\FormRequest;

+ 1 - 1
app/Api/v1/Requests/TwoFAccountReorderRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Api\v1\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

+ 1 - 1
app/Api/v1/Requests/TwoFAccountStoreRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Api\v1\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

+ 1 - 1
app/Api/v1/Requests/TwoFAccountUpdateRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Api\v1\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

+ 1 - 1
app/Api/v1/Requests/TwoFAccountUriRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Api\v1\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

+ 1 - 1
app/Api/v1/Requests/UserPatchPwdRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Api\v1\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

+ 1 - 1
app/Api/v1/Requests/UserStoreRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Api\v1\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

+ 1 - 1
app/Api/v1/Requests/UserUpdateRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Api\v1\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

+ 1 - 1
app/Api/v1/Resources/GroupResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Api\v1\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

+ 2 - 2
app/Api/v1/Resources/TwoFAccountCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Api\v1\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -11,7 +11,7 @@ class TwoFAccountCollection extends ResourceCollection
      *
      * @var string
      */
-    public $collects = 'App\Http\Resources\TwoFAccountReadResource';
+    public $collects = 'App\Api\v1\Resources\TwoFAccountReadResource';
 
 
     /**

+ 1 - 1
app/Api/v1/Resources/TwoFAccountReadResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Api\v1\Resources;
 
 class TwoFAccountReadResource extends TwoFAccountStoreResource
 {

+ 1 - 1
app/Api/v1/Resources/TwoFAccountStoreResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Api\v1\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

+ 1 - 1
app/Api/v1/Resources/UserResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Api\v1\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Facades\Auth;

+ 2 - 2
app/Providers/RouteServiceProvider.php

@@ -35,11 +35,11 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function map()
     {
-        $this->mapWebRoutes();
-
         $this->mapApiVersionOneRoutes();
 
         // $this->mapApiVersionTwoRoutes();
+        
+        $this->mapWebRoutes();
     }
 
     /**

+ 4 - 4
resources/js/components/OtpDisplayer.vue

@@ -94,7 +94,7 @@
                 if( id ) {
 
                     this.internal_id = id
-                    const { data } = await this.axios.get('api/twofaccounts/' + this.internal_id)
+                    const { data } = await this.axios.get('api/v1/twofaccounts/' + this.internal_id)
 
                     this.internal_service = data.service
                     this.internal_account = data.account
@@ -132,17 +132,17 @@
             getOtp: async function() {
 
                 if(this.internal_id) {
-                    const { data } =  await this.axios.get('/api/twofaccounts/' + this.internal_id + '/otp')
+                    const { data } =  await this.axios.get('/api/v1/twofaccounts/' + this.internal_id + '/otp')
                     return data
                 }
                 else if(this.internal_uri) {
-                    const { data } =  await this.axios.post('/api/twofaccounts/otp', {
+                    const { data } =  await this.axios.post('/api/v1/twofaccounts/otp', {
                         uri: this.internal_uri
                     })
                     return data
                 }
                 else {
-                    const { data } =  await this.axios.post('/api/twofaccounts/otp', {
+                    const { data } =  await this.axios.post('/api/v1/twofaccounts/otp', {
                         service     : this.internal_service,
                         account     : this.internal_account,
                         icon        : this.internal_icon,

+ 7 - 7
resources/js/views/Accounts.vue

@@ -347,7 +347,7 @@
                 let accounts = []
                 this.selectedAccounts = []
 
-                this.axios.get('api/twofaccounts').then(response => {
+                this.axios.get('api/v1/twofaccounts').then(response => {
                     response.data.forEach((data) => {
                         accounts.push(data)
                     })
@@ -393,7 +393,7 @@
              */
             saveOrder() {
                 this.drag = false
-                this.axios.post('/api/twofaccounts/reorder', {orderedIds: this.accounts.map(a => a.id)})
+                this.axios.post('/api/v1/twofaccounts/reorder', {orderedIds: this.accounts.map(a => a.id)})
             },
 
             /**
@@ -406,7 +406,7 @@
                     this.selectedAccounts.forEach(id => ids.push(id))
 
                     // Backend will delete all accounts at the same time
-                    await this.axios.delete('/api/twofaccounts?ids=' + ids.join())
+                    await this.axios.delete('/api/v1/twofaccounts?ids=' + ids.join())
 
                     // we fetch the accounts again to prevent the js collection being
                     // desynchronize from the backend php collection
@@ -425,9 +425,9 @@
                 // Backend will associate all accounts with the selected group in the same move
                 // or withdraw the accounts if destination is 'no group' (id = 0)
                 if(this.moveAccountsTo === 0) {
-                    await this.axios.patch('/api/twofaccounts/withdraw?ids=' + accountsIds.join() )
+                    await this.axios.patch('/api/v1/twofaccounts/withdraw?ids=' + accountsIds.join() )
                 }
-                else await this.axios.post('/api/groups/' + this.moveAccountsTo + '/assign', {ids: accountsIds} )
+                else await this.axios.post('/api/v1/groups/' + this.moveAccountsTo + '/assign', {ids: accountsIds} )
 
                 // we fetch the accounts again to prevent the js collection being
                 // desynchronize from the backend php collection
@@ -443,7 +443,7 @@
             fetchGroups() {
                 let groups = []
 
-                this.axios.get('api/groups').then(response => {
+                this.axios.get('api/v1/groups').then(response => {
                     response.data.forEach((data) => {
                         groups.push(data)
                     })
@@ -466,7 +466,7 @@
 
                 // In db saving if the user set 2FAuth to memorize the active group
                 if( this.$root.appSettings.rememberActiveGroup ) {
-                    this.form.put('/api/settings/activeGroup', {returnError: true})
+                    this.form.put('/api/v1/settings/activeGroup', {returnError: true})
                     .then(response => {
                         // everything's fine
                     })

+ 2 - 2
resources/js/views/Groups.vue

@@ -79,7 +79,7 @@
 
                 this.isFetching = true
 
-                await this.axios.get('api/groups').then(response => {
+                await this.axios.get('api/v1/groups').then(response => {
                     const groups = []
 
                     response.data.forEach((data) => {
@@ -101,7 +101,7 @@
              */
             deleteGroup(id) {
                 if(confirm(this.$t('groups.confirm.delete'))) {
-                    this.axios.delete('/api/groups/' + id)
+                    this.axios.delete('/api/v1/groups/' + id)
 
                     // Remove the deleted group from the collection
                     this.groups = this.groups.filter(a => a.id !== id)

+ 2 - 2
resources/js/views/Start.vue

@@ -79,7 +79,7 @@
 
         mounted() {
 
-            this.axios.get('api/twofaccounts/count').then(response => {
+            this.axios.get('api/v1/twofaccounts/count').then(response => {
                 this.accountCount = response.data.count
             })
         },
@@ -105,7 +105,7 @@
                 imgdata.append('qrcode', this.$refs.qrcodeInput.files[0]);
                 imgdata.append('inputFormat', 'fileUpload');
 
-                const { data } = await this.form.upload('/api/qrcode/decode', imgdata)
+                const { data } = await this.form.upload('/api/v1/qrcode/decode', imgdata)
 
                 this.$router.push({ name: 'createAccount', params: { decodedUri: data.data } });
             },

+ 1 - 1
resources/js/views/auth/Login.vue

@@ -61,7 +61,7 @@
             // }
 
             next(async vm => {
-                const { data } = await vm.axios.get('api/user/name')
+                const { data } = await vm.axios.get('api/v1/user/name')
 
                 if( data.name ) {
                     vm.username = data.name

+ 1 - 1
resources/js/views/auth/Register.vue

@@ -31,7 +31,7 @@
             async handleSubmit(e) {
                 e.preventDefault()
 
-                this.form.post('/api/user', {returnError: true})
+                this.form.post('/api/v1/user', {returnError: true})
                 .then(response => {
                     this.$router.push({ name: 'accounts', params: { toRefresh: true } })
                 })

+ 1 - 1
resources/js/views/auth/password/Request.vue

@@ -23,7 +23,7 @@
             handleSubmit(e) {
                 e.preventDefault()
 
-                this.form.post('/api/user/password/lost', {returnError: true})
+                this.form.post('/api/v1/user/password/lost', {returnError: true})
                 .then(response => {
                     
                     this.$notify({ type: 'is-success', text: response.data.message, duration:-1 })

+ 1 - 1
resources/js/views/auth/password/Reset.vue

@@ -36,7 +36,7 @@
             handleSubmit(e) {
                 e.preventDefault()
 
-                this.form.post('/api/user/password/reset', {returnError: true})
+                this.form.post('/api/v1/user/password/reset', {returnError: true})
                 .then(response => {
 
                     this.$notify({ type: 'is-success', text: response.data.message, duration:-1 })

+ 1 - 1
resources/js/views/groups/Create.vue

@@ -31,7 +31,7 @@
 
             async createGroup() {
 
-                await this.form.post('/api/groups')
+                await this.form.post('/api/v1/groups')
 
                 if( this.form.errors.any() === false ) {
                     this.$router.push({ name: 'groups' });

+ 1 - 1
resources/js/views/groups/Edit.vue

@@ -33,7 +33,7 @@
 
             async updateGroup() {
 
-                await this.form.put('/api/groups/' + this.id)
+                await this.form.put('/api/v1/groups/' + this.id)
 
                 if( this.form.errors.any() === false ) {
                     this.$router.push({ name: 'groups' })

+ 3 - 3
resources/js/views/settings/Account.vue

@@ -51,7 +51,7 @@
         },
 
         async mounted() {
-            const { data } = await this.formProfile.get('/api/user')
+            const { data } = await this.formProfile.get('/api/v1/user')
 
             this.formProfile.fill(data)
         },
@@ -60,7 +60,7 @@
             submitProfile(e) {
                 e.preventDefault()
 
-                this.formProfile.put('/api/user', {returnError: true})
+                this.formProfile.put('/api/v1/user', {returnError: true})
                 .then(response => {
                     this.$notify({ type: 'is-success', text: this.$t('auth.forms.profile_saved') })
                 })
@@ -78,7 +78,7 @@
             submitPassword(e) {
                 e.preventDefault()
 
-                this.formPassword.patch('/api/user/password', {returnError: true})
+                this.formPassword.patch('/api/v1/user/password', {returnError: true})
                 .then(response => {
 
                     this.$notify({ type: 'is-success', text: response.data.message })

+ 2 - 2
resources/js/views/settings/OAuth.vue

@@ -74,7 +74,7 @@
 
                 this.isFetching = true
 
-                await this.axios.get('/api/oauth/personal-access-tokens').then(response => {
+                await this.axios.get('/api/v1/oauth/personal-access-tokens').then(response => {
                     const tokens = []
 
                     response.data.forEach((data) => {
@@ -108,7 +108,7 @@
             async revokeToken(tokenId) {
                 if(confirm(this.$t('settings.confirm.revoke'))) {
 
-                    await this.axios.delete('/api/oauth/personal-access-tokens/' + tokenId).then(response => {
+                    await this.axios.delete('/api/v1/oauth/personal-access-tokens/' + tokenId).then(response => {
                         // Remove the revoked token from the collection
                         this.tokens = this.tokens.filter(a => a.id !== tokenId)
                         this.$notify({ type: 'is-success', text: this.$t('settings.token_revoked') })

+ 4 - 4
resources/js/views/settings/Options.vue

@@ -120,7 +120,7 @@
         },
 
         async mounted() {
-            const { data } = await this.form.get('/api/settings')
+            const { data } = await this.form.get('/api/v1/settings')
 
             this.form.fillWithKeyValueObject(data)
             this.form.lang = this.$root.$i18n.locale
@@ -133,7 +133,7 @@
                 e.preventDefault()
                 console.log(e)
 
-                // this.form.post('/api/settings/options', {returnError: false})
+                // this.form.post('/api/v1/settings/options', {returnError: false})
                 // .then(response => {
 
                 //     this.$notify({ type: 'is-success', text: response.data.message })
@@ -149,7 +149,7 @@
 
             saveSetting(settingName, event) {
 
-                this.axios.put('/api/settings/' + settingName, { value: event }).then(response => {
+                this.axios.put('/api/v1/settings/' + settingName, { value: event }).then(response => {
                     this.$notify({ type: 'is-success', text: this.$t('settings.forms.setting_saved') })
 
                     if(settingName === 'lang' && response.data.value !== this.$root.$i18n.locale) {
@@ -163,7 +163,7 @@
 
             fetchGroups() {
 
-                this.axios.get('/api/groups').then(response => {
+                this.axios.get('/api/v1/groups').then(response => {
                     response.data.forEach((data) => {
                         if( data.id >0 ) {
                             this.groups.push({

+ 1 - 1
resources/js/views/settings/PATokens/Create.vue

@@ -31,7 +31,7 @@
 
             async generatePAToken() {
 
-                const { data } = await this.form.post('/api/oauth/personal-access-tokens')
+                const { data } = await this.form.post('/api/v1/oauth/personal-access-tokens')
 
                 if( this.form.errors.any() === false ) {
                     this.$router.push({ name: 'settings.oauth', params: { accessToken: data.accessToken, token_id: data.token.id } });

+ 6 - 6
resources/js/views/twofaccounts/Create.vue

@@ -214,7 +214,7 @@
             if( this.$route.params.decodedUri ) {
 
                 // the Start view provided an uri so we parse it and prefill the quick form
-                this.axios.post('/api/twofaccounts/preview', { uri: this.$route.params.decodedUri }).then(response => {
+                this.axios.post('/api/v1/twofaccounts/preview', { uri: this.$route.params.decodedUri }).then(response => {
 
                     this.form.fill(response.data)
                     this.tempIcon = response.data.icon ? response.data.icon : null
@@ -249,7 +249,7 @@
                 // set current temp icon as account icon
                 this.form.icon = this.tempIcon
 
-                await this.form.post('/api/twofaccounts')
+                await this.form.post('/api/v1/twofaccounts')
 
                 if( this.form.errors.any() === false ) {
                     this.$router.push({name: 'accounts', params: { toRefresh: true }});
@@ -282,10 +282,10 @@
                 imgdata.append('inputFormat', 'fileUpload');
 
                 // First we get the uri encoded in the qrcode
-                const { data } = await this.form.upload('/api/qrcode/decode', imgdata)
+                const { data } = await this.form.upload('/api/v1/qrcode/decode', imgdata)
 
                 // Then the otp described by the uri
-                this.axios.post('/api/twofaccounts/preview', { uri: data.data }).then(response => {
+                this.axios.post('/api/v1/twofaccounts/preview', { uri: data.data }).then(response => {
                     this.form.fill(response.data)
                     this.form.secretIsBase32Encoded = 1
                     this.tempIcon = response.data.icon ? response.data.icon : null
@@ -300,7 +300,7 @@
                 let imgdata = new FormData();
                 imgdata.append('icon', this.$refs.iconInput.files[0]);
 
-                const { data } = await this.form.upload('/api/icons', imgdata)
+                const { data } = await this.form.upload('/api/v1/icons', imgdata)
 
                 this.tempIcon = data.filename;
 
@@ -308,7 +308,7 @@
 
             deleteIcon(event) {
                 if(this.tempIcon) {
-                    this.axios.delete('/api/icons/' + this.tempIcon)
+                    this.axios.delete('/api/v1/icons/' + this.tempIcon)
                     this.tempIcon = ''
                 }
             },

+ 4 - 4
resources/js/views/twofaccounts/Edit.vue

@@ -177,7 +177,7 @@
         methods: {
             async getAccount () {
 
-                const { data } = await this.axios.get('/api/twofaccounts/' + this.$route.params.twofaccountId)
+                const { data } = await this.axios.get('/api/v1/twofaccounts/' + this.$route.params.twofaccountId)
 
                 this.form.fill(data)
                 this.form.secretIsBase32Encoded = 1
@@ -201,7 +201,7 @@
                     this.deleteIcon()
                 }
 
-                await this.form.put('/api/twofaccounts/' + this.$route.params.twofaccountId)
+                await this.form.put('/api/v1/twofaccounts/' + this.$route.params.twofaccountId)
 
                 if( this.form.errors.any() === false ) {
                     this.$router.push({name: 'accounts', params: { InitialEditMode: true, toRefresh: true }})
@@ -228,7 +228,7 @@
                 let imgdata = new FormData();
                 imgdata.append('icon', this.$refs.iconInput.files[0]);
 
-                const { data } = await this.form.upload('/api/icons', imgdata)
+                const { data } = await this.form.upload('/api/v1/icons', imgdata)
 
                 this.tempIcon = data;
 
@@ -237,7 +237,7 @@
             deleteIcon(event) {
 
                 if( this.tempIcon && this.tempIcon !== this.form.icon ) {
-                    this.axios.delete('/api/icons/' + this.tempIcon)
+                    this.axios.delete('/api/v1/icons/' + this.tempIcon)
                 }
 
                 this.tempIcon = ''

+ 1 - 1
resources/js/views/twofaccounts/QRcode.vue

@@ -36,7 +36,7 @@
              */
             async getQRcode () {
 
-                const { data } = await this.axios.get('/api/twofaccounts/' + this.$route.params.twofaccountId + '/qrcode')
+                const { data } = await this.axios.get('/api/v1/twofaccounts/' + this.$route.params.twofaccountId + '/qrcode')
                 this.qrcode = data.qrcode
                 
             },