diff --git a/poc/.idea/.gitignore b/poc/.idea/.gitignore new file mode 100644 index 0000000..a9d7db9 --- /dev/null +++ b/poc/.idea/.gitignore @@ -0,0 +1,10 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# GitHub Copilot persisted chat sessions +/copilot/chatSessions diff --git a/poc/.idea/compiler.xml b/poc/.idea/compiler.xml new file mode 100644 index 0000000..6c087ce --- /dev/null +++ b/poc/.idea/compiler.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/poc/.idea/dataSources.xml b/poc/.idea/dataSources.xml new file mode 100644 index 0000000..0560e41 --- /dev/null +++ b/poc/.idea/dataSources.xml @@ -0,0 +1,12 @@ + + + + + mariadb + true + org.mariadb.jdbc.Driver + jdbc:mariadb://localhost:3307/admin-system + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/poc/.idea/gradle.xml b/poc/.idea/gradle.xml new file mode 100644 index 0000000..c89c001 --- /dev/null +++ b/poc/.idea/gradle.xml @@ -0,0 +1,16 @@ + + + + + + + \ No newline at end of file diff --git a/poc/.idea/inspectionProfiles/Project_Default.xml b/poc/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..cb96b93 --- /dev/null +++ b/poc/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,15 @@ + + + + \ No newline at end of file diff --git a/poc/.idea/jarRepositories.xml b/poc/.idea/jarRepositories.xml new file mode 100644 index 0000000..fdc392f --- /dev/null +++ b/poc/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/poc/.idea/jsLibraryMappings.xml b/poc/.idea/jsLibraryMappings.xml new file mode 100644 index 0000000..17f0d7e --- /dev/null +++ b/poc/.idea/jsLibraryMappings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/poc/.idea/misc.xml b/poc/.idea/misc.xml new file mode 100644 index 0000000..6408547 --- /dev/null +++ b/poc/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/poc/.idea/modules.xml b/poc/.idea/modules.xml new file mode 100644 index 0000000..4312957 --- /dev/null +++ b/poc/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/poc/.idea/poc.iml b/poc/.idea/poc.iml new file mode 100644 index 0000000..dc88000 --- /dev/null +++ b/poc/.idea/poc.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/poc/.idea/vcs.xml b/poc/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/poc/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/poc/admin/database/init.sql b/poc/admin/database/init.sql new file mode 100644 index 0000000..8452399 --- /dev/null +++ b/poc/admin/database/init.sql @@ -0,0 +1,4 @@ +CREATE DATABASE IF NOT EXISTS `admin-system`; +CREATE USER IF NOT EXISTS 'admin'@'%' IDENTIFIED BY '1234'; +GRANT ALL PRIVILEGES ON `admin-system`.* TO 'admin'@'%'; +FLUSH PRIVILEGES; \ No newline at end of file diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java index cff7688..012b18f 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java @@ -18,8 +18,6 @@ import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; @@ -75,6 +73,7 @@ public class SecurityConfig { .anyRequest() .access(new CustomAuthorizationManager(authorizationAppService)) ); + } private void configureFormLogin(HttpSecurity http) throws Exception { diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/jwt/JwtTokenConstants.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/jwt/JwtTokenConstants.java index 199ec4c..35abb22 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/jwt/JwtTokenConstants.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/jwt/JwtTokenConstants.java @@ -11,6 +11,6 @@ public class JwtTokenConstants { public static final String KEY = "8530b13adb4e420d9694b27570635b47"; public static final String ACCESS_TOKEN_NAME = "AT"; public static final String REFRESH_TOKEN_NAME = "RT"; - public static final long AT_EXPIRATION_TIME = 30 * 1000; - public static final long RT_EXPIRATION_TIME = 60 * 1000; + public static final long AT_EXPIRATION_TIME = 30 * 30 * 1000; + public static final long RT_EXPIRATION_TIME = 30* 60 * 1000; } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/tab/TabRestController.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/tab/TabRestController.java index 2f3e8a9..e121add 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/tab/TabRestController.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/tab/TabRestController.java @@ -27,8 +27,7 @@ public class TabRestController { @PostMapping("/tab/add") public ResponseEntity addTab( - @RequestBody @Valid TabCreate.Request request , - BindingResult bindingResult + @RequestBody @Valid TabCreate.Request request ) { TabCreate.Response response = tabAppService.addTab(request); return ResponseEntity.ok(response); diff --git a/poc/admin/src/main/resources/static/js/reqhelper.js b/poc/admin/src/main/resources/static/js/reqhelper.js index 0a005e0..032b9e7 100644 --- a/poc/admin/src/main/resources/static/js/reqhelper.js +++ b/poc/admin/src/main/resources/static/js/reqhelper.js @@ -34,6 +34,7 @@ const Reqhelper = { } }) .finally(() => { + refreshCsrf(); if (fFunc) { fFunc(); } @@ -66,6 +67,7 @@ const Reqhelper = { } }) .catch((error) => { + refreshCsrf(); if (eFunc) { eFunc(error); } @@ -81,13 +83,13 @@ const Reqhelper = { } function refreshCsrf() { - fetch('/csrf', { + return fetch('/csrf', { method: 'GET', headers: { 'Content-Type': 'application/json' } }).then(response => { - response.json().then(data => { + return response.json().then(data => { const csrfToken = data.token; document.querySelector('meta[name="_csrf"]').setAttribute('content', csrfToken); }); diff --git a/poc/admin/src/main/resources/templates/layout/common.html b/poc/admin/src/main/resources/templates/layout/common.html index 593cdb7..2b76b9e 100644 --- a/poc/admin/src/main/resources/templates/layout/common.html +++ b/poc/admin/src/main/resources/templates/layout/common.html @@ -60,18 +60,34 @@ // 탭 생성 및 DB Insert 메서드 function addTab(tabName, url) { - Reqhelper.reqPostJson('/admin/tab/add', { - name: tabName, - url: url - }, function(response) { - console.log('Tab created successfully'); - const tabId = response.id; - createTab(tabId, tabName, url); - openTab({currentTarget: $(`#${tabId}-tab`)}, tabId); - loadTabContent(tabId, url); - }, function() { - console.log('Failed to create tab'); - }); + if (url !== '/main'){ + refreshCsrf().then(() => { + var csrfToken = $("meta[name='_csrf']").attr("content"); + var csrfHeader = $("meta[name='_csrf_header']").attr("content"); + $.ajax({ + url: '/admin/tab/add', + type: 'POST', + data: JSON.stringify({ + name: tabName, + url: url + }), + beforeSend: function(xhr) { + xhr.setRequestHeader(csrfHeader, csrfToken); + }, + contentType: 'application/json', + success: function(response) { + const tabId = response.id; + createTab(tabId, tabName, url); + openTab({currentTarget: $(`#${tabId}-tab`)}, tabId); + loadTabContent(tabId, url); + console.log('Tab created successfully'); + }, + error: function() { + console.log('Failed to create tab'); + } + }); + }); + } } function loadTabContent(tabId, url) { @@ -135,12 +151,12 @@ } function deleteTab(event, tabId) { - $(`#${tabId}`).remove(); - $(`#${tabId}-tab`).parent().remove(); - event.stopPropagation(); Reqhelper.reqPostJson('/admin/tab/delete', { id : tabId }, function() { + $(`#${tabId}`).remove(); + $(`#${tabId}-tab`).parent().remove(); + event.stopPropagation(); console.log('Tab deleted successfully'); }, function() { console.log('Failed to delete tab');