alt-ap.diff
46 lines 1.7 kB view raw
1diff --git a/appview/config/config.go b/appview/config/config.go 2index 8fd0a48..aed054b 100644 3--- a/appview/config/config.go 4+++ b/appview/config/config.go 5@@ -19,6 +19,9 @@ type CoreConfig struct { 6 7 // temporarily, to add users to default knot and spindle 8 AppPassword string `env:"APP_PASSWORD"` 9+ 10+ // uhhhh this is because knot1 is under icy's did 11+ TmpAltAppPassword string `env:"ALT_APP_PASSWORD"` 12 } 13 14 type OAuthConfig struct { 15diff --git a/appview/oauth/handler/handler.go b/appview/oauth/handler/handler.go 16index 65c458d..3264ede 100644 17--- a/appview/oauth/handler/handler.go 18+++ b/appview/oauth/handler/handler.go 19@@ -379,7 +379,7 @@ func (o *OAuthHandler) addToDefaultSpindle(did string) { 20 } 21 22 log.Printf("adding %s to default spindle", did) 23- session, err := o.createAppPasswordSession() 24+ session, err := o.createAppPasswordSession(o.config.Core.AppPassword) 25 if err != nil { 26 log.Printf("failed to create session: %s", err) 27 return 28@@ -416,7 +416,7 @@ func (o *OAuthHandler) addToDefaultKnot(did string) { 29 } 30 31 log.Printf("adding %s to default knot", did) 32- session, err := o.createAppPasswordSession() 33+ session, err := o.createAppPasswordSession(o.config.Core.TmpAltAppPassword) 34 if err != nil { 35 log.Printf("failed to create session: %s", err) 36 return 37@@ -443,8 +443,7 @@ type session struct { 38 PdsEndpoint string 39 } 40 41-func (o *OAuthHandler) createAppPasswordSession() (*session, error) { 42- appPassword := o.config.Core.AppPassword 43+func (o *OAuthHandler) createAppPasswordSession(appPassword string) (*session, error) { 44 if appPassword == "" { 45 return nil, fmt.Errorf("no app password configured, skipping member addition") 46 }