fix.patch
1diff --git a/appview/oauth/handler/handler.go b/appview/oauth/handler/handler.go
2index 873fde52f4..484f507290 100644
3--- a/appview/oauth/handler/handler.go
4+++ b/appview/oauth/handler/handler.go
5@@ -354,11 +354,8 @@
6 }
7
8 var (
9- tangledHandle = "tangled.sh"
10- tangledDid = "did:plc:wshs7t2adsemcrrd4snkeqli"
11-
12- icyHandle = "icyphox.sh"
13- icyDid = "did:plc:hwevmowznbiukdf6uk5dwrrq"
14+ tangledDid = "did:plc:wshs7t2adsemcrrd4snkeqli"
15+ icyDid = "did:plc:hwevmowznbiukdf6uk5dwrrq"
16
17 defaultSpindle = "spindle.tangled.sh"
18 defaultKnot = "knot1.tangled.sh"
19@@ -383,7 +380,7 @@
20 }
21
22 log.Printf("adding %s to default spindle", did)
23- session, err := o.createAppPasswordSession(o.config.Core.AppPassword, tangledHandle, tangledDid)
24+ session, err := o.createAppPasswordSession(o.config.Core.AppPassword, tangledDid)
25 if err != nil {
26 log.Printf("failed to create session: %s", err)
27 return
28@@ -396,7 +393,7 @@
29 CreatedAt: time.Now().Format(time.RFC3339),
30 }
31
32- if err := session.putRecord(record); err != nil {
33+ if err := session.putRecord(record, tangled.SpindleMemberNSID); err != nil {
34 log.Printf("failed to add member to default spindle: %s", err)
35 return
36 }
37@@ -420,7 +417,7 @@
38 }
39
40 log.Printf("adding %s to default knot", did)
41- session, err := o.createAppPasswordSession(o.config.Core.TmpAltAppPassword, icyHandle, icyDid)
42+ session, err := o.createAppPasswordSession(o.config.Core.TmpAltAppPassword, icyDid)
43 if err != nil {
44 log.Printf("failed to create session: %s", err)
45 return
46@@ -433,7 +430,7 @@
47 CreatedAt: time.Now().Format(time.RFC3339),
48 }
49
50- if err := session.putRecord(record); err != nil {
51+ if err := session.putRecord(record, tangled.KnotMemberNSID); err != nil {
52 log.Printf("failed to add member to default knot: %s", err)
53 return
54 }
55@@ -448,7 +445,7 @@
56 Did string
57 }
58
59-func (o *OAuthHandler) createAppPasswordSession(appPassword, handle, did string) (*session, error) {
60+func (o *OAuthHandler) createAppPasswordSession(appPassword, did string) (*session, error) {
61 if appPassword == "" {
62 return nil, fmt.Errorf("no app password configured, skipping member addition")
63 }
64@@ -464,7 +461,7 @@
65 }
66
67 sessionPayload := map[string]string{
68- "identifier": handle,
69+ "identifier": did,
70 "password": appPassword,
71 }
72 sessionBytes, err := json.Marshal(sessionPayload)
73@@ -501,7 +498,7 @@
74 return &session, nil
75 }
76
77-func (s *session) putRecord(record any) error {
78+func (s *session) putRecord(record any, collection string) error {
79 recordBytes, err := json.Marshal(record)
80 if err != nil {
81 return fmt.Errorf("failed to marshal knot member record: %w", err)
82@@ -509,7 +506,7 @@
83
84 payload := map[string]any{
85 "repo": s.Did,
86- "collection": tangled.KnotMemberNSID,
87+ "collection": collection,
88 "rkey": tid.TID(),
89 "record": json.RawMessage(recordBytes),
90 }