appview/{oauth,pages,state}: remove unused `AddAccount` session data #1020

+5 -12

5 changed files

Diff round #8

expand all

appview

oauth

accounts.go

consts.go

oauth.go

pages

templates

user

state

+3 -7

appview/oauth/accounts.go

··· 127 127 } 128 128 129 129 type AuthReturnInfo struct { 130 - ReturnURL string 131 - AddAccount bool 130 + ReturnURL string 132 131 } 133 132 134 - func (o *OAuth) SetAuthReturn(w http.ResponseWriter, r *http.Request, returnURL string, addAccount bool) error { 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 - 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 - addAccount, _ := session.Values[AuthAddAccount].(bool) 158 155 159 156 return &AuthReturnInfo{ 160 - ReturnURL: returnURL, 161 - AddAccount: addAccount, 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 - AuthAddAccount = "add_account" 9 8 SessionHandle = "handle" 10 9 SessionDid = "did" 11 10 SessionId = "id"

+1 -1

appview/oauth/oauth.go

··· 396 396 info.AccountDID = &parsedDid 397 397 o.ClientApp.Store.SaveAuthRequestInfo(ctx, *info) 398 398 399 - if err := o.SetAuthReturn(w, r, returnURL, false); err != nil { 399 + if err := o.SetAuthReturn(w, r, returnURL); err != nil { 400 400 return "", fmt.Errorf("failed to set auth return: %w", err) 401 401 } 402 402

-1

appview/pages/templates/user/login.html