Monorepo for Tangled tangled.org

appview/{pages,state}: simplify LoginPage params #1023

open opened by boltless.me targeting master from sl/uvpzuszrulvq

We don't need to pass full MultiAccountUser here. just []AccountInfo should be enough. This way, we can make MultiAccountUser to always hold an active user.

Signed-off-by: Seongmin Lee git@boltless.me

Labels

None yet.

assignee

None yet.

Participants 1
AT URI
at://did:plc:xasnlahkri4ewmbuzly2rlc5/sh.tangled.repo.pull/3mdcq5ouz7x22
+8 -8
Interdiff #4 #5
appview/oauth/accounts.go

This file has not been changed.

appview/oauth/accounts_test.go

This file has not been changed.

+8 -8
appview/pages/pages.go
··· 248 248 } 249 249 250 250 type LoginParams struct { 251 - ReturnUrl string 252 - ErrorCode string 253 - AddAccount bool 254 - Accounts []oauth.AccountInfo 251 + ReturnUrl string 252 + ErrorCode string 253 + AddAccount bool 254 + LoggedInUser *oauth.MultiAccountUser 255 255 } 256 256 257 257 func (p *Pages) Login(w io.Writer, params LoginParams) error { ··· 309 309 } 310 310 311 311 type LoginParams struct { 312 - ReturnUrl string 313 - ErrorCode string 314 - AddAccount bool 315 - LoggedInUser *oauth.MultiAccountUser 312 + ReturnUrl string 313 + ErrorCode string 314 + AddAccount bool 315 + Accounts []oauth.AccountInfo 316 316 } 317 317 318 318 func (p *Pages) Login(w io.Writer, params LoginParams) error {
appview/pages/templates/user/login.html

This file has not been changed.

appview/pulls/pulls.go

This file has not been changed.

appview/reporesolver/resolver.go

This file has not been changed.

appview/state/login.go

This patch was likely rebased, as context lines do not match.

appview/state/timeline.go

This file has not been changed.

History

9 rounds 0 comments
sign up or login to add to the discussion
1 commit
expand
appview/{pages,state}: simplify LoginPage params
2/3 timeout, 1/3 success
expand
no conflicts, ready to merge
expand 0 comments
1 commit
expand
appview/{pages,state}: simplify LoginPage params
2/3 failed, 1/3 success
expand
expand 0 comments
1 commit
expand
appview/{pages,state}: simplify LoginPage params
2/3 failed, 1/3 success
expand
expand 0 comments
1 commit
expand
appview/{pages,state}: simplify LoginPage params
2/3 failed, 1/3 success
expand
expand 0 comments
1 commit
expand
appview/{pages,state}: simplify LoginPage params
2/3 failed, 1/3 success
expand
expand 0 comments
1 commit
expand
appview/{pages,state}: simplify LoginPage params
3/3 success
expand
expand 0 comments
1 commit
expand
appview/{pages,state}: simplify LoginPage params
2/3 failed, 1/3 success
expand
expand 0 comments
1 commit
expand
appview/{pages,state}: simplify LoginPage params
3/3 success
expand
expand 0 comments
1 commit
expand
appview/{pages,state}: simplify LoginPage params
2/3 failed, 1/3 success
expand
expand 0 comments