feat: auto link alby account (#336)

.env.example

@@ -6,7 +6,7 @@
 #RELAY=ws://localhost:7447/v1
 #PORT=8080
 #FRONTEND_URL=http://localhost:5173
-#CONNECT_ALBY_ACCOUNT=false
+#AUTO_LINK_ALBY_ACCOUNT=false
 
 # set LDK_GOSSIP_SOURCE as empty to not use RGS
 #LDK_GOSSIP_SOURCE=

alby/alby_oauth_service.go

@@ -70,7 +70,7 @@ func NewAlbyOAuthService(db *gorm.DB, cfg config.Config, keys keys.Keys, eventPu
 	return albyOAuthSvc
 }
 
-func (svc *albyOAuthService) CallbackHandler(ctx context.Context, code string) error {
+func (svc *albyOAuthService) CallbackHandler(ctx context.Context, code string, lnClient lnclient.LNClient) error {
 	token, err := svc.oauthConf.Exchange(ctx, code)
 	if err != nil {
 		logger.Logger.WithError(err).Error("Failed to exchange token")
@@ -95,6 +95,15 @@ func (svc *albyOAuthService) CallbackHandler(ctx context.Context, code string) e
 	// save the user's alby account ID on first time login
 	if existingUserIdentifier == "" {
 		svc.cfg.SetUpdate(userIdentifierKey, me.Identifier, "")
+
+		if svc.cfg.GetEnv().AutoLinkAlbyAccount {
+			// link account on first login
+			err := svc.LinkAccount(ctx, lnClient, 1_000_000, constants.BUDGET_RENEWAL_MONTHLY)
+			if err != nil {
+				logger.Logger.WithError(err).Error("Failed to link account on first auth callback")
+			}
+		}
+
 	} else if me.Identifier != existingUserIdentifier {
 		// remove token so user can retry with correct account
 		svc.cfg.SetUpdate(accessTokenKey, "", "")

alby/models.go

@@ -14,7 +14,7 @@ type AlbyOAuthService interface {
 	GetUserIdentifier() (string, error)
 	IsConnected(ctx context.Context) bool
 	LinkAccount(ctx context.Context, lnClient lnclient.LNClient, budget uint64, renewal string) error
-	CallbackHandler(ctx context.Context, code string) error
+	CallbackHandler(ctx context.Context, code string, lnClient lnclient.LNClient) error
 	GetBalance(ctx context.Context) (*AlbyBalance, error)
 	GetMe(ctx context.Context) (*AlbyMe, error)
 	SendPayment(ctx context.Context, invoice string) error

config/models.go

@@ -36,6 +36,7 @@ type AppConfig struct {
 	BaseUrl               string `envconfig:"BASE_URL" default:"http://localhost:8080"`
 	FrontendUrl           string `envconfig:"FRONTEND_URL"`
 	LogEvents             bool   `envconfig:"LOG_EVENTS" default:"false"`
+	AutoLinkAlbyAccount   bool   `envconfig:"AUTO_LINK_ALBY_ACCOUNT" default:"true"`
 	PhoenixdAddress       string `envconfig:"PHOENIXD_ADDRESS"`
 	PhoenixdAuthorization string `envconfig:"PHOENIXD_AUTHORIZATION"`
 	GoProfilerAddr        string `envconfig:"GO_PROFILER_ADDR"`

frontend/src/components/AuthCodeForm.tsx

@@ -77,7 +77,7 @@ function AuthCodeForm() {
                 <div className="grid gap-1.5">
                   <Label htmlFor="authorization-code">Authorization Code</Label>
                   <Input
-                    type="text"
+                    type="password"
                     name="authorization-code"
                     id="authorization-code"
                     placeholder="Enter code you see in the browser"

http/alby_http_service.go

@@ -37,7 +37,7 @@ func (albyHttpSvc *AlbyHttpService) RegisterSharedRoutes(e *echo.Echo, authMiddl
 func (albyHttpSvc *AlbyHttpService) albyCallbackHandler(c echo.Context) error {
 	code := c.QueryParam("code")
 
-	err := albyHttpSvc.albyOAuthSvc.CallbackHandler(c.Request().Context(), code)
+	err := albyHttpSvc.albyOAuthSvc.CallbackHandler(c.Request().Context(), code, albyHttpSvc.svc.GetLNClient())
 	if err != nil {
 		logger.Logger.WithError(err).Error("Failed to handle Alby OAuth callback")
 		return c.JSON(http.StatusInternalServerError, ErrorResponse{

wails/wails_handlers.go

@@ -37,7 +37,7 @@ func (app *WailsApp) WailsRequestRouter(route string, method string, body string
 	case len(authCodeMatch) > 1:
 		code := authCodeMatch[1]
 
-		err := app.svc.GetAlbyOAuthSvc().CallbackHandler(ctx, code)
+		err := app.svc.GetAlbyOAuthSvc().CallbackHandler(ctx, code, app.svc.GetLNClient())
 		if err != nil {
 			logger.Logger.WithFields(logrus.Fields{
 				"route":  route,