···19192020 // temporarily, to add users to default knot and spindle
2121 AppPassword string `env:"APP_PASSWORD"`
2222+2323+ // uhhhh this is because knot1 is under icy's did
2424+ TmpAltAppPassword string `env:"ALT_APP_PASSWORD, required"`
2225}
23262427type OAuthConfig struct {
+19-14
appview/oauth/handler/handler.go
···354354}
355355356356var (
357357- tangledHandle = "tangled.sh"
358358- tangledDid = "did:plc:wshs7t2adsemcrrd4snkeqli"
357357+ tangledHandle = "tangled.sh"
358358+ tangledDid = "did:plc:wshs7t2adsemcrrd4snkeqli"
359359+360360+ icyHandle = "icyphox.sh"
361361+ icyDid = "did:plc:hwevmowznbiukdf6uk5dwrrq"
362362+359363 defaultSpindle = "spindle.tangled.sh"
360364 defaultKnot = "knot1.tangled.sh"
361365)
···379383 }
380384381385 log.Printf("adding %s to default spindle", did)
382382- session, err := o.createAppPasswordSession()
386386+ session, err := o.createAppPasswordSession(o.config.Core.AppPassword, tangledHandle, tangledDid)
383387 if err != nil {
384388 log.Printf("failed to create session: %s", err)
385389 return
···393397 }
394398395399 if err := session.putRecord(record); err != nil {
396396- log.Printf("failed to add member to default knot: %s", err)
400400+ log.Printf("failed to add member to default spindle: %s", err)
397401 return
398402 }
399403···416420 }
417421418422 log.Printf("adding %s to default knot", did)
419419- session, err := o.createAppPasswordSession()
423423+ session, err := o.createAppPasswordSession(o.config.Core.TmpAltAppPassword, icyHandle, icyDid)
420424 if err != nil {
421425 log.Printf("failed to create session: %s", err)
422426 return
···441445type session struct {
442446 AccessJwt string `json:"accessJwt"`
443447 PdsEndpoint string
448448+ Did string
444449}
445450446446-func (o *OAuthHandler) createAppPasswordSession() (*session, error) {
447447- appPassword := o.config.Core.AppPassword
451451+func (o *OAuthHandler) createAppPasswordSession(appPassword, handle, did string) (*session, error) {
448452 if appPassword == "" {
449453 return nil, fmt.Errorf("no app password configured, skipping member addition")
450454 }
451455452452- resolved, err := o.idResolver.ResolveIdent(context.Background(), tangledDid)
456456+ resolved, err := o.idResolver.ResolveIdent(context.Background(), did)
453457 if err != nil {
454454- return nil, fmt.Errorf("failed to resolve tangled.sh DID %s: %v", tangledDid, err)
458458+ return nil, fmt.Errorf("failed to resolve tangled.sh DID %s: %v", did, err)
455459 }
456460457461 pdsEndpoint := resolved.PDSEndpoint()
458462 if pdsEndpoint == "" {
459459- return nil, fmt.Errorf("no PDS endpoint found for tangled.sh DID %s", tangledDid)
463463+ return nil, fmt.Errorf("no PDS endpoint found for tangled.sh DID %s", did)
460464 }
461465462466 sessionPayload := map[string]string{
463463- "identifier": tangledHandle,
467467+ "identifier": handle,
464468 "password": appPassword,
465469 }
466470 sessionBytes, err := json.Marshal(sessionPayload)
···492496 }
493497494498 session.PdsEndpoint = pdsEndpoint
499499+ session.Did = did
495500496501 return &session, nil
497502}
···503508 }
504509505510 payload := map[string]any{
506506- "repo": tangledDid,
511511+ "repo": s.Did,
507512 "collection": tangled.KnotMemberNSID,
508513 "rkey": tid.TID(),
509514 "record": json.RawMessage(recordBytes),
···526531 client := &http.Client{Timeout: 30 * time.Second}
527532 resp, err := client.Do(req)
528533 if err != nil {
529529- return fmt.Errorf("failed to add user to default Knot: %w", err)
534534+ return fmt.Errorf("failed to add user to default service: %w", err)
530535 }
531536 defer resp.Body.Close()
532537533538 if resp.StatusCode != http.StatusOK {
534534- return fmt.Errorf("failed to add user to default Knot: HTTP %d", resp.StatusCode)
539539+ return fmt.Errorf("failed to add user to default service: HTTP %d", resp.StatusCode)
535540 }
536541537542 return nil