appview/{oauth,pages}: cleanup unused codes #1022

+23 -85

6 changed files

Diff round #5

expand all

appview

oauth

accounts.go

accounts_test.go

consts.go

oauth.go

pages

templates

user

state

profile.go

+6 -14

appview/oauth/accounts.go

··· 53 53 return &registry 54 54 } 55 55 56 - func (o *OAuth) SaveAccounts(w http.ResponseWriter, r *http.Request, registry *AccountRegistry) error { 56 + func (o *OAuth) saveAccounts(w http.ResponseWriter, r *http.Request, registry *AccountRegistry) error { 57 57 session, err := o.SessStore.Get(r, AccountsName) 58 58 if err != nil { 59 59 o.Logger.Warn("failed to decode existing accounts cookie, will create new", "err", err) ··· 114 114 return nil 115 115 } 116 116 117 - func (r *AccountRegistry) OtherAccounts(activeDid string) []AccountInfo { 118 - result := make([]AccountInfo, 0, len(r.Accounts)) 119 - for _, acc := range r.Accounts { 120 - if acc.Did != activeDid { 121 - result = append(result, acc) 122 - } 123 - } 124 - return result 125 - } 126 - 127 117 func (o *OAuth) GetMultiAccountUser(r *http.Request) *MultiAccountUser { 128 - user := o.GetUser(r) 129 - if user == nil { 118 + sess, err := o.ResumeSession(r) 119 + if err != nil { 130 120 return nil 131 121 } 132 122 133 123 registry := o.GetAccounts(r) 134 124 return &MultiAccountUser{ 135 - Active: user, 125 + Active: &User{ 126 + Did: sess.Data.AccountDID.String(), 127 + }, 136 128 Accounts: registry.Accounts, 137 129 } 138 130 }

-35

appview/oauth/accounts_test.go

··· 211 211 }) 212 212 } 213 213 214 - func TestAccountRegistry_OtherAccounts(t *testing.T) { 215 - registry := &AccountRegistry{ 216 - Accounts: []AccountInfo{ 217 - {Did: "did:plc:active", Handle: "active", SessionId: "s1"}, 218 - {Did: "did:plc:other1", Handle: "other1", SessionId: "s2"}, 219 - {Did: "did:plc:other2", Handle: "other2", SessionId: "s3"}, 220 - }, 221 - } 222 - 223 - others := registry.OtherAccounts("did:plc:active") 224 - 225 - if len(others) != 2 { 226 - t.Errorf("OtherAccounts() len = %d, want 2", len(others)) 227 - } 228 - 229 - for _, acc := range others { 230 - if acc.Did == "did:plc:active" { 231 - t.Errorf("OtherAccounts() should not include active account") 232 - } 233 - } 234 - 235 - hasDid := func(did string) bool { 236 - for _, acc := range others { 237 - if acc.Did == did { 238 - return true 239 - } 240 - } 241 - return false 242 - } 243 - 244 - if !hasDid("did:plc:other1") || !hasDid("did:plc:other2") { 245 - t.Errorf("OtherAccounts() missing expected accounts") 246 - } 247 - } 248 - 249 214 func TestMultiAccountUser_Did(t *testing.T) { 250 215 t.Run("with active user", func(t *testing.T) { 251 216 user := &MultiAccountUser{

-6

appview/oauth/consts.go

··· 10 10 SessionDid = "did" 11 11 SessionId = "id" 12 12 SessionPds = "pds" 13 - SessionAccessJwt = "accessJwt" 14 - SessionRefreshJwt = "refreshJwt" 15 - SessionExpiry = "expiry" 16 13 SessionAuthenticated = "authenticated" 17 - 18 - SessionDpopPrivateJwk = "dpopPrivateJwk" 19 - SessionDpopAuthServerNonce = "dpopAuthServerNonce" 20 14 )

+3 -14

appview/oauth/oauth.go

··· 128 128 if err := registry.AddAccount(sessData.AccountDID.String(), handle, sessData.SessionID); err != nil { 129 129 return err 130 130 } 131 - return o.SaveAccounts(w, r, registry) 131 + return o.saveAccounts(w, r, registry) 132 132 } 133 133 134 134 func (o *OAuth) ResumeSession(r *http.Request) (*oauth.ClientSession, error) { ··· 204 204 sess, err := o.ClientApp.ResumeSession(r.Context(), did, account.SessionId) 205 205 if err != nil { 206 206 registry.RemoveAccount(targetDid) 207 - _ = o.SaveAccounts(w, r, registry) 207 + _ = o.saveAccounts(w, r, registry) 208 208 return fmt.Errorf("session expired for account: %w", err) 209 209 } 210 210 ··· 234 234 } 235 235 236 236 registry.RemoveAccount(targetDid) 237 - return o.SaveAccounts(w, r, registry) 237 + return o.saveAccounts(w, r, registry) 238 238 } 239 239 240 240 type User struct { 241 241 Did string 242 242 } 243 243 244 - func (o *OAuth) GetUser(r *http.Request) *User { 245 - sess, err := o.ResumeSession(r) 246 - if err != nil { 247 - return nil 248 - } 249 - 250 - return &User{ 251 - Did: sess.Data.AccountDID.String(), 252 - } 253 - } 254 - 255 244 func (o *OAuth) GetDid(r *http.Request) string { 256 245 if u := o.GetMultiAccountUser(r); u != nil { 257 246 return u.Did()

-2

appview/pages/templates/user/login.html

······

+14 -14

appview/state/profile.go

··· 785 785 786 786 func (s *State) UploadProfileAvatar(w http.ResponseWriter, r *http.Request) { 787 787 l := s.logger.With("handler", "UploadProfileAvatar") 788 - user := s.oauth.GetUser(r) 789 - l = l.With("did", user.Did) 788 + user := s.oauth.GetMultiAccountUser(r) 789 + l = l.With("did", user.Active.Did) 790 790 791 791 // Parse multipart form (10MB max) 792 792 if err := r.ParseMultipartForm(10 << 20); err != nil { ··· 833 833 l.Info("uploaded avatar blob", "cid", uploadBlobResp.Blob.Ref.String()) 834 834 835 835 // get current profile record from PDS to get its CID for swap 836 - getRecordResp, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Did, "self") 836 + getRecordResp, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Active.Did, "self") 837 837 if err != nil { 838 838 l.Error("failed to get current profile record", "err", err) 839 839 s.pages.Notice(w, "avatar-error", "Failed to get current profile from your PDS") ··· 857 857 858 858 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 859 859 Collection: tangled.ActorProfileNSID, 860 - Repo: user.Did, 860 + Repo: user.Active.Did, 861 861 Rkey: "self", 862 862 Record: &lexutil.LexiconTypeDecoder{Val: profileRecord}, 863 863 SwapRecord: getRecordResp.Cid, ··· 871 871 872 872 l.Info("successfully updated profile with avatar") 873 873 874 - profile, err := db.GetProfile(s.db, user.Did) 874 + profile, err := db.GetProfile(s.db, user.Active.Did) 875 875 if err != nil { 876 876 l.Warn("getting profile data from DB", "err", err) 877 877 } 878 878 if profile == nil { 879 - profile = &models.Profile{Did: user.Did} 879 + profile = &models.Profile{Did: user.Active.Did} 880 880 } 881 881 profile.Avatar = uploadBlobResp.Blob.Ref.String() 882 882 ··· 901 901 902 902 func (s *State) RemoveProfileAvatar(w http.ResponseWriter, r *http.Request) { 903 903 l := s.logger.With("handler", "RemoveProfileAvatar") 904 - user := s.oauth.GetUser(r) 905 - l = l.With("did", user.Did) 904 + user := s.oauth.GetMultiAccountUser(r) 905 + l = l.With("did", user.Active.Did) 906 906 907 907 client, err := s.oauth.AuthorizedClient(r) 908 908 if err != nil { ··· 911 911 return 912 912 } 913 913 914 - getRecordResp, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Did, "self") 914 + getRecordResp, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Active.Did, "self") 915 915 if err != nil { 916 916 l.Error("failed to get current profile record", "err", err) 917 917 s.pages.Notice(w, "avatar-error", "Failed to get current profile from your PDS") ··· 935 935 936 936 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 937 937 Collection: tangled.ActorProfileNSID, 938 - Repo: user.Did, 938 + Repo: user.Active.Did, 939 939 Rkey: "self", 940 940 Record: &lexutil.LexiconTypeDecoder{Val: profileRecord}, 941 941 SwapRecord: getRecordResp.Cid, ··· 949 949 950 950 l.Info("successfully removed avatar from PDS") 951 951 952 - profile, err := db.GetProfile(s.db, user.Did) 952 + profile, err := db.GetProfile(s.db, user.Active.Did) 953 953 if err != nil { 954 954 l.Warn("getting profile data from DB", "err", err) 955 955 } 956 956 if profile == nil { 957 - profile = &models.Profile{Did: user.Did} 957 + profile = &models.Profile{Did: user.Active.Did} 958 958 } 959 959 profile.Avatar = "" 960 960 ··· 983 983 log.Println("invalid profile update form", err) 984 984 return 985 985 } 986 - user := s.oauth.GetUser(r) 986 + user := s.oauth.GetMultiAccountUser(r) 987 987 988 988 hideOthers := false 989 989 hideMine := false ··· 995 995 hideOthers = true 996 996 } 997 997 998 - err = db.UpsertPunchcardPreference(s.db, user.Did, hideMine, hideOthers) 998 + err = db.UpsertPunchcardPreference(s.db, user.Active.Did, hideMine, hideOthers) 999 999 if err != nil { 1000 1000 log.Println("failed to update punchcard preferences", err) 1001 1001 return