ログアウトサーバーリクエストの実装

sai-gillingham · Sep 19, 2023 · eb7b6c2 · eb7b6c2
1 parent 7d0fe01
commit eb7b6c2
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 14 deletions.
diff --git a/src/state/ducks/front/login/api.ts b/src/state/ducks/front/login/api.ts
@@ -2,14 +2,5 @@ import OAuthApiUtils from "../../../../utils/OAuthApiUtils";
 
 export function callLogin(params) {
     console.log(params);
-    return new OAuthApiUtils().post(
-        "token",
-        {
-            "grant_type":"password",
-            "client_id": process.env.REACT_APP_API_CLIENT_KEY,
-            "username":params.username,
-            "password":params.password,
-            "scope":"read write"
-        }
-    )
+    return new OAuthApiUtils().login(params.username, params.password);
 }
diff --git a/src/state/ducks/shared/oauth/api.ts b/src/state/ducks/shared/oauth/api.ts
@@ -11,5 +11,5 @@ export function refreshToken(refresh_token: string) {
 }
 
 export function logoutAPI(access_token: string) {
-    // @TODO: Implement logout API
+    return new oAuthApiUtils().logout(access_token);
 }
diff --git a/src/utils/OAuthApiUtils.ts b/src/utils/OAuthApiUtils.ts
@@ -8,7 +8,6 @@ export default class OAuthApiUtils {
      * @param {string|null} baseurl カスタムURL
      */
     constructor(timeout = null, baseurl = null) {
-        // @TODO: CHANGE TO CORRECT URL
         axios.defaults.baseURL = baseurl  || 'http://localhost:8080';
         axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded';
         axios.defaults.timeout = timeout || process.env.REACT_APP_ECCUBE_TIMEOUT;
@@ -18,13 +17,15 @@ export default class OAuthApiUtils {
      * oAuth API POST リクエスト
      * @param {string} uri API アクセスポイント
      * @param {Object} body Post データ
+     * @param headers headers 
      * @returns {Promise<axios.AxiosResponse<any>> | *} (API|Network) リスポンス
      */
-    post(uri, body) {
+    post(uri, body, headers = {}) {
         return axios({
             method: 'POST',
             url: uri,
-            data: body
+            data: body,
+            headers: headers
         });
     }
 
@@ -33,6 +34,39 @@ export default class OAuthApiUtils {
             'refresh_token': refreshToken
         })
     }
+
+    /**
+     * サーバーですべてのACCESS_TOKENを削除
+     * 
+     * @param accessToken
+     */
+    logout(accessToken: string) {
+        return this.post(
+            "/api/logout", {}, {
+                "Authorization": "Bearer " + accessToken,
+            }
+        )
+    }
+
+    /**
+     * ログイン
+     * 
+     * @param accountEmail
+     * @param password
+     */
+    login(accountEmail : string, password : string) {
+        return this.post(
+            "token",
+            {
+                "grant_type":"password",
+                "client_id": process.env.REACT_APP_API_CLIENT_KEY,
+                "username": accountEmail,
+                "password": password
+            }
+        )
+
+    }
+
 }
 
 export {axios};