Merge pull request #8 from getAlby/deprecate

Add note about the Alby Hub and redirect users to the hub

alby.go

@@ -659,7 +659,7 @@ func (svc *AlbyOAuthService) CallbackHandler(c echo.Context) error {
 	}
 	client := svc.oauthConf.Client(c.Request().Context(), tok)
 
-	req, err := http.NewRequest("GET", fmt.Sprintf("%s/user/me", svc.cfg.AlbyAPIURL), nil)
+	req, err := http.NewRequest("GET", fmt.Sprintf("%s/internal/users", svc.cfg.AlbyAPIURL), nil)
 	if err != nil {
 		svc.Logger.WithError(err).Error("Error creating request /me")
 		return err
@@ -686,6 +686,7 @@ func (svc *AlbyOAuthService) CallbackHandler(c echo.Context) error {
 	user.Expiry = tok.Expiry // TODO; probably needs some calculation
 	user.Email = me.Email
 	user.LightningAddress = me.LightningAddress
+	user.HubUrl = me.Hub.Url
 	svc.db.Save(&user)
 
 	sess, _ := session.Get(CookieName, c)

echo_handlers.go

@@ -284,6 +284,9 @@ func (svc *Service) AppsNewHandler(c echo.Context) error {
 		sess.Save(c.Request(), c.Response())
 		return c.Redirect(302, fmt.Sprintf("/%s/auth?c=%s", strings.ToLower(svc.cfg.LNBackendType), appName))
 	}
+	if user.HubUrl != "" {
+		return c.Redirect(302, fmt.Sprintf("%s/#/apps/new?%s", user.HubUrl, c.QueryString()))
+	}
 
 	//construction to return a map with all possible permissions
 	//and indicate which ones are checked by default in the front-end

migrations/202407110000_add_user_hub_url.go

@@ -0,0 +1,17 @@
+package migrations
+
+import (
+	"github.com/go-gormigrate/gormigrate/v2"
+	"gorm.io/gorm"
+)
+
+// Save user's new hub URL so it only has to be requested once on auth
+var _202407110000_user_hub_url = &gormigrate.Migration{
+	ID: "_202407110000_user_hub_url",
+	Migrate: func(tx *gorm.DB) error {
+		return tx.Exec("ALTER TABLE users ADD COLUMN hub_url TEXT").Error
+	},
+	Rollback: func(tx *gorm.DB) error {
+		return nil
+	},
+}

migrations/migrate.go

@@ -12,6 +12,7 @@ func Migrate(db *gorm.DB) error {
 		_202309271617_fix_preimage_null,
 		_202309271618_add_payment_sum_index,
 		_202401092201_add_events_id_index,
+		_202407110000_user_hub_url,
 	})
 
 	return m.Migrate()

models.go

@@ -56,11 +56,16 @@ var nip47MethodIcons = map[string]string{
 }
 
 // TODO: move to models/Alby
+type AlbyMeHub struct {
+	Url string `json:"url"`
+}
 type AlbyMe struct {
-	Identifier       string `json:"identifier"`
-	NPub             string `json:"nostr_pubkey"`
-	LightningAddress string `json:"lightning_address"`
-	Email            string `json:"email"`
+	Identifier       string    `json:"identifier"`
+	NPub             string    `json:"nostr_pubkey"`
+	LightningAddress string    `json:"lightning_address"`
+	Email            string    `json:"email"`
+	SharedNode       bool      `json:"shared_node"`
+	Hub              AlbyMeHub `json:"hub"`
 }
 
 type User struct {
@@ -69,6 +74,7 @@ type User struct {
 	AccessToken      string `validate:"required"`
 	RefreshToken     string `validate:"required"`
 	Email            string
+	HubUrl           string
 	Expiry           time.Time
 	LightningAddress string
 	Apps             []App