Handle close settings page on success query param authgear#3813

pkg/auth/handler/webapp/deps.go

@@ -75,6 +75,7 @@ var DependencySet = wire.NewSet(
 	wire.Struct(new(SettingsChangeSecondaryPasswordHandler), "*"),
 	wire.Struct(new(SettingsDeleteAccountHandler), "*"),
 	wire.Struct(new(SettingsDeleteAccountSuccessHandler), "*"),
+	wire.Struct(new(SettingsCloseHandler), "*"),
 	wire.Struct(new(SettingsPasskeyHandler), "*"),
 	wire.Struct(new(AccountStatusHandler), "*"),
 	wire.Struct(new(LogoutHandler), "*"),

pkg/auth/handler/webapp/settings_close.go

@@ -0,0 +1,52 @@
+package webapp
+
+import (
+	"net/http"
+
+	"github.com/authgear/authgear-server/pkg/auth/handler/webapp/viewmodels"
+	"github.com/authgear/authgear-server/pkg/util/httproute"
+	"github.com/authgear/authgear-server/pkg/util/template"
+)
+
+var TemplateWebSettingsCloseHTML = template.RegisterHTML(
+	"web/settings_close.html",
+	Components...,
+)
+
+func ConfigureSettingsCloseRoute(route httproute.Route) httproute.Route {
+	return route.
+		WithMethods("OPTIONS", "GET").
+		WithPathPattern("/settings/close")
+}
+
+type SettingsCloseHandler struct {
+	ControllerFactory ControllerFactory
+	BaseViewModel     *viewmodels.BaseViewModeler
+	Renderer          Renderer
+}
+
+func (h *SettingsCloseHandler) GetData(r *http.Request, w http.ResponseWriter) (map[string]interface{}, error) {
+	data := make(map[string]interface{})
+	baseViewModel := h.BaseViewModel.ViewModel(r, w)
+	viewmodels.Embed(data, baseViewModel)
+	return data, nil
+}
+
+func (h *SettingsCloseHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	ctrl, err := h.ControllerFactory.New(r, w)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+	defer ctrl.Serve()
+
+	ctrl.Get(func() error {
+		data, err := h.GetData(r, w)
+		if err != nil {
+			return err
+		}
+
+		h.Renderer.RenderHTML(w, r, TemplateWebSettingsCloseHTML, data)
+		return nil
+	})
+}

pkg/auth/routes.go

@@ -381,6 +381,7 @@ func NewRouter(p *deps.RootProvider, configSource *configsource.ConfigSource) *h
 	router.Add(webapphandler.ConfigureSettingsChangePasswordRoute(webappSettingsSubRoutesRoute), p.Handler(newWebAppSettingsChangePasswordHandler))
 	router.Add(webapphandler.ConfigureSettingsChangeSecondaryPasswordRoute(webappSettingsSubRoutesRoute), p.Handler(newWebAppSettingsChangeSecondaryPasswordHandler))
 	router.Add(webapphandler.ConfigureSettingsDeleteAccountRoute(webappSettingsSubRoutesRoute), p.Handler(newWebAppSettingsDeleteAccountHandler))
+	router.Add(webapphandler.ConfigureSettingsCloseRoute(webappSettingsSubRoutesRoute), p.Handler(newWebAppSettingsCloseHandler))
 
 	router.Add(webapphandler.ConfigureTesterRoute(webappTesterRouter), p.Handler(newWebAppTesterHandler))
 

pkg/auth/webapp/redirect.go

@@ -28,6 +28,11 @@ func DeriveSettingsRedirectURIFromRequest(r *http.Request, defaultURI string) st
 	// 2. Default redirect URL
 	// 3. `/settings`
 	redirectURIFromQuery := func() string {
+		closeOnSuccess := r.URL.Query().Get("close_on_success")
+		if closeOnSuccess == "true" {
+			return "/settings/close"
+		}
+
 		redirectURI := r.URL.Query().Get("redirect_uri")
 		allowed := false