diff --git a/apps/oauth2/js/oauth2.js b/apps/oauth2/js/oauth2.js index d945943cc124a5893845291b85980ffef048e069..bee405287539134dc2f3fc96263e4e09b3e21e30 100644 Binary files a/apps/oauth2/js/oauth2.js and b/apps/oauth2/js/oauth2.js differ diff --git a/apps/oauth2/js/oauth2.js.map b/apps/oauth2/js/oauth2.js.map index 3a38e135be712f9404f108f210373cbdfd9ddab9..1754157b98df8dd354944ec7b768adb296bd6a13 100644 Binary files a/apps/oauth2/js/oauth2.js.map and b/apps/oauth2/js/oauth2.js.map differ diff --git a/apps/oauth2/package-lock.json b/apps/oauth2/package-lock.json index cdca27cbba5f4020953c395c6320735ccb41ab11..37d4afc1f866615b88022cd26c72fc6e3b76747a 100644 --- a/apps/oauth2/package-lock.json +++ b/apps/oauth2/package-lock.json @@ -1529,7 +1529,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -1944,7 +1945,8 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -2000,6 +2002,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -2043,12 +2046,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -2854,6 +2859,14 @@ "integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==", "dev": true }, + "nextcloud-axios": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/nextcloud-axios/-/nextcloud-axios-0.1.3.tgz", + "integrity": "sha512-M2eLX0qrP8xy1VEGDhPXGwvV4W4gMnU1ysjnURVen8ehR1qRLdb/JfhJHab6XRsme7vWWMgSTEj+o3ibQ94N6g==", + "requires": { + "axios": "^0.18.0" + } + }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", diff --git a/apps/oauth2/package.json b/apps/oauth2/package.json index 33c2fc6731d002e3f41fd696d7534942289481da..fe8da421d605cdfe6c6d7945e0cfd28b0092d087 100644 --- a/apps/oauth2/package.json +++ b/apps/oauth2/package.json @@ -16,7 +16,7 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "dependencies": { - "axios": "^0.18.0", + "nextcloud-axios": "^0.1.3", "vue": "^2.5.17" }, "devDependencies": { diff --git a/apps/oauth2/src/App.vue b/apps/oauth2/src/App.vue index c9c01fc11e09321e8fafb74e3a066e531b32e249..036af6ca25fd5e186f676123b025eb65c6afe9dd 100644 --- a/apps/oauth2/src/App.vue +++ b/apps/oauth2/src/App.vue @@ -54,7 +54,7 @@ </template> <script> -import axios from 'axios'; +import Axios from 'nextcloud-axios' import OAuthItem from './components/OAuthItem'; export default { @@ -74,36 +74,27 @@ export default { }; }, beforeMount: function() { - let requestToken = OC.requestToken; - let tokenHeaders = { headers: { requesttoken: requestToken } }; - - axios.get(OC.generateUrl('apps/oauth2/clients'), tokenHeaders) + Axios.get(OC.generateUrl('apps/oauth2/clients')) .then((response) => { this.clients = response.data; }); }, methods: { deleteClient(id) { - let requestToken = OC.requestToken; - let tokenHeaders = { headers: { requesttoken: requestToken } }; - - axios.delete(OC.generateUrl('apps/oauth2/clients/{id}', {id: id}), tokenHeaders) + Axios.delete(OC.generateUrl('apps/oauth2/clients/{id}', {id: id})) .then((response) => { this.clients = this.clients.filter(client => client.id !== id); }); }, addClient() { - let requestToken = OC.requestToken; - let tokenHeaders = { headers: { requesttoken: requestToken } }; this.newClient.error = false; - axios.post( + Axios.post( OC.generateUrl('apps/oauth2/clients'), { name: this.newClient.name, redirectUri: this.newClient.redirectUri - }, - tokenHeaders + } ).then(response => { this.clients.push(response.data);