From b1d057d060f5a35efece0c1630150f199ee281a9 Mon Sep 17 00:00:00 2001
From: Seongmin Lee <git@boltless.me>
Date: Sun, 25 Jan 2026 20:38:13 +0900
Subject: [PATCH] appview/{pages,state}: simplify LoginPage params

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>
---
 appview/oauth/accounts.go               |  7 ++-----
 appview/oauth/accounts_test.go          | 18 ------------------
 appview/pages/pages.go                  |  8 ++++----
 appview/pages/templates/user/login.html |  5 ++---
 appview/pulls/pulls.go                  |  2 +-
 appview/reporesolver/resolver.go        |  2 +-
 appview/state/login.go                  | 22 ++++++----------------
 appview/state/timeline.go               |  2 +-
 8 files changed, 17 insertions(+), 49 deletions(-)

diff --git a/appview/oauth/accounts.go b/appview/oauth/accounts.go
index 2a7e1f89..c8948bf1 100644
--- a/appview/oauth/accounts.go
+++ b/appview/oauth/accounts.go
@@ -23,14 +23,11 @@ type AccountRegistry struct {
 }
 
 type MultiAccountUser struct {
-	Active   *User
+	Active   User
 	Accounts []AccountInfo
 }
 
 func (m *MultiAccountUser) Did() string {
-	if m.Active == nil {
-		return ""
-	}
 	return m.Active.Did
 }
 
@@ -122,7 +119,7 @@ func (o *OAuth) GetMultiAccountUser(r *http.Request) *MultiAccountUser {
 
 	registry := o.GetAccounts(r)
 	return &MultiAccountUser{
-		Active: &User{
+		Active: User{
 			Did: sess.Data.AccountDID.String(),
 		},
 		Accounts: registry.Accounts,
diff --git a/appview/oauth/accounts_test.go b/appview/oauth/accounts_test.go
index 7df95fbc..6d57536e 100644
--- a/appview/oauth/accounts_test.go
+++ b/appview/oauth/accounts_test.go
@@ -210,21 +210,3 @@ func TestAccountRegistry_FindAccount(t *testing.T) {
 		}
 	})
 }
-
-func TestMultiAccountUser_Did(t *testing.T) {
-	t.Run("with active user", func(t *testing.T) {
-		user := &MultiAccountUser{
-			Active: &User{Did: "did:plc:test"},
-		}
-		if user.Did() != "did:plc:test" {
-			t.Errorf("Did() = %s, want did:plc:test", user.Did())
-		}
-	})
-
-	t.Run("with nil active", func(t *testing.T) {
-		user := &MultiAccountUser{Active: nil}
-		if user.Did() != "" {
-			t.Errorf("Did() = %s, want empty string", user.Did())
-		}
-	})
-}
diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index 9451e9eb..c1b9bc4c 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -309,10 +309,10 @@ func (p *Pages) Favicon(w io.Writer) error {
 }
 
 type LoginParams struct {
-	ReturnUrl    string
-	ErrorCode    string
-	AddAccount   bool
-	LoggedInUser *oauth.MultiAccountUser
+	ReturnUrl  string
+	ErrorCode  string
+	AddAccount bool
+	Accounts   []oauth.AccountInfo
 }
 
 func (p *Pages) Login(w io.Writer, params LoginParams) error {
diff --git a/appview/pages/templates/user/login.html b/appview/pages/templates/user/login.html
index f941e8bb..cfd52098 100644
--- a/appview/pages/templates/user/login.html
+++ b/appview/pages/templates/user/login.html
@@ -11,14 +11,13 @@
   </div>
   {{ end }}
 
-  {{ if and .LoggedInUser .LoggedInUser.Accounts }}
-  {{ $accounts := .LoggedInUser.Accounts }}
+  {{ if .Accounts }}
   <div class="my-4 border border-gray-200 dark:border-gray-700 rounded overflow-hidden">
       <div class="px-3 py-2 bg-gray-50 dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700">
           <span class="text-xs text-gray-500 dark:text-gray-400 uppercase tracking-wide font-medium">Saved accounts</span>
       </div>
       <div class="divide-y divide-gray-200 dark:divide-gray-700">
-          {{ range $accounts }}
+          {{ range .Accounts }}
           <div class="flex items-center justify-between px-3 py-2 hover:bg-gray-100 dark:hover:bg-gray-700">
               <button
                   type="button"
diff --git a/appview/pulls/pulls.go b/appview/pulls/pulls.go
index f79fac7f..e64fe0d9 100644
--- a/appview/pulls/pulls.go
+++ b/appview/pulls/pulls.go
@@ -198,7 +198,7 @@ func (s *Pulls) repoPullHelper(w http.ResponseWriter, r *http.Request, interdiff
 	mergeCheckResponse := s.mergeCheck(r, f, pull, stack)
 	branchDeleteStatus := s.branchDeleteStatus(r, f, pull)
 	resubmitResult := pages.Unknown
-	if user != nil && user.Active != nil && user.Active.Did == pull.OwnerDid {
+	if user != nil && user.Active.Did == pull.OwnerDid {
 		resubmitResult = s.resubmitCheck(r, f, pull, stack)
 	}
 
diff --git a/appview/reporesolver/resolver.go b/appview/reporesolver/resolver.go
index 941b8789..c5ad5bf3 100644
--- a/appview/reporesolver/resolver.go
+++ b/appview/reporesolver/resolver.go
@@ -75,7 +75,7 @@ func (rr *RepoResolver) GetRepoInfo(r *http.Request, user *oauth.MultiAccountUse
 	repoAt := repo.RepoAt()
 	isStarred := false
 	roles := repoinfo.RolesInRepo{}
-	if user != nil && user.Active != nil {
+	if user != nil {
 		isStarred = db.GetStarStatus(rr.execer, user.Active.Did, repoAt)
 		roles.Roles = rr.enforcer.GetPermissionsInRepo(user.Active.Did, repo.Knot, repo.DidSlashRepo())
 	}
diff --git a/appview/state/login.go b/appview/state/login.go
index c68501fd..45492358 100644
--- a/appview/state/login.go
+++ b/appview/state/login.go
@@ -9,7 +9,6 @@ import (
 
 	comatproto "github.com/bluesky-social/indigo/api/atproto"
 	"github.com/bluesky-social/indigo/xrpc"
-	"tangled.org/core/appview/oauth"
 	"tangled.org/core/appview/pages"
 )
 
@@ -22,21 +21,12 @@ func (s *State) Login(w http.ResponseWriter, r *http.Request) {
 		errorCode := r.URL.Query().Get("error")
 		addAccount := r.URL.Query().Get("mode") == "add_account"
 
-		user := s.oauth.GetMultiAccountUser(r)
-		if user == nil {
-			registry := s.oauth.GetAccounts(r)
-			if len(registry.Accounts) > 0 {
-				user = &oauth.MultiAccountUser{
-					Active:   nil,
-					Accounts: registry.Accounts,
-				}
-			}
-		}
+		registry := s.oauth.GetAccounts(r)
 		s.pages.Login(w, pages.LoginParams{
-			ReturnUrl:    returnURL,
-			ErrorCode:    errorCode,
-			AddAccount:   addAccount,
-			LoggedInUser: user,
+			ReturnUrl:  returnURL,
+			ErrorCode:  errorCode,
+			AddAccount: addAccount,
+			Accounts:   registry.Accounts,
 		})
 	case http.MethodPost:
 		handle := r.FormValue("handle")
@@ -120,7 +110,7 @@ func (s *State) Logout(w http.ResponseWriter, r *http.Request) {
 	l := s.logger.With("handler", "Logout")
 
 	currentUser := s.oauth.GetMultiAccountUser(r)
-	if currentUser == nil || currentUser.Active == nil {
+	if currentUser == nil {
 		s.pages.HxRedirect(w, "/login")
 		return
 	}
diff --git a/appview/state/timeline.go b/appview/state/timeline.go
index 26771f67..1a231766 100644
--- a/appview/state/timeline.go
+++ b/appview/state/timeline.go
@@ -47,7 +47,7 @@ func (s *State) Timeline(w http.ResponseWriter, r *http.Request) {
 	filtered := false
 
 	var userDid string
-	if user != nil && user.Active != nil {
+	if user != nil {
 		userDid = user.Active.Did
 	}
 	timeline, err := db.MakeTimeline(s.db, 50, userDid, filtered)
-- 
2.51.2