Abstract IsPreviewModeInline expression

authgear · Jun 19, 2024 · d99f721 · d99f721
1 parent 16224a3
commit d99f721
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/pkg/auth/handler/webapp/authflowv2/create_password.go b/pkg/auth/handler/webapp/authflowv2/create_password.go
@@ -130,7 +130,7 @@ func (h *AuthflowV2CreatePasswordHandler) GetInlinePreviewData(w http.ResponseWr
 }
 
 func (h *AuthflowV2CreatePasswordHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if r.URL.Query().Get(webapp.PreviewQueryKey) == webapp.PreviewModeInline {
+	if webapp.IsPreviewModeInline(r) {
 		var previewHandler handlerwebapp.PreviewHandler
 		previewHandler.Preview(func() error {
 			data, err := h.GetInlinePreviewData(w, r)

diff --git a/pkg/auth/handler/webapp/authflowv2/enter_password.go b/pkg/auth/handler/webapp/authflowv2/enter_password.go
@@ -128,7 +128,7 @@ func (h *AuthflowV2EnterPasswordHandler) GetInlinePreviewData(w http.ResponseWri
 }
 
 func (h *AuthflowV2EnterPasswordHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if r.URL.Query().Get(webapp.PreviewQueryKey) == webapp.PreviewModeInline {
+	if webapp.IsPreviewModeInline(r) {
 		var previewHandler handlerwebapp.PreviewHandler
 		previewHandler.Preview(func() error {
 			data, err := h.GetInlinePreviewData(w, r)

diff --git a/pkg/auth/handler/webapp/authflowv2/internal_signup_login.go b/pkg/auth/handler/webapp/authflowv2/internal_signup_login.go
@@ -98,7 +98,7 @@ func (h *InternalAuthflowV2SignupLoginHandler) GetInlinePreviewData(w http.Respo
 }
 
 func (h *InternalAuthflowV2SignupLoginHandler) ServeHTTP(w http.ResponseWriter, r *http.Request, options AuthflowV2SignupServeOptions) {
-	if r.URL.Query().Get(webapp.PreviewQueryKey) == webapp.PreviewModeInline {
+	if webapp.IsPreviewModeInline(r) {
 		var previewHandler handlerwebapp.PreviewHandler
 		previewHandler.Preview(func() error {
 			data, err := h.GetInlinePreviewData(w, r, options)

diff --git a/pkg/auth/handler/webapp/authflowv2/login.go b/pkg/auth/handler/webapp/authflowv2/login.go
@@ -100,7 +100,7 @@ func (h *AuthflowV2LoginHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques
 		return
 	}
 
-	if r.URL.Query().Get(webapp.PreviewQueryKey) == webapp.PreviewModeInline {
+	if webapp.IsPreviewModeInline(r) {
 		var previewHandler handlerwebapp.PreviewHandler
 		previewHandler.Preview(func() error {
 			data, err := h.GetInlinePreviewData(w, r)

diff --git a/pkg/auth/webapp/preview.go b/pkg/auth/webapp/preview.go
@@ -1,9 +1,15 @@
 package webapp
 
+import "net/http"
+
 const PreviewQueryKey = "x_preview"
 
 type PreviewMode string
 
 const (
 	PreviewModeInline = "inline"
 )
+
+func IsPreviewModeInline(r *http.Request) bool {
+	return r.URL.Query().Get(PreviewQueryKey) == PreviewModeInline
+}