법인 회원 초대 방법 개선

src/main/java/com/eactive/apim/portal/apps/main/controller/IndexController.java

@@ -19,6 +19,7 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+
 @Controller
 @RequiredArgsConstructor
 public class IndexController {

src/main/java/com/eactive/apim/portal/config/PortalAuthenticationSuccessHandler.java

@@ -1,9 +1,11 @@
 package com.eactive.apim.portal.config;
 
+import com.eactive.apim.portal.apps.user.repository.PortalOrgRepository;
 import com.eactive.apim.portal.apps.user.service.PortalUserLogService;
 import com.eactive.apim.portal.invitation.entity.UserInvitation;
 import com.eactive.apim.portal.invitation.entity.UserInvitationEnums.InvitationStatus;
 import com.eactive.apim.portal.invitation.repository.UserInvitationRepository;
+import com.eactive.apim.portal.portalorg.entity.PortalOrg;
 import com.eactive.apim.portal.portaluser.entity.PortalUser;
 import com.eactive.apim.portal.portaluser.entity.PortalUserEnums;
 import com.eactive.apim.portal.portaluser.entity.UserPasswordHistory;
@@ -38,6 +40,7 @@ public class PortalAuthenticationSuccessHandler implements AuthenticationSuccess
     private final UserPasswordHistoryRepository passwordHistoryRepository;
     private final MessageRequestRepository messageRequestRepository;
     private final UserInvitationRepository userInvitationRepository;
+    private final PortalOrgRepository portalOrgRepository;
 
     @Override
     public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
@@ -78,18 +81,23 @@ public class PortalAuthenticationSuccessHandler implements AuthenticationSuccess
             session.setAttribute("redirectUrl", contextPath + "/new_password");
         }
 
-        // 초대 코드 확인 - ROLE_USER만 확인
+        // 초대 코드 확인 - ROLE_USER만 확인 (세션에 저장하여 메인 페이지에서 팝업으로 표시)
         if (user.getRoleCode() == PortalUserEnums.RoleCode.ROLE_USER) {
             Optional<UserInvitation> pendingInvitation =
                 userInvitationRepository.findFirstByInvitationEmailAndStatus(
                     user.getLoginId(), InvitationStatus.PENDING);
 
             if (pendingInvitation.isPresent()) {
-                // 만료되지 않은 초대가 있으면 자동으로 초대 수락 페이지로 이동
                 UserInvitation invitation = pendingInvitation.get();
                 if (invitation.getExpiresOn().isAfter(LocalDateTime.now())) {
-                    response.sendRedirect(contextPath + "/signup/decision?invitation=" + invitation.getToken());
-                    return;
+                    // 세션에 초대 정보 저장 (메인 페이지에서 팝업으로 표시)
+                    session.setAttribute("pendingInvitation", true);
+                    session.setAttribute("pendingInvitationToken", invitation.getToken());
+                    // orgId로 기관명 조회
+                    String orgName = portalOrgRepository.findById(invitation.getOrgId())
+                        .map(PortalOrg::getOrgName)
+                        .orElse("알 수 없는 기관");
+                    session.setAttribute("pendingInvitationOrgName", orgName);
                 }
             }
         }

src/main/resources/templates/views/apps/login/login.html

@@ -70,13 +70,6 @@
                             <img th:src="@{/img/icon/icon_login_join.png}" alt="">
                             <a th:href="@{/signup}">회원가입</a>
                         </li>
-                        <li>
-                            <span>|</span>
-                        </li>
-                        <li class="icon_join">
-                            <img th:src="@{/img/icon/icon_login_join.png}" alt="">
-                            <a th:href="@{/signup/invitation-code}">초대를 받으셨나요?</a>
-                        </li>
                     </ul>
                 </div>
                 <div class="login_list m-only">

src/main/resources/templates/views/apps/main/index.html

@@ -299,6 +299,20 @@
           customPopups.hideAlert('#customAlert');
           window.location.href = redirectUrl;
         });
+        return;  // 다른 체크 중단
+      }
+
+      // 초대 대기 확인 (로그인할 때마다 표시)
+      const pendingInvitation = [[${session.pendingInvitation}]];
+      if (pendingInvitation) {
+        const invitationToken = /*[[${session.pendingInvitationToken}]]*/ '';
+        const orgName = /*[[${session.pendingInvitationOrgName}]]*/ '';
+
+        customPopups.showConfirm(`<strong>${orgName}</strong>에서 초대가 도착했습니다.<br>초대를 확인하시겠습니까?`, function (selection) {
+          if (selection) {
+            window.location.href = '/signup/decision?invitation=' + invitationToken;
+          }
+        });
       }
     });
   </script>