diff --git a/appview/oauth/accounts.go b/appview/oauth/accounts.go --- a/appview/oauth/accounts.go +++ b/appview/oauth/accounts.go @@ -127,18 +127,16 @@ } type AuthReturnInfo struct { - ReturnURL string - AddAccount bool + ReturnURL string } -func (o *OAuth) SetAuthReturn(w http.ResponseWriter, r *http.Request, returnURL string, addAccount bool) error { +func (o *OAuth) SetAuthReturn(w http.ResponseWriter, r *http.Request, returnURL string) error { session, err := o.SessStore.Get(r, AuthReturnName) if err != nil { return err } session.Values[AuthReturnURL] = returnURL - session.Values[AuthAddAccount] = addAccount session.Options.MaxAge = 60 * 30 session.Options.HttpOnly = true session.Options.Secure = !o.Config.Core.Dev @@ -154,11 +152,9 @@ } returnURL, _ := session.Values[AuthReturnURL].(string) - addAccount, _ := session.Values[AuthAddAccount].(bool) return &AuthReturnInfo{ - ReturnURL: returnURL, - AddAccount: addAccount, + ReturnURL: returnURL, } } diff --git a/appview/oauth/consts.go b/appview/oauth/consts.go --- a/appview/oauth/consts.go +++ b/appview/oauth/consts.go @@ -5,7 +5,6 @@ AccountsName = "appview-accounts-v2" AuthReturnName = "appview-auth-return" AuthReturnURL = "return_url" - AuthAddAccount = "add_account" SessionHandle = "handle" SessionDid = "did" SessionId = "id" diff --git a/appview/oauth/oauth.go b/appview/oauth/oauth.go --- a/appview/oauth/oauth.go +++ b/appview/oauth/oauth.go @@ -396,7 +396,7 @@ info.AccountDID = &parsedDid o.ClientApp.Store.SaveAuthRequestInfo(ctx, *info) - if err := o.SetAuthReturn(w, r, returnURL, false); err != nil { + if err := o.SetAuthReturn(w, r, returnURL); err != nil { return "", fmt.Errorf("failed to set auth return: %w", err) } diff --git a/appview/state/login.go b/appview/state/login.go --- a/appview/state/login.go +++ b/appview/state/login.go @@ -33,7 +33,6 @@ case http.MethodPost: handle := r.FormValue("handle") returnURL := r.FormValue("return_url") - addAccount := r.FormValue("add_account") == "true" // remove spaces around the handle, handles can't have spaces around them handle = strings.TrimSpace(handle) @@ -96,7 +95,7 @@ } } - if err := s.oauth.SetAuthReturn(w, r, sanitizeReturnURL(returnURL), addAccount); err != nil { + if err := s.oauth.SetAuthReturn(w, r, sanitizeReturnURL(returnURL)); err != nil { l.Error("failed to set auth return", "err", err) } diff --git a/appview/pages/templates/user/login.html b/appview/pages/templates/user/login.html --- a/appview/pages/templates/user/login.html +++ b/appview/pages/templates/user/login.html @@ -73,7 +73,6 @@ -