Feat/pdjb 260 handle auth and landlord registration during JL acceptance

src/main/kotlin/uk/gov/communities/prsdb/webapp/config/security/LandlordSecurityConfig.kt

@@ -28,10 +28,14 @@ import uk.gov.communities.prsdb.webapp.config.security.DefaultSecurityConfig.Com
 import uk.gov.communities.prsdb.webapp.config.security.DefaultSecurityConfig.Companion.PERMISSIONS_POLICY_DIRECTIVES
 import uk.gov.communities.prsdb.webapp.constants.OneLoginClaimKeys
 import uk.gov.communities.prsdb.webapp.controllers.AcceptOrRejectJointLandlordInvitationController
+import uk.gov.communities.prsdb.webapp.controllers.AcceptOrRejectJointLandlordInvitationController.Companion.INVITATION_REJECTED_PATH_SEGMENT
 import uk.gov.communities.prsdb.webapp.controllers.BetaFeedbackController
 import uk.gov.communities.prsdb.webapp.controllers.LandlordPrivacyNoticeController
 import uk.gov.communities.prsdb.webapp.controllers.PasscodeEntryController
 import uk.gov.communities.prsdb.webapp.controllers.RegisterLandlordController
+import uk.gov.communities.prsdb.webapp.journeys.acceptOrRejectJointLandlordInvitation.steps.AcceptOrRejectStep
+import uk.gov.communities.prsdb.webapp.journeys.acceptOrRejectJointLandlordInvitation.steps.InviteUnavailableStep
+import uk.gov.communities.prsdb.webapp.journeys.acceptOrRejectJointLandlordInvitation.steps.ValidateTokenStep
 import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.IdentityVerifyingStep
 import uk.gov.communities.prsdb.webapp.services.UserRolesService
 
@@ -66,9 +70,21 @@ class LandlordSecurityConfig(
                     .requestMatchers(AcceptOrRejectJointLandlordInvitationController.ACCEPT_OR_REJECT_JOINT_LANDLORD_INVITATION_ROUTE)
                     .permitAll()
                     .requestMatchers(
-                        "${AcceptOrRejectJointLandlordInvitationController.ACCEPT_OR_REJECT_JOINT_LANDLORD_INVITATION_ROUTE}/**",
-                    )
-                    .permitAll()
+                        AcceptOrRejectJointLandlordInvitationController.ACCEPT_OR_REJECT_JOINT_LANDLORD_INVITATION_ROUTE +
+                            "/${ValidateTokenStep.ROUTE_SEGMENT}",
+                    ).permitAll()
+                    .requestMatchers(
+                        AcceptOrRejectJointLandlordInvitationController.ACCEPT_OR_REJECT_JOINT_LANDLORD_INVITATION_ROUTE +
+                            "/${InviteUnavailableStep.ROUTE_SEGMENT}",
+                    ).permitAll()
+                    .requestMatchers(
+                        AcceptOrRejectJointLandlordInvitationController.ACCEPT_OR_REJECT_JOINT_LANDLORD_INVITATION_ROUTE +
+                            "/${AcceptOrRejectStep.ROUTE_SEGMENT}",
+                    ).permitAll()
+                    .requestMatchers(
+                        AcceptOrRejectJointLandlordInvitationController.ACCEPT_OR_REJECT_JOINT_LANDLORD_INVITATION_ROUTE +
+                            "/$INVITATION_REJECTED_PATH_SEGMENT",
+                    ).permitAll()
                     .anyRequest()
                     .authenticated()
             }.oauth2Login { oauth ->

src/main/kotlin/uk/gov/communities/prsdb/webapp/constants/SessionAttributes.kt

@@ -2,8 +2,6 @@ package uk.gov.communities.prsdb.webapp.constants
 
 const val LOCAL_COUNCIL_USER_INVITATION_TOKEN: String = "local-council-user-invitation-token"
 
-const val JOINT_LANDLORD_INVITATION_TOKEN: String = "joint-landlord-invitation-token"
-
 const val LOCAL_COUNCIL_USER_ID = "local-council-user-id"
 
 const val PROPERTY_REGISTRATION_NUMBER = "propertyRegistrationNumber"
@@ -33,3 +31,8 @@ const val LOCAL_COUNCIL_USERS_INVITED_THIS_SESSION = "localCouncilUsersInvitedTh
 const val INCOMPLETE_PROPERTY_FORM_CONTEXTS_DELETED_THIS_SESSION = "incompletePropertyFormContextsDeletedThisSession"
 
 const val VERIFIED_IDENTITY_CACHE_KEY = "verified-identity-cache"
+
+const val USER_SENT_TO_LANDLORD_REGISTRATION_WHILE_ACCEPTING_JOINT_LANDLORD_INVITATION =
+    "userSentToLandlordRegistrationWhileAcceptingJointLandlordInvitation"
+
+const val JOINT_LANDLORD_INVITATION_TOKEN_WITH_ACCEPTANCE_JOURNEY_IDS = "jointLandlordInvitationTokenWithAcceptanceJourneyIds"

src/main/kotlin/uk/gov/communities/prsdb/webapp/constants/UrlParameterNames.kt

@@ -4,3 +4,4 @@ const val CHECKING_ANSWERS_FOR_PARAMETER_NAME = "checkingAnswersFor"
 const val WITH_BACK_URL_PARAMETER_NAME = "withBackUrl"
 const val CONTEXT_ID_URL_PARAMETER = "contextId"
 const val TOKEN = "token"
+const val JOURNEY_ID = "journeyId"

src/main/kotlin/uk/gov/communities/prsdb/webapp/controllers/AcceptOrRejectJointLandlordInvitationController.kt

@@ -18,45 +18,47 @@ import uk.gov.communities.prsdb.webapp.constants.JOINT_LANDLORD_INVITATION_PATH_
 import uk.gov.communities.prsdb.webapp.constants.LANDLORD_PATH_SEGMENT
 import uk.gov.communities.prsdb.webapp.constants.TOKEN
 import uk.gov.communities.prsdb.webapp.controllers.AcceptOrRejectJointLandlordInvitationController.Companion.ACCEPT_OR_REJECT_JOINT_LANDLORD_INVITATION_ROUTE
-import uk.gov.communities.prsdb.webapp.exceptions.PrsdbWebException
 import uk.gov.communities.prsdb.webapp.journeys.FormData
 import uk.gov.communities.prsdb.webapp.journeys.JourneyStateService
 import uk.gov.communities.prsdb.webapp.journeys.NoSuchJourneyException
 import uk.gov.communities.prsdb.webapp.journeys.acceptOrRejectJointLandlordInvitation.AcceptOrRejectJointLandlordInvitationJourneyFactory
 import uk.gov.communities.prsdb.webapp.journeys.acceptOrRejectJointLandlordInvitation.steps.ValidateTokenStep
 import uk.gov.communities.prsdb.webapp.services.JointLandlordInvitationService
+import uk.gov.communities.prsdb.webapp.services.UserRolesService
 
 @PrsdbController
 @RequestMapping(ACCEPT_OR_REJECT_JOINT_LANDLORD_INVITATION_ROUTE)
 class AcceptOrRejectJointLandlordInvitationController(
     private val journeyFactory: AcceptOrRejectJointLandlordInvitationJourneyFactory,
     private val invitationService: JointLandlordInvitationService,
+    private val userRolesService: UserRolesService,
 ) {
     @GetMapping
     @AvailableWhenFeatureEnabled(JOINT_LANDLORDS)
     fun startJourney(
         @RequestParam(value = TOKEN, required = true) token: String,
     ): ModelAndView {
-        invitationService.storeTokenInSession(token)
-        return initializeAndRedirect(
-            token,
-            ValidateTokenStep.ROUTE_SEGMENT,
-            "${ACCEPT_OR_REJECT_JOINT_LANDLORD_INVITATION_ROUTE}/${ValidateTokenStep.ROUTE_SEGMENT}",
-        )
+        val journeyId = journeyFactory.initializeJourneyState(token)
+        invitationService.addJourneyIdInvitationTokenPairToSession(journeyId, token)
+        val redirectUrl =
+            JourneyStateService.urlWithJourneyState(
+                "${ACCEPT_OR_REJECT_JOINT_LANDLORD_INVITATION_ROUTE}/${ValidateTokenStep.ROUTE_SEGMENT}",
+                journeyId,
+            )
+        return ModelAndView("redirect:$redirectUrl")
     }
 
     @GetMapping("/{stepRouteSegment}")
     @AvailableWhenFeatureEnabled(JOINT_LANDLORDS)
     fun getJourneyStep(
         @PathVariable stepRouteSegment: String,
     ): ModelAndView {
-        val token = invitationService.getTokenFromSession() ?: throw(PrsdbWebException("Token not found in session"))
-        return try {
-            val journeyMap = journeyFactory.createJourneySteps(token)
-            journeyMap[stepRouteSegment]?.getStepModelAndView()
+        try {
+            val journeyMap = journeyFactory.createJourneySteps()
+            return journeyMap[stepRouteSegment]?.getStepModelAndView()
                 ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "Step not found")
         } catch (_: NoSuchJourneyException) {
-            initializeAndRedirect(token, stepRouteSegment)
+            return ModelAndView("redirect:$ACCEPT_OR_REJECT_JOINT_LANDLORD_INVITATION_ROUTE")
         }
     }
 
@@ -66,13 +68,12 @@ class AcceptOrRejectJointLandlordInvitationController(
         @PathVariable stepRouteSegment: String,
         @RequestParam formData: FormData,
     ): ModelAndView {
-        val token = invitationService.getTokenFromSession() ?: throw (PrsdbWebException("Token not found in session"))
-        return try {
-            val journeyMap = journeyFactory.createJourneySteps(token)
-            journeyMap[stepRouteSegment]?.postStepModelAndView(formData)
+        try {
+            val journeyMap = journeyFactory.createJourneySteps()
+            return journeyMap[stepRouteSegment]?.postStepModelAndView(formData)
                 ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "Step not found")
         } catch (_: NoSuchJourneyException) {
-            initializeAndRedirect(token, stepRouteSegment)
+            return ModelAndView("redirect:$ACCEPT_OR_REJECT_JOINT_LANDLORD_INVITATION_ROUTE")
         }
     }
 
@@ -93,16 +94,6 @@ class AcceptOrRejectJointLandlordInvitationController(
         return ModelAndView("placeholder")
     }
 
-    private fun initializeAndRedirect(
-        token: String,
-        stepRouteSegment: String,
-        path: String = stepRouteSegment,
-    ): ModelAndView {
-        val journeyId = journeyFactory.initializeJourneyState(token)
-        val redirectUrl = JourneyStateService.urlWithJourneyState(path, journeyId)
-        return ModelAndView("redirect:$redirectUrl")
-    }
-
     companion object {
         const val PROPERTY_JOINED_CONFIRMATION_PATH_SEGMENT = "property-joined-$CONFIRMATION_PATH_SEGMENT"