Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/integration/blockchain/lightning/lightning-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -558,21 +558,23 @@ export class LightningClient {
}

// --- LNURLw REWRITE --- //
async getLnurlwWithdrawRequest(linkId: string, uniqueHash: string): Promise<LnBitsLnurlWithdrawRequestDto | any> {
const lnBitsUrl = `${Config.blockchain.lightning.lnbits.lnurlwApiUrl}/lnurl/${linkId}/${uniqueHash}`;
async getLnurlwWithdrawRequest(linkId: string, uniqueHash?: string): Promise<LnBitsLnurlWithdrawRequestDto | any> {
const lnBitsUrl = `${Config.blockchain.lightning.lnbits.lnurlwApiUrl}/lnurl/${linkId}${
uniqueHash ? `/${uniqueHash}` : ''
}`;
return this.http.get(lnBitsUrl, this.httpLnBitsConfig(Config.blockchain.lightning.lnbits.adminKey));
}

async sendLnurlwInvoice(
linkId: string,
uniqueHash: string,
id: string,
k1: string,
pr: string,
uniqueHash?: string,
): Promise<LnBitsLnurlwInvoiceDto | any> {
const lnBitsCallbackUrl = new URL(`${Config.blockchain.lightning.lnbits.lnurlwApiUrl}/lnurl/cb/${linkId}`);
lnBitsCallbackUrl.searchParams.set('id_unique_hash', uniqueHash);
const lnBitsCallbackUrl = new URL(`${Config.blockchain.lightning.lnbits.lnurlwApiUrl}/lnurl/cb/${id}`);
lnBitsCallbackUrl.searchParams.set('k1', k1);
lnBitsCallbackUrl.searchParams.set('pr', pr);
if (uniqueHash) lnBitsCallbackUrl.searchParams.set('id_unique_hash', uniqueHash);

return this.http.get<LnBitsLnurlwInvoiceDto>(
lnBitsCallbackUrl.toString(),
Expand Down
4 changes: 2 additions & 2 deletions src/integration/blockchain/lightning/lightning-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ export class LightningHelper {
}

// --- LNURLw --- //
static createLnurlwCallbackUrl(id: string, uniqueHash: string): string {
return `${Config.url}/lnurlw/cb/${id}/${uniqueHash}`;
static createLnurlwCallbackUrl(id: string, uniqueHash?: string): string {
return `${Config.url}/lnurlw/cb/${id}${uniqueHash ? `/${uniqueHash}` : ''}`;
}

// --- LNURL --- //
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ import { LightningForwardService } from '../services/lightning-forward.service';
export class LightingLnurlwForwardController {
constructor(private forwardService: LightningForwardService) {}

@Get(':id/:unique_hash')
async lnurlwForward(
@Param('id') id: string,
@Param('unique_hash') uniqueHash: string,
): Promise<LnBitsLnurlWithdrawRequestDto> {
return this.forwardService.lnurlwForward(id, uniqueHash);
}

@Get('cb/:id/:unique_hash')
@Get('cb/:id/:unique_hash?')
async lnUrlWCallbackForward(
@Param('id') id: string,
@Param('unique_hash') uniqueHash: string,
@Query('k1') k1: string,
@Query('pr') pr: string,
@Param('unique_hash') uniqueHash?: string,
): Promise<any> {
return this.forwardService.lnurlwCallbackForward(id, uniqueHash, k1, pr);
return this.forwardService.lnurlwCallbackForward(id, k1, pr, uniqueHash);
}

@Get(':id/:unique_hash?')
async lnurlwForward(
@Param('id') id: string,
@Param('unique_hash') uniqueHash?: string,
): Promise<LnBitsLnurlWithdrawRequestDto> {
return this.forwardService.lnurlwForward(id, uniqueHash);
}
}
11 changes: 8 additions & 3 deletions src/subdomains/lightning/services/lightning-forward.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -209,16 +209,21 @@ export class LightningForwardService {
}

// --- LNURLw --- //
async lnurlwForward(id: string, uniqueHash: string): Promise<LnBitsLnurlWithdrawRequestDto> {
async lnurlwForward(id: string, uniqueHash?: string): Promise<LnBitsLnurlWithdrawRequestDto> {
const withdrawRequest = await this.client.getLnurlwWithdrawRequest(id, uniqueHash);

withdrawRequest.callback = LightningHelper.createLnurlwCallbackUrl(id, uniqueHash);

return withdrawRequest;
}

async lnurlwCallbackForward(id: string, uniqueHash: string, k1: string, pr: string): Promise<LnBitsLnurlwInvoiceDto> {
return this.client.sendLnurlwInvoice(id, uniqueHash, k1, pr);
async lnurlwCallbackForward(
id: string,
k1: string,
pr: string,
uniqueHash?: string,
): Promise<LnBitsLnurlwInvoiceDto> {
return this.client.sendLnurlwInvoice(id, k1, pr, uniqueHash);
}

// --- UTILITIES --- //
Expand Down