Fix session expire error when opening settings

louischan-oursky · louischan-oursky · commit 0042f62aec99 · 2025-02-12T18:05:10.000+08:00
ref DEV-2501
diff --git a/.vettedpositions b/.vettedpositions
@@ -40,10 +40,10 @@
 /pkg/auth/handler/webapp/auth_entry_point_middleware.go:31:31: requestcontext
 /pkg/auth/handler/webapp/auth_entry_point_middleware.go:32:35: requestcontext
 /pkg/auth/handler/webapp/authflow_change_password.go:96:26: requestcontext
-/pkg/auth/handler/webapp/authflow_controller.go:989:30: requestcontext
-/pkg/auth/handler/webapp/authflow_controller.go:994:24: requestcontext
-/pkg/auth/handler/webapp/authflow_controller.go:1002:19: requestcontext
-/pkg/auth/handler/webapp/authflow_controller.go:1011:19: requestcontext
+/pkg/auth/handler/webapp/authflow_controller.go:990:30: requestcontext
+/pkg/auth/handler/webapp/authflow_controller.go:995:24: requestcontext
+/pkg/auth/handler/webapp/authflow_controller.go:1003:19: requestcontext
+/pkg/auth/handler/webapp/authflow_controller.go:1012:19: requestcontext
 /pkg/auth/handler/webapp/authflow_create_password.go:132:26: requestcontext
 /pkg/auth/handler/webapp/authflow_enter_oob_otp.go:156:26: requestcontext
 /pkg/auth/handler/webapp/authflow_enter_password.go:138:26: requestcontext
diff --git a/pkg/auth/handler/webapp/alternatives.go b/pkg/auth/handler/webapp/alternatives.go
@@ -28,7 +28,7 @@ type CreateAuthenticatorPhoneOTPNode interface {
 // nolint: gocognit
 func handleAlternativeSteps(ctrl *Controller) {
 	ctrl.PostAction("choose_step", func(ctx context.Context) (err error) {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/authflow_controller.go b/pkg/auth/handler/webapp/authflow_controller.go
@@ -202,7 +202,7 @@ func (c *AuthflowController) HandleStartOfFlow(
 	handleWithScreen(screen)
 }
 
-func (c *AuthflowController) isExpectedWebSessionError(err error) bool {
+func (c *AuthflowController) isWebSessionNotFoundOrCompletedError(err error) bool {
 	return apierrors.IsKind(err, webapp.WebUIInvalidSession) || apierrors.IsKind(err, webapp.WebUISessionCompleted)
 }
 
@@ -211,7 +211,7 @@ func (c *AuthflowController) HandleOAuthCallback(ctx context.Context, w http.Res
 
 	s, err := c.Sessions.Get(ctx, state.WebSessionID)
 	if err != nil {
-		if !c.isExpectedWebSessionError(err) {
+		if !c.isWebSessionNotFoundOrCompletedError(err) {
 			c.Logger.WithError(err).Errorf("failed to get web session")
 		}
 		c.renderError(ctx, w, r, err)
@@ -313,7 +313,7 @@ func (c *AuthflowController) HandleStep(ctx context.Context, w http.ResponseWrit
 
 	s, err := c.getWebSession(ctx)
 	if err != nil {
-		if !c.isExpectedWebSessionError(err) {
+		if !c.isWebSessionNotFoundOrCompletedError(err) {
 			c.Logger.WithError(err).Errorf("failed to get web session")
 		}
 		c.renderError(ctx, w, r, err)
@@ -345,7 +345,7 @@ func (c *AuthflowController) HandleWithoutFlow(ctx context.Context, w http.Respo
 	var session *webapp.Session
 	s, err := c.getWebSession(ctx)
 	if err != nil {
-		if !c.isExpectedWebSessionError(err) {
+		if !c.isWebSessionNotFoundOrCompletedError(err) {
 			c.Logger.WithError(err).Errorf("failed to get web session")
 		}
 	} else {
@@ -384,7 +384,8 @@ func (c *AuthflowController) getOrCreateWebSession(ctx context.Context, w http.R
 	if err == nil && s != nil {
 		return s, nil
 	}
-	if !errors.Is(err, webapp.ErrSessionNotFound) {
+
+	if !c.isWebSessionNotFoundOrCompletedError(err) {
 		return nil, err
 	}
 
diff --git a/pkg/auth/handler/webapp/authflowv2/select_account.go b/pkg/auth/handler/webapp/authflowv2/select_account.go
@@ -123,7 +123,7 @@ func (h *AuthflowV2SelectAccountHandler) ServeHTTP(w http.ResponseWriter, r *htt
 	ctrl.BeforeHandle(func(ctx context.Context) error {
 
 		// Ensure webapp session exist
-		ws, err := ctrl.GetWebappSession(ctx)
+		ws, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/confirm_terminate_other_sessions.go b/pkg/auth/handler/webapp/confirm_terminate_other_sessions.go
@@ -66,7 +66,7 @@ func (h *ConfirmTerminateOtherSessionsHandler) ServeHTTP(w http.ResponseWriter,
 	defer ctrl.ServeWithDBTx(r.Context())
 
 	ctrl.Get(func(ctx context.Context) error {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
@@ -91,7 +91,7 @@ func (h *ConfirmTerminateOtherSessionsHandler) ServeHTTP(w http.ResponseWriter,
 			return err
 		}
 
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/controller.go b/pkg/auth/handler/webapp/controller.go
@@ -2,7 +2,6 @@ package webapp
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"net/http"
 
@@ -315,19 +314,16 @@ func (c *Controller) rewindSessionHistory(session *webapp.Session) error {
 	return nil
 }
 
-func (c *Controller) GetWebappSession(ctx context.Context) (*webapp.Session, error) {
+func (c *Controller) InteractionSession(ctx context.Context) (*webapp.Session, error) {
 	s := webapp.GetSession(ctx)
-	if s == nil {
+	if s == nil || s.IsCompleted {
 		return nil, webapp.ErrSessionNotFound
 	}
-	if s.IsCompleted {
-		return nil, webapp.ErrSessionCompleted
-	}
 	return s, nil
 }
 
 func (c *Controller) InteractionGet(ctx context.Context) (*interaction.Graph, error) {
-	s, err := c.GetWebappSession(ctx)
+	s, err := c.InteractionSession(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -348,7 +344,7 @@ func (c *Controller) InteractionGetWithSession(ctx context.Context, s *webapp.Se
 }
 
 func (c *Controller) InteractionPost(ctx context.Context, inputFn func() (interface{}, error)) (*webapp.Result, error) {
-	s, err := c.GetWebappSession(ctx)
+	s, err := c.InteractionSession(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -381,13 +377,9 @@ func (c *Controller) InteractionOAuthCallback(ctx context.Context, oauthInput In
 }
 
 func (c *Controller) getSettingsActionWebSession(ctx context.Context, r *http.Request) (*webapp.Session, error) {
-	webappSession, err := c.GetWebappSession(ctx)
-	if err != nil {
-		// No session means it is not in settings action
-		if errors.Is(err, webapp.ErrSessionNotFound) {
-			return nil, nil
-		}
-		return nil, err
+	webappSession := webapp.GetSession(ctx)
+	if webappSession == nil {
+		return nil, nil
 	}
 	if webappSession.SettingsActionID == "" {
 		// This session is not for a settings action, ignore it
@@ -401,6 +393,9 @@ func (c *Controller) getSettingsActionWebSession(ctx context.Context, r *http.Re
 		// This session is not for the current settings action, ignore it
 		return nil, nil
 	}
+	if webappSession.IsCompleted {
+		return nil, webapp.ErrSessionCompleted
+	}
 	return webappSession, nil
 }
 
diff --git a/pkg/auth/handler/webapp/create_passkey.go b/pkg/auth/handler/webapp/create_passkey.go
@@ -53,7 +53,7 @@ func (h *CreatePasskeyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 	defer ctrl.ServeWithDBTx(r.Context())
 
 	ctrl.Get(func(ctx context.Context) error {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/create_password.go b/pkg/auth/handler/webapp/create_password.go
@@ -107,7 +107,7 @@ func (h *CreatePasswordHandler) ServeHTTP(w http.ResponseWriter, r *http.Request
 	defer ctrl.ServeWithDBTx(r.Context())
 
 	ctrl.Get(func(ctx context.Context) error {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/enter_oob_otp.go b/pkg/auth/handler/webapp/enter_oob_otp.go
@@ -161,7 +161,7 @@ func (h *EnterOOBOTPHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	defer ctrl.ServeWithDBTx(r.Context())
 
 	ctrl.Get(func(ctx context.Context) error {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/enter_password.go b/pkg/auth/handler/webapp/enter_password.go
@@ -118,7 +118,7 @@ func (h *EnterPasswordHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 	defer ctrl.ServeWithDBTx(r.Context())
 
 	ctrl.Get(func(ctx context.Context) error {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/enter_recovery_code.go b/pkg/auth/handler/webapp/enter_recovery_code.go
@@ -68,7 +68,7 @@ func (h *EnterRecoveryCodeHandler) ServeHTTP(w http.ResponseWriter, r *http.Requ
 	defer ctrl.ServeWithDBTx(r.Context())
 
 	ctrl.Get(func(ctx context.Context) error {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/enter_totp.go b/pkg/auth/handler/webapp/enter_totp.go
@@ -68,7 +68,7 @@ func (h *EnterTOTPHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	defer ctrl.ServeWithDBTx(r.Context())
 
 	ctrl.Get(func(ctx context.Context) error {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/forgot_password_success.go b/pkg/auth/handler/webapp/forgot_password_success.go
@@ -57,7 +57,7 @@ func (h *ForgotPasswordSuccessHandler) ServeHTTP(w http.ResponseWriter, r *http.
 	defer ctrl.ServeWithDBTx(r.Context())
 
 	ctrl.Get(func(ctx context.Context) error {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/login_link_otp.go b/pkg/auth/handler/webapp/login_link_otp.go
@@ -121,7 +121,7 @@ func (h *LoginLinkOTPHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 	defer ctrl.ServeWithDBTx(r.Context())
 
 	ctrl.Get(func(ctx context.Context) error {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/prompt_create_passkey.go b/pkg/auth/handler/webapp/prompt_create_passkey.go
@@ -47,7 +47,7 @@ func (h *PromptCreatePasskeyHandler) ServeHTTP(w http.ResponseWriter, r *http.Re
 	defer ctrl.ServeWithDBTx(r.Context())
 
 	ctrl.Get(func(ctx context.Context) error {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/setup_login_link_otp.go b/pkg/auth/handler/webapp/setup_login_link_otp.go
@@ -67,7 +67,7 @@ func (h *SetupLoginLinkOTPHandler) ServeHTTP(w http.ResponseWriter, r *http.Requ
 	defer ctrl.ServeWithDBTx(r.Context())
 
 	ctrl.Get(func(ctx context.Context) error {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/setup_oob_otp.go b/pkg/auth/handler/webapp/setup_oob_otp.go
@@ -126,7 +126,7 @@ func (h *SetupOOBOTPHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	defer ctrl.ServeWithDBTx(r.Context())
 
 	ctrl.Get(func(ctx context.Context) error {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/setup_totp.go b/pkg/auth/handler/webapp/setup_totp.go
@@ -139,7 +139,7 @@ func (h *SetupTOTPHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	defer ctrl.ServeWithDBTx(r.Context())
 
 	ctrl.Get(func(ctx context.Context) error {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/setup_whatsapp_otp.go b/pkg/auth/handler/webapp/setup_whatsapp_otp.go
@@ -62,7 +62,7 @@ func (h *SetupWhatsappOTPHandler) ServeHTTP(w http.ResponseWriter, r *http.Reque
 	defer ctrl.ServeWithDBTx(r.Context())
 
 	ctrl.Get(func(ctx context.Context) error {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/use_passkey.go b/pkg/auth/handler/webapp/use_passkey.go
@@ -53,7 +53,7 @@ func (h *UsePasskeyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	defer ctrl.ServeWithDBTx(r.Context())
 
 	ctrl.Get(func(ctx context.Context) error {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/verify_identity.go b/pkg/auth/handler/webapp/verify_identity.go
@@ -176,7 +176,7 @@ func (h *VerifyIdentityHandler) ServeHTTP(w http.ResponseWriter, r *http.Request
 
 	ctrl.Get(func(ctx context.Context) error {
 		// This page should be opened by the original user agent.
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/wechat_auth.go b/pkg/auth/handler/webapp/wechat_auth.go
@@ -101,7 +101,7 @@ func (h *WechatAuthHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	defer ctrl.ServeWithDBTx(r.Context())
 
 	ctrl.Get(func(ctx context.Context) error {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
@@ -149,7 +149,7 @@ func (h *WechatAuthHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	})
 
 	ctrl.PostAction("", func(ctx context.Context) error {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/auth/handler/webapp/whatsapp_otp.go b/pkg/auth/handler/webapp/whatsapp_otp.go
@@ -129,7 +129,7 @@ func (h *WhatsappOTPHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	defer ctrl.ServeWithDBTx(r.Context())
 
 	ctrl.Get(func(ctx context.Context) error {
-		session, err := ctrl.GetWebappSession(ctx)
+		session, err := ctrl.InteractionSession(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/portal/src/ScreenHeader.tsx b/portal/src/ScreenHeader.tsx
@@ -10,6 +10,7 @@ import {
   PanelType,
   IRenderFunction,
   IPanelProps,
+  IContextualMenuProps,
 } from "@fluentui/react";
 import { useAppAndSecretConfigQuery } from "./graphql/portal/query/appAndSecretConfigQuery";
 import { useViewerQuery } from "./graphql/portal/query/viewerQuery";
@@ -22,6 +23,7 @@ import { useBoolean } from "@fluentui/react-hooks";
 import ExternalLink from "./ExternalLink";
 import { useLogout } from "./graphql/portal/Authenticated";
 import { useCapture } from "./gtm_v2";
+import { useSettingsAnchor } from "./hook/authgear";
 
 interface LogoProps {
   isNavbarHeader?: boolean;
@@ -177,7 +179,7 @@ const ScreenHeader: React.VFC<ScreenNavProps> = function ScreenHeader(props) {
   const { showHamburger = true } = props;
   const { renderToString } = useContext(Context);
   const capture = useCapture();
-  const { themes, authgearEndpoint } = useSystemConfig();
+  const { themes } = useSystemConfig();
   const { appID } = useParams() as { appID: string };
   const { viewer } = useViewerQuery();
   const [isNavbarOpen, { setTrue: openNavbar, setFalse: dismissNavbar }] =
@@ -225,6 +227,8 @@ const ScreenHeader: React.VFC<ScreenNavProps> = function ScreenHeader(props) {
     [themes.main]
   );
 
+  const { href: settingURL, onClick: onClickSettings } = useSettingsAnchor();
+
   const menuProps = useMemo(() => {
     const items = [
       {
@@ -233,7 +237,8 @@ const ScreenHeader: React.VFC<ScreenNavProps> = function ScreenHeader(props) {
         iconProps: {
           iconName: "PlayerSettings",
         },
-        href: authgearEndpoint + "/settings",
+        href: settingURL,
+        onClick: onClickSettings,
       },
       {
         key: "logout",
@@ -243,7 +248,7 @@ const ScreenHeader: React.VFC<ScreenNavProps> = function ScreenHeader(props) {
         },
         onClick: onClickLogout,
       },
-    ];
+    ] satisfies IContextualMenuProps["items"];
 
     if (window.Osano !== undefined) {
       items.splice(1, 0, {
@@ -256,12 +261,13 @@ const ScreenHeader: React.VFC<ScreenNavProps> = function ScreenHeader(props) {
       });
     }
 
-    return { items };
+    return { items } satisfies IContextualMenuProps;
   }, [
+    renderToString,
+    settingURL,
+    onClickSettings,
     onClickLogout,
     onClickCookiePreference,
-    renderToString,
-    authgearEndpoint,
   ]);
 
   return (
diff --git a/portal/src/ScreenNav.tsx b/portal/src/ScreenNav.tsx
diff --git a/portal/src/hook/authgear.ts b/portal/src/hook/authgear.ts

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ type CreateAuthenticatorPhoneOTPNode interface {`
`28`	`28`	`// nolint: gocognit`
`29`	`29`	`func handleAlternativeSteps(ctrl *Controller) {`
`30`	`30`	`ctrl.PostAction("choose_step", func(ctx context.Context) (err error) {`
`31`		`- session, err := ctrl.GetWebappSession(ctx)`
	`31`	`+ session, err := ctrl.InteractionSession(ctx)`
`32`	`32`	`if err != nil {`
`33`	`33`	`return err`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ func (c *AuthflowController) HandleStartOfFlow(`
`202`	`202`	`handleWithScreen(screen)`
`203`	`203`	`}`
`204`	`204`
`205`		`-func (c *AuthflowController) isExpectedWebSessionError(err error) bool {`
	`205`	`+func (c *AuthflowController) isWebSessionNotFoundOrCompletedError(err error) bool {`
`206`	`206`	`return apierrors.IsKind(err, webapp.WebUIInvalidSession) \|\| apierrors.IsKind(err, webapp.WebUISessionCompleted)`
`207`	`207`	`}`
`208`	`208`
`@@ -211,7 +211,7 @@ func (c *AuthflowController) HandleOAuthCallback(ctx context.Context, w http.Res`
`211`	`211`
`212`	`212`	`s, err := c.Sessions.Get(ctx, state.WebSessionID)`
`213`	`213`	`if err != nil {`
`214`		`- if !c.isExpectedWebSessionError(err) {`
	`214`	`+ if !c.isWebSessionNotFoundOrCompletedError(err) {`
`215`	`215`	`c.Logger.WithError(err).Errorf("failed to get web session")`
`216`	`216`	`}`
`217`	`217`	`c.renderError(ctx, w, r, err)`
`@@ -313,7 +313,7 @@ func (c *AuthflowController) HandleStep(ctx context.Context, w http.ResponseWrit`
`313`	`313`
`314`	`314`	`s, err := c.getWebSession(ctx)`
`315`	`315`	`if err != nil {`
`316`		`- if !c.isExpectedWebSessionError(err) {`
	`316`	`+ if !c.isWebSessionNotFoundOrCompletedError(err) {`
`317`	`317`	`c.Logger.WithError(err).Errorf("failed to get web session")`
`318`	`318`	`}`
`319`	`319`	`c.renderError(ctx, w, r, err)`
`@@ -345,7 +345,7 @@ func (c *AuthflowController) HandleWithoutFlow(ctx context.Context, w http.Respo`
`345`	`345`	`var session *webapp.Session`
`346`	`346`	`s, err := c.getWebSession(ctx)`
`347`	`347`	`if err != nil {`
`348`		`- if !c.isExpectedWebSessionError(err) {`
	`348`	`+ if !c.isWebSessionNotFoundOrCompletedError(err) {`
`349`	`349`	`c.Logger.WithError(err).Errorf("failed to get web session")`
`350`	`350`	`}`
`351`	`351`	`} else {`
`@@ -384,7 +384,8 @@ func (c *AuthflowController) getOrCreateWebSession(ctx context.Context, w http.R`
`384`	`384`	`if err == nil && s != nil {`
`385`	`385`	`return s, nil`
`386`	`386`	`}`
`387`		`- if !errors.Is(err, webapp.ErrSessionNotFound) {`
	`387`	`+`
	`388`	`+ if !c.isWebSessionNotFoundOrCompletedError(err) {`
`388`	`389`	`return nil, err`
`389`	`390`	`}`
`390`	`391`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ func (h AuthflowV2SelectAccountHandler) ServeHTTP(w http.ResponseWriter, r htt`
`123`	`123`	`ctrl.BeforeHandle(func(ctx context.Context) error {`
`124`	`124`
`125`	`125`	`// Ensure webapp session exist`
`126`		`- ws, err := ctrl.GetWebappSession(ctx)`
	`126`	`+ ws, err := ctrl.InteractionSession(ctx)`
`127`	`127`	`if err != nil {`
`128`	`128`	`return err`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func (h *ConfirmTerminateOtherSessionsHandler) ServeHTTP(w http.ResponseWriter,`
`66`	`66`	`defer ctrl.ServeWithDBTx(r.Context())`
`67`	`67`
`68`	`68`	`ctrl.Get(func(ctx context.Context) error {`
`69`		`- session, err := ctrl.GetWebappSession(ctx)`
	`69`	`+ session, err := ctrl.InteractionSession(ctx)`
`70`	`70`	`if err != nil {`
`71`	`71`	`return err`
`72`	`72`	`}`
`@@ -91,7 +91,7 @@ func (h *ConfirmTerminateOtherSessionsHandler) ServeHTTP(w http.ResponseWriter,`
`91`	`91`	`return err`
`92`	`92`	`}`
`93`	`93`
`94`		`- session, err := ctrl.GetWebappSession(ctx)`
	`94`	`+ session, err := ctrl.InteractionSession(ctx)`
`95`	`95`	`if err != nil {`
`96`	`96`	`return err`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ func (h CreatePasskeyHandler) ServeHTTP(w http.ResponseWriter, r http.Request)`
`53`	`53`	`defer ctrl.ServeWithDBTx(r.Context())`
`54`	`54`
`55`	`55`	`ctrl.Get(func(ctx context.Context) error {`
`56`		`- session, err := ctrl.GetWebappSession(ctx)`
	`56`	`+ session, err := ctrl.InteractionSession(ctx)`
`57`	`57`	`if err != nil {`
`58`	`58`	`return err`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func (h CreatePasswordHandler) ServeHTTP(w http.ResponseWriter, r http.Request`
`107`	`107`	`defer ctrl.ServeWithDBTx(r.Context())`
`108`	`108`
`109`	`109`	`ctrl.Get(func(ctx context.Context) error {`
`110`		`- session, err := ctrl.GetWebappSession(ctx)`
	`110`	`+ session, err := ctrl.InteractionSession(ctx)`
`111`	`111`	`if err != nil {`
`112`	`112`	`return err`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ func (h EnterOOBOTPHandler) ServeHTTP(w http.ResponseWriter, r http.Request) {`
`161`	`161`	`defer ctrl.ServeWithDBTx(r.Context())`
`162`	`162`
`163`	`163`	`ctrl.Get(func(ctx context.Context) error {`
`164`		`- session, err := ctrl.GetWebappSession(ctx)`
	`164`	`+ session, err := ctrl.InteractionSession(ctx)`
`165`	`165`	`if err != nil {`
`166`	`166`	`return err`
`167`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func (h EnterPasswordHandler) ServeHTTP(w http.ResponseWriter, r http.Request)`
`118`	`118`	`defer ctrl.ServeWithDBTx(r.Context())`
`119`	`119`
`120`	`120`	`ctrl.Get(func(ctx context.Context) error {`
`121`		`- session, err := ctrl.GetWebappSession(ctx)`
	`121`	`+ session, err := ctrl.InteractionSession(ctx)`
`122`	`122`	`if err != nil {`
`123`	`123`	`return err`
`124`	`124`	`}`