fix(background)!: better payment confirmation & message

src/background/services/monetization.ts

@@ -8,10 +8,7 @@ import type {
 } from '@/shared/messages';
 import { PaymentSession } from './paymentSession';
 import { computeRate, getSender, getTabId } from '../utils';
-import {
-  isMissingGrantPermissionsError,
-  isOutOfBalanceError,
-} from './openPayments';
+import { isOutOfBalanceError } from './openPayments';
 import {
   OUTGOING_PAYMENT_POLLING_MAX_ATTEMPTS,
   OUTGOING_PAYMENT_POLLING_MAX_DURATION,
@@ -329,7 +326,8 @@ export class MonetizationService {
         .filter((e) => e.status === 'rejected')
         .map((e) => e.reason);
 
-      if (pollingErrors.some((e) => isMissingGrantPermissionsError(e))) {
+      if (pollingErrors.some((e) => e.message === 'InsufficientGrant')) {
+        this.logger.warn('Insufficient grant to read outgoing payments');
         // This permission request to read outgoing payments was added at a
         // later time, so existing connected wallets won't have this permission.
         // Assume as success for backward compatibility.

src/background/services/openPayments.ts

@@ -893,7 +893,6 @@ export class OpenPaymentsService {
     }: Partial<{ signal: AbortSignal; maxAttempts: number }> = {},
   ): AsyncGenerator<OutgoingPayment, OutgoingPayment, void> {
     let attempt = 0;
-    let tokenRotated = false;
     await sleep(OUTGOING_PAYMENT_POLLING_INITIAL_DELAY);
     while (++attempt <= maxAttempts) {
       try {
@@ -917,17 +916,19 @@ export class OpenPaymentsService {
         signal?.throwIfAborted();
         await sleep(OUTGOING_PAYMENT_POLLING_INTERVAL);
       } catch (error) {
-        if (isMissingGrantPermissionsError(error)) {
-          if (isTokenInactiveError(error) && !tokenRotated) {
-            // isMissingGrantPermissionError has same error msg as isTokenInactiveError
-            tokenRotated = true;
-            await this.rotateToken();
-            continue;
+        if (
+          isTokenExpiredError(error) ||
+          isMissingGrantPermissionsError(error)
+        ) {
+          const token = await this.rotateToken();
+          const hasReadAccess = token.access_token.access.find(
+            (e) => e.type === 'outgoing-payment' && e.actions.includes('read'),
+          );
+          if (!hasReadAccess) {
+            throw new OpenPaymentsClientError('InsufficientGrant', {
+              description: error.description,
+            });
           }
-          throw error;
-        } else if (isTokenExpiredError(error) && !tokenRotated) {
-          tokenRotated = true;
-          await this.rotateToken();
         } else {
           throw error;
         }
@@ -1022,6 +1023,7 @@ export class OpenPaymentsService {
       this.storage.set({ oneTimeGrant: { ...this.grant, accessToken } });
     }
     this.grant = { ...this.grant, accessToken };
+    return newToken;
   }
 }
 
@@ -1054,7 +1056,9 @@ export const isSignatureValidationError = (error: any) => {
   );
 };
 
-export const isTokenExpiredError = (error: any) => {
+export const isTokenExpiredError = (
+  error: any,
+): error is OpenPaymentsClientError => {
   if (!isOpenPaymentsClientError(error)) return false;
   return isTokenInvalidError(error) || isTokenInactiveError(error);
 };

src/background/services/paymentSession.ts

@@ -9,7 +9,6 @@ import { transformBalance } from '@/popup/lib/utils';
 import {
   isInvalidReceiverError,
   isKeyRevokedError,
-  isMissingGrantPermissionsError,
   isNonPositiveAmountError,
   isOutOfBalanceError,
   isTokenExpiredError,
@@ -411,8 +410,6 @@ export class PaymentSession {
       if (isKeyRevokedError(e)) {
         this.events.emit('open_payments.key_revoked');
         throw e;
-      } else if (isMissingGrantPermissionsError(e)) {
-        throw e;
       } else if (isTokenExpiredError(e)) {
         await this.openPaymentsService.rotateToken();
         return await this.pay(amount); // retry