Bladeren bron

ui completed

HANTE 1 maand geleden
bovenliggende
commit
acb2192e67
2 gewijzigde bestanden met toevoegingen van 12 en 42 verwijderingen
  1. 12 4
      src/main/resources/static/js/common.js
  2. 0 38
      src/main/resources/static/js/lib/ajax.js

+ 12 - 4
src/main/resources/static/js/common.js

@@ -22,12 +22,20 @@ export function apiRequest(method, url, payload = null, {
         return Promise.reject("토큰 없음");
     }
 
+    const headers = {};
+    // 인증이 필요한 경우에만 Authorization 헤더 추가
+    if (requireAuth && token) {
+        headers["Authorization"] = `Bearer ${token}`;
+    }
 
-    const normalizedMethod = method.toUpperCase();
-    const headers = {
-        "Authorization": `Bearer ${token}`
-    };
+    // CSRF 토큰 자동 추가
+    const csrfToken = document.querySelector("meta[name='_csrf']")?.content;
+    const csrfHeader = document.querySelector("meta[name='_csrf_header']")?.content;
+    if (csrfToken && csrfHeader) {
+        headers[csrfHeader] = csrfToken;
+    }
 
+    const normalizedMethod = method.toUpperCase();
     let fullUrl = url;
     let body = null;
 

+ 0 - 38
src/main/resources/static/js/lib/ajax.js

@@ -1,38 +0,0 @@
-function requestService(url, param, callback, async) {
-    /*
-     * 스프링시큐리티 csrf 토큰 에러때문에  ajax 통신시 해더에 포함해줘야한다.
-     */
-    var token = $("meta[name='_csrf']").attr("content");
-    var header = $("meta[name='_csrf_header']").attr("content");
-
-    if (async) {
-
-        async = true;
-    }
-
-    $.ajax({
-        url: "/" + url
-        , data: encodeURI(param)
-        , cache: false
-        , async: async
-        , type: 'POST'
-        , statusCode: {
-            301: function(resp){
-                window.location.reload();
-            },
-            302: function(resp){
-                window.location.reload();
-            }
-        }
-        , beforeSend: function (xhr) {
-            if(header != null) xhr.setRequestHeader(header, token);
-        }
-
-    })
-        .done(callback)
-        .fail(function (request,status,e) {
-        console.log("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+e);
-    });
-}
-
-