forked from
tangled.org/core
Monorepo for Tangled
appview/{oauth,pages}: cleanup unused codes
- `AccountRegistry.OtherAccounts()` is not used anywhere
- Removed several legacy session value names from `oauth/consts.go`
- We can just embed the `oauth.GetUser()` now
Signed-off-by: Seongmin Lee <git@boltless.me>
authored by
Seongmin Lee
and committed by
Tangled
2713446b
013ad312
+23
-85
+6
-14
appview/oauth/accounts.go
+6
-14
appview/oauth/accounts.go
···
53
53
return ®istry
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
-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
-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
+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
-
}
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
242
}
254
243
255
244
func (o *OAuth) GetDid(r *http.Request) string {
-2
appview/pages/templates/user/login.html
-2
appview/pages/templates/user/login.html
···
13
13
14
14
{{ if and .LoggedInUser .LoggedInUser.Accounts }}
15
15
{{ $accounts := .LoggedInUser.Accounts }}
16
-
{{ if $accounts }}
17
16
<div class="my-4 border border-gray-200 dark:border-gray-700 rounded overflow-hidden">
18
17
<div class="px-3 py-2 bg-gray-50 dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700">
19
18
<span class="text-xs text-gray-500 dark:text-gray-400 uppercase tracking-wide font-medium">Saved accounts</span>
···
47
46
{{ end }}
48
47
</div>
49
48
</div>
50
-
{{ end }}
51
49
{{ end }}
52
50
53
51
<form
+14
-14
appview/state/profile.go
+14
-14
appview/state/profile.go
···
892
892
893
893
func (s *State) UploadProfileAvatar(w http.ResponseWriter, r *http.Request) {
894
894
l := s.logger.With("handler", "UploadProfileAvatar")
895
-
user := s.oauth.GetUser(r)
896
-
l = l.With("did", user.Did)
895
+
user := s.oauth.GetMultiAccountUser(r)
896
+
l = l.With("did", user.Active.Did)
897
897
898
898
// Parse multipart form (10MB max)
899
899
if err := r.ParseMultipartForm(10 << 20); err != nil {
···
940
940
l.Info("uploaded avatar blob", "cid", uploadBlobResp.Blob.Ref.String())
941
941
942
942
// get current profile record from PDS to get its CID for swap
943
-
getRecordResp, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Did, "self")
943
+
getRecordResp, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Active.Did, "self")
944
944
if err != nil {
945
945
l.Error("failed to get current profile record", "err", err)
946
946
s.pages.Notice(w, "avatar-error", "Failed to get current profile from your PDS")
···
964
964
965
965
_, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{
966
966
Collection: tangled.ActorProfileNSID,
967
-
Repo: user.Did,
967
+
Repo: user.Active.Did,
968
968
Rkey: "self",
969
969
Record: &lexutil.LexiconTypeDecoder{Val: profileRecord},
970
970
SwapRecord: getRecordResp.Cid,
···
978
978
979
979
l.Info("successfully updated profile with avatar")
980
980
981
-
profile, err := db.GetProfile(s.db, user.Did)
981
+
profile, err := db.GetProfile(s.db, user.Active.Did)
982
982
if err != nil {
983
983
l.Warn("getting profile data from DB", "err", err)
984
984
}
985
985
if profile == nil {
986
-
profile = &models.Profile{Did: user.Did}
986
+
profile = &models.Profile{Did: user.Active.Did}
987
987
}
988
988
profile.Avatar = uploadBlobResp.Blob.Ref.String()
989
989
···
1008
1008
1009
1009
func (s *State) RemoveProfileAvatar(w http.ResponseWriter, r *http.Request) {
1010
1010
l := s.logger.With("handler", "RemoveProfileAvatar")
1011
-
user := s.oauth.GetUser(r)
1012
-
l = l.With("did", user.Did)
1011
+
user := s.oauth.GetMultiAccountUser(r)
1012
+
l = l.With("did", user.Active.Did)
1013
1013
1014
1014
client, err := s.oauth.AuthorizedClient(r)
1015
1015
if err != nil {
···
1018
1018
return
1019
1019
}
1020
1020
1021
-
getRecordResp, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Did, "self")
1021
+
getRecordResp, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Active.Did, "self")
1022
1022
if err != nil {
1023
1023
l.Error("failed to get current profile record", "err", err)
1024
1024
s.pages.Notice(w, "avatar-error", "Failed to get current profile from your PDS")
···
1042
1042
1043
1043
_, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{
1044
1044
Collection: tangled.ActorProfileNSID,
1045
-
Repo: user.Did,
1045
+
Repo: user.Active.Did,
1046
1046
Rkey: "self",
1047
1047
Record: &lexutil.LexiconTypeDecoder{Val: profileRecord},
1048
1048
SwapRecord: getRecordResp.Cid,
···
1056
1056
1057
1057
l.Info("successfully removed avatar from PDS")
1058
1058
1059
-
profile, err := db.GetProfile(s.db, user.Did)
1059
+
profile, err := db.GetProfile(s.db, user.Active.Did)
1060
1060
if err != nil {
1061
1061
l.Warn("getting profile data from DB", "err", err)
1062
1062
}
1063
1063
if profile == nil {
1064
-
profile = &models.Profile{Did: user.Did}
1064
+
profile = &models.Profile{Did: user.Active.Did}
1065
1065
}
1066
1066
profile.Avatar = ""
1067
1067
···
1091
1091
l.Error("invalid profile update form", "err", err)
1092
1092
return
1093
1093
}
1094
-
user := s.oauth.GetUser(r)
1094
+
user := s.oauth.GetMultiAccountUser(r)
1095
1095
1096
1096
hideOthers := false
1097
1097
hideMine := false
···
1103
1103
hideOthers = true
1104
1104
}
1105
1105
1106
-
err = db.UpsertPunchcardPreference(s.db, user.Did, hideMine, hideOthers)
1106
+
err = db.UpsertPunchcardPreference(s.db, user.Active.Did, hideMine, hideOthers)
1107
1107
if err != nil {
1108
1108
l.Error("failed to update punchcard preferences", "err", err)
1109
1109
return