Merge pull request #79 from ProgrammingLab/kp-fix-data

response.dataを返す

Author: Fukusan64

src/api/oauth/index.js

@@ -2,19 +2,19 @@ import api from '@/api';
 
 export default {
   async startOAuthLogin(loginChallenge) {
-    const res = await api.client.get('/oauth/login', { params: { loginChallenge } });
+    const res = (await api.client.get('/oauth/login', { params: { loginChallenge } })).data;
     return res;
   },
   async login(loginChallenge, name, password) {
-    const res = await api.client.post('/oauth/login', { loginChallenge, name, password });
+    const res = (await api.client.post('/oauth/login', { loginChallenge, name, password })).data;
     return res;
   },
   async startOAuthConsent(consentChallenge) {
-    const res = await api.client.get('/oauth/consent', { params: { consentChallenge } });
+    const res = (await api.client.get('/oauth/consent', { params: { consentChallenge } })).data;
     return res;
   },
   async consent(consentChallenge, accept, grantScopes) {
-    const res = await api.client.post('/oauth/consent', { consentChallenge, accept, grantScopes });
+    const res = (await api.client.post('/oauth/consent', { consentChallenge, accept, grantScopes })).data;
     return res;
   },
 };

src/api/session/index.js

@@ -2,7 +2,7 @@ import api from '@/api';
 
 export default {
   async createSession(name, password) {
-    const res = await api.client.post('/sessions', { name, password });
+    const res = (await api.client.post('/sessions', { name, password })).data;
     return res;
   },
 };

src/store/modules/oauth/consent.js

@@ -37,10 +37,10 @@ export default {
       try {
         const resp = await oauthClient.startOAuthConsent(challenge);
         commit('setConsentRequest', {
-          skip: resp.data.skip,
-          redirectURL: resp.data.redirect_url,
-          requestedScopes: resp.data.requested_scopes,
-          client: resp.data.client,
+          skip: resp.skip,
+          redirectURL: resp.redirect_url,
+          requestedScopes: resp.requested_scopes,
+          client: resp.client,
         });
       } catch (e) {
         commit('setChallengeError', e);
@@ -50,15 +50,15 @@ export default {
     async accept({ commit, state }, challenge) {
       try {
         const resp = await oauthClient.consent(challenge, true, state.requestedScopes);
-        commit('setRedirectURL', resp.data.redirect_url);
+        commit('setRedirectURL', resp.redirect_url);
       } catch (e) {
         commit('setChallengeError', e);
       }
     },
     async reject({ commit, state }, challenge) {
       try {
         const resp = await oauthClient.consent(challenge, false, state.requestedScopes);
-        commit('setRedirectURL', resp.data.redirect_url);
+        commit('setRedirectURL', resp.redirect_url);
       } catch (e) {
         commit('setChallengeError', e);
       }

src/store/modules/oauth/login.js

@@ -34,8 +34,8 @@ export default {
       try {
         const resp = await oauthClient.startOAuthLogin(challenge);
         commit('setLoginRequest', {
-          skip: resp.data.skip,
-          redirectURL: resp.data.redirect_url,
+          skip: resp.skip,
+          redirectURL: resp.redirect_url,
         });
       } catch (e) {
         commit('setLoginRequest', { challengeError: e });
@@ -45,7 +45,7 @@ export default {
     async login({ commit }, { challenge, name, password }) {
       try {
         const resp = await oauthClient.login(challenge, name, password);
-        commit('setRedirectURL', resp.data.redirect_url);
+        commit('setRedirectURL', resp.redirect_url);
       } catch (e) {
         commit('setLoginError', e);
       }

src/store/modules/session/index.js

@@ -27,7 +27,7 @@ export default {
       commit('clearLoginError');
       try {
         const res = await sesssionClient.createSession(name, password);
-        commit('setSessionID', res.data.session_id);
+        commit('setSessionID', res.session_id);
       } catch (e) {
         commit('setLoginError', e);
       }