···
357
-
tangledHandle = "tangled.sh"
358
-
tangledDid = "did:plc:wshs7t2adsemcrrd4snkeqli"
357
+
tangledDid = "did:plc:wshs7t2adsemcrrd4snkeqli"
358
+
icyDid = "did:plc:hwevmowznbiukdf6uk5dwrrq"
defaultSpindle = "spindle.tangled.sh"
defaultKnot = "knot1.tangled.sh"
···
log.Printf("adding %s to default spindle", did)
382
-
session, err := o.createAppPasswordSession()
383
+
session, err := o.createAppPasswordSession(o.config.Core.AppPassword, tangledDid)
log.Printf("failed to create session: %s", err)
···
CreatedAt: time.Now().Format(time.RFC3339),
395
-
if err := session.putRecord(record); err != nil {
396
-
log.Printf("failed to add member to default knot: %s", err)
396
+
if err := session.putRecord(record, tangled.SpindleMemberNSID); err != nil {
397
+
log.Printf("failed to add member to default spindle: %s", err)
···
log.Printf("adding %s to default knot", did)
419
-
session, err := o.createAppPasswordSession()
420
+
session, err := o.createAppPasswordSession(o.config.Core.TmpAltAppPassword, icyDid)
log.Printf("failed to create session: %s", err)
···
CreatedAt: time.Now().Format(time.RFC3339),
432
-
if err := session.putRecord(record); err != nil {
433
+
if err := session.putRecord(record, tangled.KnotMemberNSID); err != nil {
log.Printf("failed to add member to default knot: %s", err)
···
AccessJwt string `json:"accessJwt"`
446
-
func (o *OAuthHandler) createAppPasswordSession() (*session, error) {
447
-
appPassword := o.config.Core.AppPassword
448
+
func (o *OAuthHandler) createAppPasswordSession(appPassword, did string) (*session, error) {
return nil, fmt.Errorf("no app password configured, skipping member addition")
452
-
resolved, err := o.idResolver.ResolveIdent(context.Background(), tangledDid)
453
+
resolved, err := o.idResolver.ResolveIdent(context.Background(), did)
454
-
return nil, fmt.Errorf("failed to resolve tangled.sh DID %s: %v", tangledDid, err)
455
+
return nil, fmt.Errorf("failed to resolve tangled.sh DID %s: %v", did, err)
pdsEndpoint := resolved.PDSEndpoint()
459
-
return nil, fmt.Errorf("no PDS endpoint found for tangled.sh DID %s", tangledDid)
460
+
return nil, fmt.Errorf("no PDS endpoint found for tangled.sh DID %s", did)
sessionPayload := map[string]string{
463
-
"identifier": tangledHandle,
sessionBytes, err := json.Marshal(sessionPayload)
···
session.PdsEndpoint = pdsEndpoint
499
-
func (s *session) putRecord(record any) error {
501
+
func (s *session) putRecord(record any, collection string) error {
recordBytes, err := json.Marshal(record)
return fmt.Errorf("failed to marshal knot member record: %w", err)
payload := map[string]any{
506
-
"repo": tangledDid,
507
-
"collection": tangled.KnotMemberNSID,
509
+
"collection": collection,
"record": json.RawMessage(recordBytes),
···
client := &http.Client{Timeout: 30 * time.Second}
resp, err := client.Do(req)
529
-
return fmt.Errorf("failed to add user to default Knot: %w", err)
531
+
return fmt.Errorf("failed to add user to default service: %w", err)
if resp.StatusCode != http.StatusOK {
534
-
return fmt.Errorf("failed to add user to default Knot: HTTP %d", resp.StatusCode)
536
+
return fmt.Errorf("failed to add user to default service: HTTP %d", resp.StatusCode)
julien.rbrt.fr
anirudh.fi