diff --git a/src/main/java/com/eactive/apim/portal/apps/user/controller/AccountController.java b/src/main/java/com/eactive/apim/portal/apps/user/controller/AccountController.java index fec67da..e7dcd34 100644 --- a/src/main/java/com/eactive/apim/portal/apps/user/controller/AccountController.java +++ b/src/main/java/com/eactive/apim/portal/apps/user/controller/AccountController.java @@ -16,7 +16,9 @@ import com.eactive.apim.portal.invitation.repository.UserInvitationRepository; import com.eactive.apim.portal.portaluser.entity.PortalUserEnums; import com.eactive.apim.portal.portaluser.entity.PortalUserEnums.RoleCode; import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -36,6 +38,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; @@ -271,18 +274,20 @@ public class AccountController { @PostMapping("/mypage/org-transfer") - public String processOrgTransfer( + @ResponseBody + public Map processOrgTransfer( @ModelAttribute PortalOrgRegistrationDTO orgDTO, @ModelAttribute UserAgreementDTO agreementDTO, HttpServletRequest request, - HttpServletResponse response, - RedirectAttributes redirectAttributes) { + HttpServletResponse response) { + Map result = new HashMap<>(); try { var currentUser = SecurityUtil.getPortalAuthenticatedUser(); if (currentUser.getRoleCode() != PortalUserEnums.RoleCode.ROLE_USER) { - redirectAttributes.addFlashAttribute("error", "잘못된 접근입니다."); - return "redirect:/mypage"; + result.put("status", "ERROR"); + result.put("message", "잘못된 접근입니다."); + return result; } ValidationResponse validationResponse = orgRegisterFacade.convertToOrgUser( @@ -310,16 +315,20 @@ public class AccountController { } } - redirectAttributes.addFlashAttribute("success", validationResponse.getMessage()); - return "apps/mypage/UserConversionCompleted"; + result.put("status", "SUCCESS"); + result.put("message", validationResponse.getMessage()); + result.put("redirectUrl", "/"); + return result; } else { - redirectAttributes.addFlashAttribute("error", validationResponse.getMessage()); - return "redirect:/mypage/org-transfer"; + result.put("status", "ERROR"); + result.put("message", validationResponse.getMessage()); + return result; } } catch (Exception e) { - redirectAttributes.addFlashAttribute("error", "법인회원 전환 중 오류가 발생했습니다: " + e.getMessage()); - return "redirect:/mypage/org-transfer"; + result.put("status", "ERROR"); + result.put("message", "법인회원 전환 중 오류가 발생했습니다: " + e.getMessage()); + return result; } } diff --git a/src/main/resources/templates/views/apps/apis/mainApiDetail.html b/src/main/resources/templates/views/apps/apis/mainApiDetail.html index f932709..379adac 100644 --- a/src/main/resources/templates/views/apps/apis/mainApiDetail.html +++ b/src/main/resources/templates/views/apps/apis/mainApiDetail.html @@ -30,29 +30,13 @@ - -