+3 -7

appview/oauth/accounts.go

··· 127 127 } 128 128 129 129 type AuthReturnInfo struct { 130 130 - ReturnURL string 131 131 - AddAccount bool 130 130 + ReturnURL string 132 131 } 133 132 134 134 - func (o *OAuth) SetAuthReturn(w http.ResponseWriter, r *http.Request, returnURL string, addAccount bool) error { 133 133 + func (o *OAuth) SetAuthReturn(w http.ResponseWriter, r *http.Request, returnURL string) error { 135 134 session, err := o.SessStore.Get(r, AuthReturnName) 136 135 if err != nil { 137 136 return err 138 137 } 139 138 140 139 session.Values[AuthReturnURL] = returnURL 141 141 - session.Values[AuthAddAccount] = addAccount 142 140 session.Options.MaxAge = 60 * 30 143 141 session.Options.HttpOnly = true 144 142 session.Options.Secure = !o.Config.Core.Dev ··· 154 152 } 155 153 156 154 returnURL, _ := session.Values[AuthReturnURL].(string) 157 157 - addAccount, _ := session.Values[AuthAddAccount].(bool) 158 155 159 156 return &AuthReturnInfo{ 160 160 - ReturnURL: returnURL, 161 161 - AddAccount: addAccount, 157 157 + ReturnURL: returnURL, 162 158 } 163 159 } 164 160

-1

appview/oauth/consts.go

··· 5 5 AccountsName = "appview-accounts-v2" 6 6 AuthReturnName = "appview-auth-return" 7 7 AuthReturnURL = "return_url" 8 8 - AuthAddAccount = "add_account" 9 8 SessionHandle = "handle" 10 9 SessionDid = "did" 11 10 SessionId = "id"

-1

appview/pages/templates/user/login.html

··· 73 73 </span> 74 74 </div> 75 75 <input type="hidden" name="return_url" value="{{ .ReturnUrl }}"> 76 76 - <input type="hidden" name="add_account" value="{{ if .AddAccount }}true{{ end }}"> 77 76 78 77 <button 79 78 class="btn w-full my-2 mt-6 text-base"

+1 -2

appview/state/login.go

··· 27 27 case http.MethodPost: 28 28 handle := r.FormValue("handle") 29 29 returnURL := r.FormValue("return_url") 30 30 - addAccount := r.FormValue("add_account") == "true" 31 30 32 31 // remove spaces around the handle, handles can't have spaces around them 33 32 handle = strings.TrimSpace(handle) ··· 54 53 return 55 54 } 56 55 57 57 - if err := s.oauth.SetAuthReturn(w, r, returnURL, addAccount); err != nil { 56 56 + if err := s.oauth.SetAuthReturn(w, r, returnURL); err != nil { 58 57 l.Error("failed to set auth return", "err", err) 59 58 } 60 59