rename grantService

interledger · Jan 8, 2025 · 26ffd3d · 26ffd3d
1 parent 69cbef4
commit 26ffd3d
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 82 deletions.
diff --git a/src/background/container.ts b/src/background/container.ts
@@ -41,7 +41,7 @@ export interface Cradle {
   events: EventsService;
   deduplicator: Deduplicator;
   storage: StorageService;
-  grantService: OutgoingPaymentGrantService;
+  outgoingPaymentGrantService: OutgoingPaymentGrantService;
   openPaymentsService: OpenPaymentsService;
   walletService: WalletService;
   monetizationService: MonetizationService;
@@ -79,7 +79,7 @@ export const configureContainer = () => {
       .inject(() => ({
         logger: logger.getLogger('storage'),
       })),
-    grantService: asClass(OutgoingPaymentGrantService)
+    outgoingPaymentGrantService: asClass(OutgoingPaymentGrantService)
       .singleton()
       .inject(() => ({
         logger: logger.getLogger('outgoing-payment-grant'),

diff --git a/src/background/services/monetization.ts b/src/background/services/monetization.ts
@@ -29,7 +29,7 @@ export class MonetizationService {
   private logger: Cradle['logger'];
   private t: Cradle['t'];
   private openPaymentsService: Cradle['openPaymentsService'];
-  private grantService: Cradle['grantService'];
+  private outgoingPaymentGrantService: Cradle['outgoingPaymentGrantService'];
   private storage: Cradle['storage'];
   private events: Cradle['events'];
   private tabState: Cradle['tabState'];
@@ -40,7 +40,7 @@ export class MonetizationService {
     logger,
     t,
     openPaymentsService,
-    grantService,
+    outgoingPaymentGrantService,
     storage,
     events,
     tabState,
@@ -51,7 +51,7 @@ export class MonetizationService {
       logger,
       t,
       openPaymentsService,
-      grantService,
+      outgoingPaymentGrantService,
       storage,
       events,
       tabState,
@@ -116,7 +116,7 @@ export class MonetizationService {
         frameId,
         this.storage,
         this.openPaymentsService,
-        this.grantService,
+        this.outgoingPaymentGrantService,
         this.events,
         this.tabState,
         removeQueryParams(url!),
@@ -360,7 +360,7 @@ export class MonetizationService {
           )) {
             outgoingPayments.set(sessionId, outgoingPayment);
           }
-          return outgoingPayments.get(sessionId)!;
+          return outgoingPayments.get(sessionId);
         }),
     );
 
@@ -425,7 +425,10 @@ export class MonetizationService {
     if (!connected) return false;
     if (isOkState(state)) return true;
 
-    if (state.out_of_funds && this.grantService.isAnyGrantUsable()) {
+    if (
+      state.out_of_funds &&
+      this.outgoingPaymentGrantService.isAnyGrantUsable()
+    ) {
       // if we're in out_of_funds state, we still try to make payments hoping we
       // have funds available now. If a payment succeeds, we move out from
       // of_out_funds state.

diff --git a/src/background/services/outgoingPaymentGrant.ts b/src/background/services/outgoingPaymentGrant.ts
@@ -193,21 +193,16 @@ export class OutgoingPaymentGrantService {
       );
     }
 
-    const grantDetails = this.buildGrantDetails(
-      continuation,
-      recurring,
-      walletAmount,
-    );
-
-    await this.persistGrantDetails(grantDetails);
+    this.grant = this.buildGrantDetails(continuation, recurring, walletAmount);
+    await this.persistGrantDetails(this.grant);
 
     await this.redirectToWelcomeScreen(
       tabId,
       GrantResult.GRANT_SUCCESS,
       intent,
     );
 
-    return grantDetails;
+    return this.grant;
   }
 
   public async cancelGrant(grantContinuation: GrantDetails['continue']) {
@@ -292,9 +287,7 @@ export class OutgoingPaymentGrantService {
     }
   }
 
-  public async addPublicKeyToWalletWithRotateToken(
-    walletAddress: WalletAddress,
-  ) {
+  public async retryAddPublicKeyToWallet(walletAddress: WalletAddress) {
     let tabId: number | undefined;
 
     try {
@@ -539,8 +532,6 @@ export class OutgoingPaymentGrantService {
       });
       this.isGrantUsable.oneTime = true;
     }
-
-    this.grant = grantDetails;
   }
 
   private async redirectToWelcomeScreen(

diff --git a/src/background/services/paymentSession.ts b/src/background/services/paymentSession.ts
@@ -78,7 +78,7 @@ export class PaymentSession {
     private frameId: number,
     private storage: StorageService,
     private openPaymentsService: OpenPaymentsService,
-    private grantService: OutgoingPaymentGrantService,
+    private outgoingPaymentGrantService: OutgoingPaymentGrantService,
     private events: EventsService,
     private tabState: TabState,
     private url: string,
@@ -147,7 +147,7 @@ export class PaymentSession {
         throw new DOMException('Aborting existing probing', 'AbortError');
       }
       try {
-        await this.probeDebitAmount(
+        await this.createPaymentQuote(
           amountToSend.toString(),
           this.incomingPaymentUrl,
           this.sender,
@@ -156,7 +156,7 @@ export class PaymentSession {
         break;
       } catch (e) {
         if (isTokenExpiredError(e)) {
-          await this.grantService.rotateToken();
+          await this.outgoingPaymentGrantService.rotateToken();
         } else if (isNonPositiveAmountError(e)) {
           amountToSend = BigInt(amountIter.next().value);
           continue;
@@ -397,10 +397,10 @@ export class PaymentSession {
     amount,
     incomingPaymentId,
   }: CreateOutgoingPaymentParams): Promise<OutgoingPayment> {
-    const client = this.openPaymentsService.client;
+    const { client } = this.openPaymentsService;
     const outgoingPayment = await client.outgoingPayment.create(
       {
-        accessToken: this.grantService.accessToken(),
+        accessToken: this.outgoingPaymentGrantService.accessToken(),
         url: walletAddress.resourceServer,
       },
       {
@@ -419,7 +419,7 @@ export class PaymentSession {
 
     if (outgoingPayment.grantSpentDebitAmount) {
       this.storage.updateSpentAmount(
-        this.grantService.grantType(),
+        this.outgoingPaymentGrantService.grantType(),
         outgoingPayment.grantSpentDebitAmount.value,
       );
     }
@@ -428,15 +428,15 @@ export class PaymentSession {
     return outgoingPayment;
   }
 
-  private async probeDebitAmount(
+  private async createPaymentQuote(
     amount: AmountValue,
     incomingPayment: IncomingPayment['id'],
     sender: WalletAddress,
   ): Promise<void> {
     await this.openPaymentsService.client.quote.create(
       {
         url: sender.resourceServer,
-        accessToken: this.grantService.accessToken(),
+        accessToken: this.outgoingPaymentGrantService.accessToken(),
       },
       {
         method: 'ilp',
@@ -493,7 +493,7 @@ export class PaymentSession {
         this.events.emit('open_payments.key_revoked');
         throw e;
       } else if (isTokenExpiredError(e)) {
-        await this.grantService.rotateToken();
+        await this.outgoingPaymentGrantService.rotateToken();
         return await this.pay(amount); // retry
       } else {
         throw e;
@@ -513,11 +513,11 @@ export class PaymentSession {
     while (++attempt <= maxAttempts) {
       try {
         signal?.throwIfAborted();
-        const outgoingPayment =
-          await this.openPaymentsService.client.outgoingPayment.get({
-            url: outgoingPaymentId,
-            accessToken: this.grantService.accessToken(),
-          });
+        const { client } = this.openPaymentsService;
+        const outgoingPayment = await client.outgoingPayment.get({
+          url: outgoingPaymentId,
+          accessToken: this.outgoingPaymentGrantService.accessToken(),
+        });
         yield outgoingPayment;
         if (
           outgoingPayment.failed &&
@@ -540,7 +540,7 @@ export class PaymentSession {
           // TODO: We can remove the token `actions` check once we've proper RS
           // errors in place. Then we can handle insufficient grant error
           // separately clearly.
-          const token = await this.grantService.rotateToken();
+          const token = await this.outgoingPaymentGrantService.rotateToken();
           const hasReadAccess = token.access_token.access.find(
             (e) => e.type === 'outgoing-payment' && e.actions.includes('read'),
           );
@@ -601,10 +601,10 @@ export class PaymentSession {
       if (isKeyRevokedError(e)) {
         this.events.emit('open_payments.key_revoked');
       } else if (isTokenExpiredError(e)) {
-        await this.grantService.rotateToken();
+        await this.outgoingPaymentGrantService.rotateToken();
         this.shouldRetryImmediately = true;
       } else if (isOutOfBalanceError(e)) {
-        const switched = await this.grantService.switchGrant();
+        const switched = await this.outgoingPaymentGrantService.switchGrant();
         if (switched === null) {
           this.events.emit('open_payments.out_of_funds');
         } else {