mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12912 from nextcloud/td/oauth2/nextcloud-axios 

Switch to nextcloud-axios for oauth2 app
This commit is contained in:
Roeland Jago Douma 2018-12-07 15:05:52 +01:00 committed by GitHub
parent 1f492322a8 c1f1dd18fc
commit e2d0b84ec7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/oauth2/js/oauth2.js
View File

File diff suppressed because one or more lines are too long

2
apps/oauth2/js/oauth2.js.map
View File

File diff suppressed because one or more lines are too long

21
apps/oauth2/package-lock.json generated
View File

@ -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",

2
apps/oauth2/package.json
View File

@ -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": {

19
apps/oauth2/src/App.vue
View File

@ -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);