diff --git a/api/api.go b/api/api.go index 8e2ae829..d99259db 100644 --- a/api/api.go +++ b/api/api.go @@ -99,6 +99,11 @@ func (api *api) CreateApp(createAppRequest *CreateAppRequest) (*CreateAppRespons relayUrl := api.cfg.GetRelayUrl() + lightningAddress, err := api.albyOAuthSvc.GetLightningAddress() + if err != nil { + return nil, err + } + responseBody := &CreateAppResponse{} responseBody.Id = app.ID responseBody.Name = createAppRequest.Name @@ -106,11 +111,7 @@ func (api *api) CreateApp(createAppRequest *CreateAppRequest) (*CreateAppRespons responseBody.PairingSecret = pairingSecretKey responseBody.WalletPubkey = *app.WalletPubkey responseBody.RelayUrl = relayUrl - - lightningAddress, err := api.albyOAuthSvc.GetLightningAddress() - if err != nil { - return nil, err - } + responseBody.Lud16 = lightningAddress if createAppRequest.ReturnTo != "" { returnToUrl, err := url.Parse(createAppRequest.ReturnTo) diff --git a/api/models.go b/api/models.go index 16d074d9..c9e7a03d 100644 --- a/api/models.go +++ b/api/models.go @@ -156,6 +156,7 @@ type CreateAppResponse struct { Pubkey string `json:"pairingPublicKey"` RelayUrl string `json:"relayUrl"` WalletPubkey string `json:"walletPubkey"` + Lud16 string `json:"lud16"` Id uint `json:"id"` Name string `json:"name"` ReturnTo string `json:"returnTo"` diff --git a/frontend/src/screens/apps/AppCreated.tsx b/frontend/src/screens/apps/AppCreated.tsx index 2d90c7aa..0cd9b090 100644 --- a/frontend/src/screens/apps/AppCreated.tsx +++ b/frontend/src/screens/apps/AppCreated.tsx @@ -62,6 +62,7 @@ function AppCreatedInternal() { detail: { relayUrl: createAppResponse.relayUrl, walletPubkey: createAppResponse.walletPubkey, + lud16: createAppResponse.lud16, }, }); window.dispatchEvent(nwcEvent); @@ -73,11 +74,16 @@ function AppCreatedInternal() { type: "nwc:success", relayUrl: createAppResponse.relayUrl, walletPubkey: createAppResponse.walletPubkey, + lud16: createAppResponse.lud16, }, "*" ); } - }, [createAppResponse.relayUrl, createAppResponse.walletPubkey]); + }, [ + createAppResponse.relayUrl, + createAppResponse.walletPubkey, + createAppResponse.lud16, + ]); if (!createAppResponse) { return ; diff --git a/frontend/src/types.ts b/frontend/src/types.ts index 7f2f566a..bdceccc1 100644 --- a/frontend/src/types.ts +++ b/frontend/src/types.ts @@ -204,6 +204,7 @@ export interface CreateAppResponse { pairingSecretKey: string; relayUrl: string; walletPubkey: string; + lud16: string; returnTo: string; }