chore: add default client id and secret

alby/alby.go

@@ -62,7 +62,12 @@ func NewAlbyOAuthService(logger *logrus.Logger, kvStore config.Config, appConfig
 			AuthURL:   appConfig.AlbyOAuthAuthUrl,
 			AuthStyle: 2, // use HTTP Basic Authorization https://pkg.go.dev/golang.org/x/oauth2#AuthStyle
 		},
-		RedirectURL: appConfig.BaseUrl + "/api/alby/callback",
+	}
+
+	if appConfig.IsDefaultClientId() {
+		conf.RedirectURL = "https://getalby.com/hub/callback"
+	} else {
+		conf.RedirectURL = appConfig.BaseUrl + "/api/alby/callback"
 	}
 
 	albyOAuthSvc := &AlbyOAuthService{

api.go

@@ -789,7 +789,7 @@ func (api *API) GetInfo(ctx context.Context) (*models.InfoResponse, error) {
 	info.Running = api.svc.lnClient != nil
 	info.BackendType = backendType
 	info.AlbyAuthUrl = api.svc.AlbyOAuthSvc.GetAuthUrl()
-	info.OAuthRedirect = api.svc.cfg.Env.AlbyClientId == api.svc.cfg.Env.AlbyHubClientId
+	info.OAuthRedirect = !api.svc.cfg.Env.IsDefaultClientId()
 	albyUserIdentifier, err := api.svc.AlbyOAuthSvc.GetUserIdentifier()
 	if err != nil {
 		api.svc.Logger.WithError(err).Error("Failed to get alby user identifier")

models/config/config.go

@@ -25,16 +25,19 @@ type AppConfig struct {
 	LDKLogLevel        string `envconfig:"LDK_LOG_LEVEL"`
 	MempoolApi         string `envconfig:"MEMPOOL_API" default:"https://mempool.space/api"`
 	AlbyAPIURL         string `envconfig:"ALBY_API_URL" default:"https://api.getalby.com"`
-	AlbyClientId       string `envconfig:"ALBY_OAUTH_CLIENT_ID"`
-	AlbyHubClientId    string `envconfig:"ALBY_HUB_OAUTH_CLIENT_ID"`
-	AlbyClientSecret   string `envconfig:"ALBY_OAUTH_CLIENT_SECRET"`
+	AlbyClientId       string `envconfig:"ALBY_OAUTH_CLIENT_ID" default:"J2PbXS1yOf"`
+	AlbyClientSecret   string `envconfig:"ALBY_OAUTH_CLIENT_SECRET" default:"rABK2n16IWjLTZ9M1uKU"`
 	AlbyOAuthAuthUrl   string `envconfig:"ALBY_OAUTH_AUTH_URL" default:"https://getalby.com/oauth"`
 	BaseUrl            string `envconfig:"BASE_URL" default:"http://localhost:8080"`
 	FrontendUrl        string `envconfig:"FRONTEND_URL"`
 	LogEvents          bool   `envconfig:"LOG_EVENTS" default:"false"`
 	ConnectAlbyAccount bool   `envconfig:"CONNECT_ALBY_ACCOUNT" default:"true"`
 }
 
+func (c *AppConfig) IsDefaultClientId() bool {
+	return c.AlbyClientId == "J2PbXS1yOf"
+}
+
 type Config interface {
 	Get(key string, encryptionKey string) (string, error)
 	SetIgnore(key string, value string, encryptionKey string)