prefer passing org ID

internal/app/organisation_store.go

@@ -17,14 +17,14 @@ type organisationStore struct {
 	now          func() time.Time
 }
 
-func (s *organisationStore) Create(ctx context.Context, name string) error {
+func (s *organisationStore) Create(ctx context.Context, name string) (*actor.Organisation, error) {
 	data, err := page.SessionDataFromContext(ctx)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	if data.SessionID == "" {
-		return errors.New("organisationStore.Create requires SessionID")
+		return nil, errors.New("organisationStore.Create requires SessionID")
 	}
 
 	organisationID := s.uuidString()
@@ -38,7 +38,7 @@ func (s *organisationStore) Create(ctx context.Context, name string) error {
 	}
 
 	if err := s.dynamoClient.Create(ctx, organisation); err != nil {
-		return fmt.Errorf("error creating organisation: %w", err)
+		return nil, fmt.Errorf("error creating organisation: %w", err)
 	}
 
 	member := &actor.Member{
@@ -48,10 +48,10 @@ func (s *organisationStore) Create(ctx context.Context, name string) error {
 	}
 
 	if err := s.dynamoClient.Create(ctx, member); err != nil {
-		return fmt.Errorf("error creating organisation member: %w", err)
+		return nil, fmt.Errorf("error creating organisation member: %w", err)
 	}
 
-	return nil
+	return organisation, nil
 }
 
 func (s *organisationStore) Get(ctx context.Context) (*actor.Organisation, error) {

internal/page/donor/register.go

@@ -436,15 +436,21 @@ func makeLpaHandle(mux *http.ServeMux, store sesh.Store, defaultOptions page.Han
 			appData.ActorType = actor.TypeDonor
 			appData.AppPublicURL = appPublicURL
 
-			donorSession, err := sesh.Login(store, r)
+			loginSession, err := sesh.Login(store, r)
 			if err != nil {
 				http.Redirect(w, r, page.Paths.Start.Format(), http.StatusFound)
 				return
 			}
 
-			appData.SessionID = donorSession.SessionID()
-
 			sessionData, err := page.SessionDataFromContext(ctx)
+
+			appData.SessionID = loginSession.SessionID()
+
+			if loginSession.OrganisationID != "" {
+				appData.IsSupporter = true
+				sessionData.OrganisationID = loginSession.OrganisationID
+			}
+
 			if err == nil {
 				sessionData.SessionID = appData.SessionID
 				ctx = page.ContextWithSessionData(ctx, sessionData)

internal/page/fixtures/supporter.go

@@ -5,13 +5,14 @@ import (
 	"encoding/base64"
 	"net/http"
 
+	"github.com/ministryofjustice/opg-modernising-lpa/internal/actor"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/page"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/random"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/sesh"
 )
 
 type OrganisationStore interface {
-	Create(context.Context, string) error
+	Create(context.Context, string) (*actor.Organisation, error)
 }
 
 func Supporter(sessionStore sesh.Store, organisationStore OrganisationStore) page.Handler {
@@ -25,14 +26,20 @@ func Supporter(sessionStore sesh.Store, organisationStore OrganisationStore) pag
 			ctx                = page.ContextWithSessionData(r.Context(), &page.SessionData{SessionID: supporterSessionID})
 		)
 
-		if err := sesh.SetLoginSession(sessionStore, r, w, &sesh.LoginSession{Sub: supporterSub, Email: testEmail}); err != nil {
-			return err
-		}
+		loginSession := &sesh.LoginSession{Sub: supporterSub, Email: testEmail}
 
 		if organisation == "1" {
-			if err := organisationStore.Create(ctx, random.String(12)); err != nil {
+			org, err := organisationStore.Create(ctx, random.String(12))
+
+			if err != nil {
 				return err
 			}
+
+			loginSession.OrganisationID = org.ID
+		}
+
+		if err := sesh.SetLoginSession(sessionStore, r, w, loginSession); err != nil {
+			return err
 		}
 
 		if redirect != page.Paths.Supporter.EnterOrganisationName.Format() {

internal/page/paths.go

@@ -43,10 +43,6 @@ func (p LpaPath) Redirect(w http.ResponseWriter, r *http.Request, appData AppDat
 		rurl = fromURL
 	}
 
-	if appData.IsSupporter {
-		rurl = "/supporter/" + rurl
-	}
-
 	if CanGoTo(donor, rurl) {
 		http.Redirect(w, r, appData.Lang.URL(rurl), http.StatusFound)
 	} else {

internal/page/supporter/dashboard.go

@@ -22,7 +22,7 @@ func Dashboard(tmpl template.Template, organisationStore OrganisationStore) Hand
 				return err
 			}
 
-			return page.Paths.Supporter.DonorDetails.RedirectToLpa(w, r.WithContext(r.Context()), appData, donorProvided)
+			return page.Paths.YourDetails.Redirect(w, r.WithContext(r.Context()), appData, donorProvided)
 		}
 
 		return tmpl(w, DashboardData{App: appData})

internal/page/supporter/enter_organisation_name.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/ministryofjustice/opg-go-common/template"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/page"
+	"github.com/ministryofjustice/opg-modernising-lpa/internal/sesh"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/validation"
 )
 
@@ -14,7 +15,7 @@ type enterOrganisationNameData struct {
 	Form   *enterOrganisationNameForm
 }
 
-func EnterOrganisationName(tmpl template.Template, organisationStore OrganisationStore) page.Handler {
+func EnterOrganisationName(tmpl template.Template, organisationStore OrganisationStore, sessionStore sesh.Store) page.Handler {
 	return func(appData page.AppData, w http.ResponseWriter, r *http.Request) error {
 		data := &enterOrganisationNameData{
 			App:  appData,
@@ -26,7 +27,18 @@ func EnterOrganisationName(tmpl template.Template, organisationStore Organisatio
 			data.Errors = data.Form.Validate()
 
 			if !data.Errors.Any() {
-				if err := organisationStore.Create(r.Context(), data.Form.Name); err != nil {
+				organisation, err := organisationStore.Create(r.Context(), data.Form.Name)
+				if err != nil {
+					return err
+				}
+
+				loginSession, err := sesh.Login(sessionStore, r)
+				if err != nil {
+					return page.Paths.Supporter.Start.Redirect(w, r, appData)
+				}
+
+				loginSession.OrganisationID = organisation.ID
+				if err := sesh.SetLoginSession(sessionStore, r, w, loginSession); err != nil {
 					return err
 				}
 

internal/page/supporter/login_callback.go

@@ -35,22 +35,30 @@ func LoginCallback(oneLoginClient LoginCallbackOneLoginClient, sessionStore sesh
 
 		session := &sesh.LoginSession{
 			IDToken: idToken,
-			Sub:     userInfo.Sub,
+			Sub:     "supporter-" + userInfo.Sub,
 			Email:   userInfo.Email,
 		}
 
-		if err := sesh.SetLoginSession(sessionStore, r, w, session); err != nil {
-			return err
-		}
-
 		ctx := page.ContextWithSessionData(r.Context(), &page.SessionData{SessionID: session.SessionID()})
 
-		_, err = organisationStore.Get(ctx)
+		organisation, err := organisationStore.Get(ctx)
 		if err == nil {
+			session.OrganisationID = organisation.ID
+			if err := sesh.SetLoginSession(sessionStore, r, w, session); err != nil {
+				return err
+			}
+
 			return page.Paths.Supporter.Dashboard.Redirect(w, r, appData)
 		}
-		if !errors.Is(err, dynamo.NotFoundError{}) {
-			return err
+
+		if errors.Is(err, dynamo.NotFoundError{}) {
+			if err := sesh.SetLoginSession(sessionStore, r, w, &sesh.LoginSession{
+				IDToken: idToken,
+				Sub:     "supporter-" + userInfo.Sub,
+				Email:   userInfo.Email,
+			}); err != nil {
+				return err
+			}
 		}
 
 		return page.Paths.Supporter.EnterOrganisationName.Redirect(w, r, appData)