Merge branch 'task-pay-keysend' of github.com:getAlby/nostr-wallet-co…

…nnect into task-pay-keysend
getAlby · Dec 13, 2023 · d18b5d4 · d18b5d4
2 parents 823c1ed + 27c4589
commit d18b5d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/handle_pay_keysend_request.go b/handle_pay_keysend_request.go
@@ -33,11 +33,8 @@ func (svc *Service) HandlePayKeysendEvent(ctx context.Context, request *Nip47Req
 		return nil, err
 	}
 
-	hasPermission, code, message := svc.hasPermission(&app, event, NIP_47_PAY_INVOICE_METHOD, 0)
-	if hasPermission {
-		// We use pay_invoice permissions for budget and max amount
-		hasPermission, code, message = svc.hasPermission(&app, event, NIP_47_PAY_INVOICE_METHOD, payParams.Amount)
-	}
+	// We use pay_invoice permissions for budget and max amount
+	hasPermission, code, message := svc.hasPermission(&app, event, NIP_47_PAY_INVOICE_METHOD, payParams.Amount)
 
 	if !hasPermission {
 		svc.Logger.WithFields(logrus.Fields{

diff --git a/service_test.go b/service_test.go
@@ -314,13 +314,6 @@ func TestHandleEvent(t *testing.T) {
 	newMaxAmount = 1000
 	err = svc.db.Model(&AppPermission{}).Where("app_id = ?", app.ID).Update("request_method", NIP_47_PAY_INVOICE_METHOD).Update("max_amount", newMaxAmount).Error
 	assert.NoError(t, err)
-	// create a second permission for getting the budget
-	appPermission = &AppPermission{
-		AppId:         app.ID,
-		App:           app,
-		RequestMethod: NIP_47_PAY_KEYSEND_METHOD,
-		ExpiresAt:     expiresAt,
-	}
 	err = svc.db.Create(appPermission).Error
 	res, err = svc.HandleEvent(ctx, &nostr.Event{
 		ID:      "test_pay_keysend_event_2",