Correct misaligned steps 10 and 11

Author: RobertOdrowaz

in_app_purchases/codelab_rebuild.yaml

@@ -17486,15 +17486,15 @@ steps:
           from: steps
           to: step_08
 
-  - name: step_09
+  - name: step_10
     steps:
-      - name: Remove step_09
-        rmdir: step_09
+      - name: Remove step_10
+        rmdir: step_10
       - name: Patch app/lib/main.dart
         path: steps/app/lib/main.dart
         patch-u: |
-          --- b/in_app_purchases/step_09/app/lib/main.dart
-          +++ a/in_app_purchases/step_09/app/lib/main.dart
+          --- b/in_app_purchases/step_10/app/lib/main.dart
+          +++ a/in_app_purchases/step_10/app/lib/main.dart
           @@ -79,7 +79,11 @@ class _MyHomePageState extends State<MyHomePage> {
                      create: (context) => IAPRepo(context.read<FirebaseNotifier>()),
                    ),
@@ -17511,8 +17511,8 @@ steps:
       - name: Patch app/lib/logic/dash_purchases.dart
         path: steps/app/lib/logic/dash_purchases.dart
         patch-u: |
-          --- b/in_app_purchases/step_09/app/lib/logic/dash_purchases.dart
-          +++ a/in_app_purchases/step_09/app/lib/logic/dash_purchases.dart
+          --- b/in_app_purchases/step_10/app/lib/logic/dash_purchases.dart
+          +++ a/in_app_purchases/step_10/app/lib/logic/dash_purchases.dart
           @@ -1,7 +1,9 @@
            import 'dart:async';
           +import 'dart:convert';
@@ -17605,8 +17605,8 @@ steps:
       - name: Patch app/lib/logic/firebase_notifier.dart
         path: steps/app/lib/logic/firebase_notifier.dart
         patch-u: |
-          --- b/in_app_purchases/step_09/app/lib/logic/firebase_notifier.dart
-          +++ a/in_app_purchases/step_09/app/lib/logic/firebase_notifier.dart
+          --- b/in_app_purchases/step_10/app/lib/logic/firebase_notifier.dart
+          +++ a/in_app_purchases/step_10/app/lib/logic/firebase_notifier.dart
           @@ -29,6 +29,8 @@ class FirebaseNotifier extends ChangeNotifier {
                return FirebaseFirestore.instance;
              }
@@ -17619,8 +17619,8 @@ steps:
       - name: Patch app/lib/pages/purchase_page.dart
         path: steps/app/lib/pages/purchase_page.dart
         patch-u: |
-          --- b/in_app_purchases/step_09/app/lib/pages/purchase_page.dart
-          +++ a/in_app_purchases/step_09/app/lib/pages/purchase_page.dart
+          --- b/in_app_purchases/step_10/app/lib/pages/purchase_page.dart
+          +++ a/in_app_purchases/step_10/app/lib/pages/purchase_page.dart
           @@ -2,15 +2,29 @@ import 'package:flutter/material.dart';
            import 'package:provider/provider.dart';
 
@@ -17654,8 +17654,8 @@ steps:
       - name: Patch dart-backend/bin/server.dart
         path: steps/dart-backend/bin/server.dart
         patch-u: |
-          --- b/in_app_purchases/step_09/dart-backend/bin/server.dart
-          +++ a/in_app_purchases/step_09/dart-backend/bin/server.dart
+          --- b/in_app_purchases/step_10/dart-backend/bin/server.dart
+          +++ a/in_app_purchases/step_10/dart-backend/bin/server.dart
           @@ -2,12 +2,111 @@
            // for details. All rights reserved. Use of this source code is governed by a
            // BSD-style license that can be found in the LICENSE file.
@@ -18099,20 +18099,20 @@ steps:
               required String token,
             });
           }
-      - name: Copy to step_09
+      - name: Copy to step_10
         copydir:
           from: steps
-          to: step_09
+          to: step_10
 
-  - name: step_10
+  - name: step_11
     steps:
-      - name: Remove step_10
-        rmdir: step_10
+      - name: Remove step_11
+        rmdir: step_11
       - name: Patch app/lib/main.dart
         path: steps/app/lib/main.dart
         patch-u: |
-          --- b/in_app_purchases/step_10/app/lib/main.dart
-          +++ a/in_app_purchases/step_10/app/lib/main.dart
+          --- b/in_app_purchases/step_11/app/lib/main.dart
+          +++ a/in_app_purchases/step_11/app/lib/main.dart
           @@ -83,6 +83,7 @@ class _MyHomePageState extends State<MyHomePage> {
                          (context) => DashPurchases(
                            context.read<DashCounter>(),
@@ -18124,8 +18124,8 @@ steps:
       - name: Patch app/lib/logic/dash_purchases.dart
         path: steps/app/lib/logic/dash_purchases.dart
         patch-u: |
-          --- b/in_app_purchases/step_10/app/lib/logic/dash_purchases.dart
-          +++ a/in_app_purchases/step_10/app/lib/logic/dash_purchases.dart
+          --- b/in_app_purchases/step_11/app/lib/logic/dash_purchases.dart
+          +++ a/in_app_purchases/step_11/app/lib/logic/dash_purchases.dart
           @@ -10,6 +10,7 @@ import '../constants.dart';
            import '../main.dart';
            import '../model/purchasable_product.dart';
@@ -18228,8 +18228,8 @@ steps:
       - name: Patch dart-backend/bin/server.dart
         path: steps/dart-backend/bin/server.dart
         patch-u: |
-          --- b/in_app_purchases/step_10/dart-backend/bin/server.dart
-          +++ a/in_app_purchases/step_10/dart-backend/bin/server.dart
+          --- b/in_app_purchases/step_11/dart-backend/bin/server.dart
+          +++ a/in_app_purchases/step_11/dart-backend/bin/server.dart
           @@ -5,7 +5,9 @@
            import 'dart:convert';
            import 'dart:io';
@@ -18315,8 +18315,8 @@ steps:
       - name: Patch dart-backend/lib/app_store_purchase_handler.dart
         path: steps/dart-backend/lib/app_store_purchase_handler.dart
         patch-u: |
-          --- b/in_app_purchases/step_10/dart-backend/lib/app_store_purchase_handler.dart
-          +++ a/in_app_purchases/step_10/dart-backend/lib/app_store_purchase_handler.dart
+          --- b/in_app_purchases/step_11/dart-backend/lib/app_store_purchase_handler.dart
+          +++ a/in_app_purchases/step_11/dart-backend/lib/app_store_purchase_handler.dart
           @@ -7,10 +7,19 @@ import 'iap_repository.dart';
            import 'products.dart';
            import 'purchase_handler.dart';
@@ -18395,8 +18395,8 @@ steps:
       - name: Patch dart-backend/lib/google_play_purchase_handler.dart
         path: steps/dart-backend/lib/google_play_purchase_handler.dart
         patch-u: |
-          --- b/in_app_purchases/step_10/dart-backend/lib/google_play_purchase_handler.dart
-          +++ a/in_app_purchases/step_10/dart-backend/lib/google_play_purchase_handler.dart
+          --- b/in_app_purchases/step_11/dart-backend/lib/google_play_purchase_handler.dart
+          +++ a/in_app_purchases/step_11/dart-backend/lib/google_play_purchase_handler.dart
           @@ -1,6 +1,8 @@
            import 'dart:async';
           +import 'dart:convert';
@@ -18512,10 +18512,10 @@ steps:
            }
 
            NonSubscriptionStatus _nonSubscriptionStatusFrom(int? state) {
-      - name: Copy to step_10
+      - name: Copy to step_11
         copydir:
           from: steps
-          to: step_10
+          to: step_11
 
   - name: complete
     steps:

in_app_purchases/step_10/app/lib/logic/dash_purchases.dart

@@ -10,7 +10,6 @@ import '../constants.dart';
 import '../main.dart';
 import '../model/purchasable_product.dart';
 import '../model/store_state.dart';
-import '../repo/iap_repo.dart';
 import 'dash_counter.dart';
 import 'firebase_notifier.dart';
 
@@ -20,20 +19,19 @@ class DashPurchases extends ChangeNotifier {
   StoreState storeState = StoreState.loading;
   late StreamSubscription<List<PurchaseDetails>> _subscription;
   List<PurchasableProduct> products = [];
-  IAPRepo iapRepo;
 
   bool get beautifiedDash => _beautifiedDashUpgrade;
   bool _beautifiedDashUpgrade = false;
+
   final iapConnection = IAPConnection.instance;
 
-  DashPurchases(this.counter, this.firebaseNotifier, this.iapRepo) {
+  DashPurchases(this.counter, this.firebaseNotifier) {
     final purchaseUpdated = iapConnection.purchaseStream;
     _subscription = purchaseUpdated.listen(
       _onPurchaseUpdate,
       onDone: _updateStreamOnDone,
       onError: _updateStreamOnError,
     );
-    iapRepo.addListener(purchasesUpdate);
     loadPurchases();
   }
 
@@ -59,7 +57,6 @@ class DashPurchases extends ChangeNotifier {
   @override
   void dispose() {
     _subscription.cancel();
-    iapRepo.removeListener(purchasesUpdate);
     super.dispose();
   }
 
@@ -142,59 +139,4 @@ class DashPurchases extends ChangeNotifier {
   void _updateStreamOnError(dynamic error) {
     //Handle error here
   }
-
-  void purchasesUpdate() {
-    var subscriptions = <PurchasableProduct>[];
-    var upgrades = <PurchasableProduct>[];
-    // Get a list of purchasable products for the subscription and upgrade.
-    // This should be 1 per type.
-    if (products.isNotEmpty) {
-      subscriptions =
-          products
-              .where(
-                (element) => element.productDetails.id == storeKeySubscription,
-              )
-              .toList();
-      upgrades =
-          products
-              .where((element) => element.productDetails.id == storeKeyUpgrade)
-              .toList();
-    }
-
-    // Set the subscription in the counter logic and show/hide purchased on the
-    // purchases page.
-    if (iapRepo.hasActiveSubscription) {
-      counter.applyPaidMultiplier();
-      for (var element in subscriptions) {
-        _updateStatus(element, ProductStatus.purchased);
-      }
-    } else {
-      counter.removePaidMultiplier();
-      for (var element in subscriptions) {
-        _updateStatus(element, ProductStatus.purchasable);
-      }
-    }
-
-    // Set the Dash beautifier and show/hide purchased on
-    // the purchases page.
-    if (iapRepo.hasUpgrade != _beautifiedDashUpgrade) {
-      _beautifiedDashUpgrade = iapRepo.hasUpgrade;
-      for (var element in upgrades) {
-        _updateStatus(
-          element,
-          _beautifiedDashUpgrade
-              ? ProductStatus.purchased
-              : ProductStatus.purchasable,
-        );
-      }
-      notifyListeners();
-    }
-  }
-
-  void _updateStatus(PurchasableProduct product, ProductStatus status) {
-    if (product.status != ProductStatus.purchased) {
-      product.status = ProductStatus.purchased;
-      notifyListeners();
-    }
-  }
 }

in_app_purchases/step_10/app/lib/main.dart

@@ -83,7 +83,6 @@ class _MyHomePageState extends State<MyHomePage> {
               (context) => DashPurchases(
                 context.read<DashCounter>(),
                 context.read<FirebaseNotifier>(),
-                context.read<IAPRepo>(),
               ),
           lazy: false,
         ),

in_app_purchases/step_10/dart-backend/bin/server.dart

@@ -5,17 +5,14 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:app_store_server_sdk/app_store_server_sdk.dart';
 import 'package:firebase_backend_dart/app_store_purchase_handler.dart';
-import 'package:firebase_backend_dart/constants.dart';
 import 'package:firebase_backend_dart/google_play_purchase_handler.dart';
 import 'package:firebase_backend_dart/helpers.dart';
 import 'package:firebase_backend_dart/iap_repository.dart';
 import 'package:firebase_backend_dart/products.dart';
 import 'package:firebase_backend_dart/purchase_handler.dart';
 import 'package:googleapis/androidpublisher/v3.dart' as ap;
 import 'package:googleapis/firestore/v1.dart' as fs;
-import 'package:googleapis/pubsub/v1.dart' as pubsub;
 import 'package:googleapis_auth/auth_io.dart' as auth;
 import 'package:shelf/shelf.dart';
 import 'package:shelf_router/shelf_router.dart';
@@ -29,16 +26,12 @@ Future<Map<String, PurchaseHandler>> _createPurchaseHandlers() async {
   final clientCredentialsGooglePlay = auth.ServiceAccountCredentials.fromJson(
     serviceAccountGooglePlay,
   );
-  final clientGooglePlay = await auth
-      .clientViaServiceAccount(clientCredentialsGooglePlay, [
-        ap.AndroidPublisherApi.androidpublisherScope,
-        pubsub.PubsubApi.cloudPlatformScope,
-      ]);
+  final clientGooglePlay = await auth.clientViaServiceAccount(
+    clientCredentialsGooglePlay,
+    [ap.AndroidPublisherApi.androidpublisherScope],
+  );
   final androidPublisher = ap.AndroidPublisherApi(clientGooglePlay);
 
-  // Pub/Sub API to receive on purchase events from Google Play
-  final pubsubApi = pubsub.PubsubApi(clientGooglePlay);
-
   // Configure Firestore API access
   final serviceAccountFirebase =
       File('assets/service-account-firebase.json').readAsStringSync();
@@ -54,41 +47,9 @@ Future<Map<String, PurchaseHandler>> _createPurchaseHandlers() async {
   final projectId = json['project_id'] as String;
   final iapRepository = IapRepository(firestoreApi, projectId);
 
-  final subscriptionKeyAppStore =
-      File('assets/SubscriptionKey.p8').readAsStringSync();
-
-  // Configure Apple Store API access
-  var appStoreEnvironment = AppStoreEnvironment.sandbox(
-    bundleId: bundleId,
-    issuerId: appStoreIssuerId,
-    keyId: appStoreKeyId,
-    privateKey: subscriptionKeyAppStore,
-  );
-
-  // Stored token for Apple Store API access, if available
-  final file = File('assets/appstore.token');
-  String? appStoreToken;
-  if (file.existsSync() && file.lengthSync() > 0) {
-    appStoreToken = file.readAsStringSync();
-  }
-
-  final appStoreServerAPI = AppStoreServerAPI(
-    AppStoreServerHttpClient(
-      appStoreEnvironment,
-      jwt: appStoreToken,
-      jwtTokenUpdatedCallback: (token) {
-        file.writeAsStringSync(token);
-      },
-    ),
-  );
-
   return {
-    'google_play': GooglePlayPurchaseHandler(
-      androidPublisher,
-      iapRepository,
-      pubsubApi,
-    ),
-    'app_store': AppStorePurchaseHandler(iapRepository, appStoreServerAPI),
+    'google_play': GooglePlayPurchaseHandler(androidPublisher, iapRepository),
+    'app_store': AppStorePurchaseHandler(iapRepository),
   };
 }