diff --git a/appview/oauth/handler/handler.go b/appview/oauth/handler/handler.go index 873fde52f4..484f507290 100644 --- a/appview/oauth/handler/handler.go +++ b/appview/oauth/handler/handler.go @@ -354,11 +354,8 @@ } var ( - tangledHandle = "tangled.sh" - tangledDid = "did:plc:wshs7t2adsemcrrd4snkeqli" - - icyHandle = "icyphox.sh" - icyDid = "did:plc:hwevmowznbiukdf6uk5dwrrq" + tangledDid = "did:plc:wshs7t2adsemcrrd4snkeqli" + icyDid = "did:plc:hwevmowznbiukdf6uk5dwrrq" defaultSpindle = "spindle.tangled.sh" defaultKnot = "knot1.tangled.sh" @@ -383,7 +380,7 @@ } log.Printf("adding %s to default spindle", did) - session, err := o.createAppPasswordSession(o.config.Core.AppPassword, tangledHandle, tangledDid) + session, err := o.createAppPasswordSession(o.config.Core.AppPassword, tangledDid) if err != nil { log.Printf("failed to create session: %s", err) return @@ -396,7 +393,7 @@ CreatedAt: time.Now().Format(time.RFC3339), } - if err := session.putRecord(record); err != nil { + if err := session.putRecord(record, tangled.SpindleMemberNSID); err != nil { log.Printf("failed to add member to default spindle: %s", err) return } @@ -420,7 +417,7 @@ } log.Printf("adding %s to default knot", did) - session, err := o.createAppPasswordSession(o.config.Core.TmpAltAppPassword, icyHandle, icyDid) + session, err := o.createAppPasswordSession(o.config.Core.TmpAltAppPassword, icyDid) if err != nil { log.Printf("failed to create session: %s", err) return @@ -433,7 +430,7 @@ CreatedAt: time.Now().Format(time.RFC3339), } - if err := session.putRecord(record); err != nil { + if err := session.putRecord(record, tangled.KnotMemberNSID); err != nil { log.Printf("failed to add member to default knot: %s", err) return } @@ -448,7 +445,7 @@ Did string } -func (o *OAuthHandler) createAppPasswordSession(appPassword, handle, did string) (*session, error) { +func (o *OAuthHandler) createAppPasswordSession(appPassword, did string) (*session, error) { if appPassword == "" { return nil, fmt.Errorf("no app password configured, skipping member addition") } @@ -464,7 +461,7 @@ } sessionPayload := map[string]string{ - "identifier": handle, + "identifier": did, "password": appPassword, } sessionBytes, err := json.Marshal(sessionPayload) @@ -501,7 +498,7 @@ return &session, nil } -func (s *session) putRecord(record any) error { +func (s *session) putRecord(record any, collection string) error { recordBytes, err := json.Marshal(record) if err != nil { return fmt.Errorf("failed to marshal knot member record: %w", err) @@ -509,7 +506,7 @@ payload := map[string]any{ "repo": s.Did, - "collection": tangled.KnotMemberNSID, + "collection": collection, "rkey": tid.TID(), "record": json.RawMessage(recordBytes), }