kasy-cli 1.21.9 → 1.22.0

package/templates/firebase/lib/features/{subscription → subscriptions}/repositories/subscription_repository.dart

@@ -1,13 +1,13 @@
-import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:kasy_kit/core/data/models/entitlement.dart';
 import 'package:kasy_kit/core/data/models/subscription.dart';
 import 'package:kasy_kit/core/initializer/onstart_service.dart';
 import 'package:kasy_kit/core/shared_preferences/shared_preferences.dart';
-import 'package:kasy_kit/features/subscription/api/inapp_subscription_api.dart';
-import 'package:kasy_kit/features/subscription/api/subscription_api.dart';
+import 'package:kasy_kit/features/subscriptions/api/entities/subscription_entity.dart';
+import 'package:kasy_kit/features/subscriptions/api/subscription_api.dart';
+import 'package:kasy_kit/features/subscriptions/api/subscription_payment_api.dart';
+import 'package:kasy_kit/features/subscriptions/api/subscription_payment_api_provider.dart';
 import 'package:logger/logger.dart';
-import 'package:purchases_flutter/errors.dart';
-import 'package:purchases_flutter/models/entitlement_info_wrapper.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 final subscriptionRepositoryProvider = Provider(
@@ -27,7 +27,7 @@ const _lastAskKey = 'subscription_last_asking_date';
 class SubscriptionRepository implements OnStartService {
   final SubscriptionApi _subscriptionApi;
 
-  final RevenueCatPaymentApi _inAppSubscriptionApi;
+  final SubscriptionPaymentApi _inAppSubscriptionApi;
 
   final SharedPreferences? _prefs;
 
@@ -39,7 +39,7 @@ class SubscriptionRepository implements OnStartService {
 
   SubscriptionRepository({
     required SubscriptionApi subscriptionApi,
-    required RevenueCatPaymentApi inAppSubscriptionApi,
+    required SubscriptionPaymentApi inAppSubscriptionApi,
     required SharedPreferences? prefs,
     // RemoteConfigApi? remoteConfig,
     Logger? logger,
@@ -58,7 +58,7 @@ class SubscriptionRepository implements OnStartService {
       _logger.w('''
         Revenuecat seems not to be initialized. 
         👉 Please check that you have setup your account on https://revenuecat.com
-        And that you have added your token in the environment file or variable (see lib/environnements.dart)
+        And that you have added your token in the environment file or variable (see lib/environments.dart)
         or
         👉 Remove completely the subscription module if you don't need it
       ''');
@@ -126,30 +126,21 @@ class SubscriptionRepository implements OnStartService {
     return true;
   }
 
-  /// The purchase method is used to buy a subscription or a product
-  Future<List<EntitlementInfo>?> purchase(SubscriptionProduct product) async {
-    if (product is RevenueCatProduct) {
-      try {
-        await _inAppSubscriptionApi.purchasePackage(product.revenueCatPackage);
-        return _inAppSubscriptionApi.getEntitlements();
-      } on PlatformException catch (e) {
-        final error = PurchasesErrorHelper.getErrorCode(e);
-        if (error == PurchasesErrorCode.purchaseCancelledError) {
-          _logger.i('User has cancelled the purchase');
-          throw UserCancelledPurchaseException();
-        }
-        _logger.e('Error while purchasing the product: $e');
-        rethrow;
-      }
-    }
-    throw Exception('Invalid product');
+  /// The purchase method is used to buy a subscription or a product.
+  /// The concrete provider ([RevenueCatPaymentApi] on mobile, StripePaymentApi
+  /// on web) handles the platform specifics and throws
+  /// [UserCancelledPurchaseException] when the user cancels.
+  Future<List<Entitlement>?> purchase(SubscriptionProduct product) async {
+    await _inAppSubscriptionApi.purchaseProduct(product);
+    return _inAppSubscriptionApi.getEntitlements();
   }
 
-  /// Unsubscribe the user
-  /// This will route the user to the subscription management page
-  /// This is handled by the Play Store or the App Store
-  Future<void> unsubscribe() async {
-    await _inAppSubscriptionApi.unsubscribe();
+  /// Unsubscribe / manage the subscription.
+  /// [origin] is where the subscription was purchased; the provider opens the
+  /// correct management flow (store page or Stripe portal) only when allowed on
+  /// the current platform.
+  Future<void> unsubscribe(SubscriptionStore? origin) async {
+    await _inAppSubscriptionApi.unsubscribe(origin);
   }
 
   /// Restore a previous purchase
@@ -159,6 +150,11 @@ class SubscriptionRepository implements OnStartService {
     await _inAppSubscriptionApi.restorePurchase();
   }
 
+  /// iOS-only: present the offer-code redemption sheet.
+  Future<void> presentCodeRedemptionSheet() async {
+    await _inAppSubscriptionApi.presentCodeRedemptionSheet();
+  }
+
   /// Save the last time we showed the subscription paywall
   Future<void> saveLastAskingDate() async {
     if (_prefs == null) return;

package/{lib/scaffold/backends/supabase/patch/lib/features/subscription → templates/firebase/lib/features/subscriptions}/shared/maybeshow_premium.dart

@@ -2,7 +2,6 @@
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:kasy_kit/core/config/features.dart';
 import 'package:kasy_kit/core/data/models/user.dart';
 import 'package:kasy_kit/core/shared_preferences/shared_preferences.dart';
 import 'package:kasy_kit/core/states/components/maybeshow_component.dart';
@@ -20,7 +19,6 @@ class MaybeShowPremiumPage implements MaybeShowWithRef {
     if (event is! OnAppStartEvent) {
       return false;
     }
-    if (kIsWeb && !revenuecatWeb) return false;
     debugPrint("🧐 MaybeShowPremiumPage");
     final userState = ref.watch(userStateNotifierProvider);
     if (userState.subscription?.isActive == true) {

package/templates/firebase/lib/features/subscriptions/shared/subscription_management.dart

@@ -0,0 +1,45 @@
+import 'package:flutter/foundation.dart';
+import 'package:kasy_kit/features/subscriptions/api/entities/subscription_entity.dart';
+
+/// Where a subscription can be managed / cancelled from the *current* device.
+enum ManageLocation {
+  /// Manageable right here — open the store page (mobile) or Stripe Customer
+  /// Portal (web).
+  here,
+
+  /// Bought on another platform. Show an informational dialog and let the user
+  /// manage it where they purchased. We must NOT open an external payment link
+  /// from inside a native app (App Store / Play Store policy).
+  elsewhere,
+}
+
+/// Decide where to manage a subscription based on its origin ([store]) and the
+/// platform the user is currently on.
+///
+/// Example: a user who subscribed on the web (Stripe) and opens the iOS app
+/// gets [ManageLocation.elsewhere] — the app explains the subscription was made
+/// in the browser instead of (illegally) linking out to Stripe.
+ManageLocation resolveManageLocation(SubscriptionStore? store) {
+  // Unknown / legacy records (no origin saved): manage here, routing by the
+  // current platform — preserves the previous behavior.
+  if (store == null || store == SubscriptionStore.unknown) {
+    return ManageLocation.here;
+  }
+  if (kIsWeb) {
+    return store == SubscriptionStore.STRIPE
+        ? ManageLocation.here
+        : ManageLocation.elsewhere;
+  }
+  switch (defaultTargetPlatform) {
+    case TargetPlatform.iOS:
+      return store == SubscriptionStore.APPLE_STORE
+          ? ManageLocation.here
+          : ManageLocation.elsewhere;
+    case TargetPlatform.android:
+      return store == SubscriptionStore.PLAY_STORE
+          ? ManageLocation.here
+          : ManageLocation.elsewhere;
+    default:
+      return ManageLocation.elsewhere;
+  }
+}

package/templates/firebase/lib/features/{subscription → subscriptions}/ui/component/active_premium_content.dart

@@ -4,9 +4,10 @@ import 'package:google_fonts/google_fonts.dart';
 import 'package:kasy_kit/components/components.dart';
 import 'package:kasy_kit/core/states/user_state_notifier.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_background.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_card.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/unsubscribe_feedback_popup.dart';
+import 'package:kasy_kit/features/subscriptions/shared/subscription_management.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_background.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_card.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/unsubscribe_feedback_popup.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
 
 typedef OnTapUnSubscribe = void Function(String reason);
@@ -26,6 +27,29 @@ class ActivePremiumContent extends ConsumerStatefulWidget {
 class _ActivePremiumContentState extends ConsumerState<ActivePremiumContent> {
   bool _isPopupShowing = false;
 
+  /// Decide where the subscription can be managed. If it was bought on another
+  /// platform (e.g. on the web via Stripe while the user is now on iOS), we must
+  /// not link out to an external provider (App Store / Play Store policy) — show
+  /// an info dialog with a "restore purchases" action instead of the cancel flow.
+  Future<void> _handleManageTap(BuildContext context) async {
+    final store = ref.read(userStateNotifierProvider).subscription?.store;
+    if (resolveManageLocation(store) == ManageLocation.elsewhere) {
+      final t = Translations.of(context).activePremium;
+      await showKasyConfirmDialog(
+        context,
+        title: t.managed_elsewhere_title,
+        message: t.managed_elsewhere_description,
+        cancelLabel: t.cancel_button,
+        confirmLabel: t.restore_button,
+        onConfirm: () {
+          ref.read(userStateNotifierProvider.notifier).refreshSubscription();
+        },
+      );
+      return;
+    }
+    await _showUnsubscribePopup(context);
+  }
+
   Future<void> _showUnsubscribePopup(BuildContext context) async {
     if (_isPopupShowing) return;
     setState(() => _isPopupShowing = true);
@@ -156,7 +180,7 @@ class _ActivePremiumContentState extends ConsumerState<ActivePremiumContent> {
                           label: Translations.of(context).activePremium.unsubscribe_button,
                           variant: KasyButtonVariant.soft,
                           expand: true,
-                          onPressed: () => _showUnsubscribePopup(context),
+                          onPressed: () => _handleManageTap(context),
                         ),
                       ),
                   ],

package/templates/firebase/lib/features/{subscription → subscriptions}/ui/component/paywall_minimal.dart

@@ -4,13 +4,13 @@ import 'package:google_fonts/google_fonts.dart';
 import 'package:kasy_kit/components/components.dart';
 import 'package:kasy_kit/core/data/models/subscription.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
-import 'package:kasy_kit/features/subscription/ui/component/premium_page_factory.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/paywall_empty_state.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_background_gradient.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_bottom_menu.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_close_button.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_feature.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/selectable_row.dart';
+import 'package:kasy_kit/features/subscriptions/ui/component/premium_page_factory.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/paywall_empty_state.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_background_gradient.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_bottom_menu.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_close_button.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_feature.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/selectable_row.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
 
 /// Minimal paywall: benefits list + single CTA.

package/templates/firebase/lib/features/{subscription → subscriptions}/ui/component/paywall_row.dart

@@ -6,14 +6,14 @@ import 'package:kasy_kit/components/components.dart';
 import 'package:kasy_kit/core/animations/movefade_anim.dart';
 import 'package:kasy_kit/core/data/models/subscription.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
-import 'package:kasy_kit/features/subscription/ui/component/premium_page_factory.dart';
-import 'package:kasy_kit/features/subscription/ui/premium_page.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/comparison_table.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/feature_line.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_bottom_menu.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_close_button.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/selectable_col.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/selectable_row.dart';
+import 'package:kasy_kit/features/subscriptions/ui/component/premium_page_factory.dart';
+import 'package:kasy_kit/features/subscriptions/ui/premium_page.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/comparison_table.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/feature_line.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_bottom_menu.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_close_button.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/selectable_col.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/selectable_row.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
 
 

package/templates/firebase/lib/features/{subscription → subscriptions}/ui/component/paywall_with_switch.dart

@@ -4,13 +4,13 @@ import 'package:google_fonts/google_fonts.dart';
 import 'package:kasy_kit/components/components.dart';
 import 'package:kasy_kit/core/data/models/subscription.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
-import 'package:kasy_kit/features/subscription/ui/component/premium_page_factory.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_background_gradient.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_bottom_menu.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_close_button.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_feature.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/selectable_row.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/trial_switcher.dart';
+import 'package:kasy_kit/features/subscriptions/ui/component/premium_page_factory.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_background_gradient.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_bottom_menu.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_close_button.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_feature.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/selectable_row.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/trial_switcher.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
 
 

package/templates/firebase/lib/features/{subscription → subscriptions}/ui/component/premium_content.dart

@@ -6,13 +6,13 @@ import 'package:kasy_kit/components/components.dart';
 import 'package:kasy_kit/core/animations/movefade_anim.dart';
 import 'package:kasy_kit/core/data/models/subscription.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
-import 'package:kasy_kit/features/subscription/ui/component/premium_page_factory.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_background.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_bottom_menu.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_card.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_close_button.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_feature.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/selectable_row.dart';
+import 'package:kasy_kit/features/subscriptions/ui/component/premium_page_factory.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_background.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_bottom_menu.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_card.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_close_button.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_feature.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/selectable_row.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
 
 class BasicPaywall extends StatelessWidget {

package/templates/firebase/lib/features/{subscription → subscriptions}/ui/component/premium_page_factory.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:kasy_kit/core/data/models/subscription.dart';
-import 'package:kasy_kit/features/subscription/ui/component/paywall_minimal.dart';
-import 'package:kasy_kit/features/subscription/ui/component/paywall_row.dart';
-import 'package:kasy_kit/features/subscription/ui/component/paywall_with_switch.dart';
-import 'package:kasy_kit/features/subscription/ui/component/premium_content.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/selectable_row.dart';
+import 'package:kasy_kit/features/subscriptions/ui/component/paywall_minimal.dart';
+import 'package:kasy_kit/features/subscriptions/ui/component/paywall_row.dart';
+import 'package:kasy_kit/features/subscriptions/ui/component/paywall_with_switch.dart';
+import 'package:kasy_kit/features/subscriptions/ui/component/premium_content.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/selectable_row.dart';
 
 typedef OnTapSubscription = void Function();
 

package/templates/firebase/lib/features/{subscription → subscriptions}/ui/premium_page.dart

@@ -3,11 +3,11 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:kasy_kit/core/data/api/analytics_api.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
-import 'package:kasy_kit/features/subscription/providers/models/premium_state.dart';
-import 'package:kasy_kit/features/subscription/providers/premium_page_provider.dart';
-import 'package:kasy_kit/features/subscription/ui/component/active_premium_content.dart';
-import 'package:kasy_kit/features/subscription/ui/component/premium_page_factory.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/paywall_empty_state.dart';
+import 'package:kasy_kit/features/subscriptions/providers/models/premium_state.dart';
+import 'package:kasy_kit/features/subscriptions/providers/premium_page_provider.dart';
+import 'package:kasy_kit/features/subscriptions/ui/component/active_premium_content.dart';
+import 'package:kasy_kit/features/subscriptions/ui/component/premium_page_factory.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/paywall_empty_state.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
 
 class PremiumPageArgs {

package/templates/firebase/lib/features/{subscription → subscriptions}/ui/widgets/comparison_table.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
-import 'package:kasy_kit/environnements.dart';
+import 'package:kasy_kit/environments.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
 
 /// Returns a list of [ComparisonTableRow] instances representing the features

package/templates/firebase/lib/features/{subscription → subscriptions}/ui/widgets/paywall_empty_state.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
-import 'package:kasy_kit/features/subscription/ui/component/premium_page_factory.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_background_gradient.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_bottom_menu.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/premium_close_button.dart';
+import 'package:kasy_kit/features/subscriptions/ui/component/premium_page_factory.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_background_gradient.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_bottom_menu.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_close_button.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
 
 class PaywallEmptyState extends StatelessWidget {

package/templates/firebase/lib/features/{subscription → subscriptions}/ui/widgets/premium_bottom_menu.dart

@@ -1,10 +1,9 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:kasy_kit/components/components.dart';
-import 'package:kasy_kit/core/config/features.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
-import 'package:kasy_kit/environnements.dart';
-import 'package:kasy_kit/features/subscription/ui/component/premium_page_factory.dart';
+import 'package:kasy_kit/environments.dart';
+import 'package:kasy_kit/features/subscriptions/ui/component/premium_page_factory.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -26,7 +25,7 @@ class BottomPremiumMenu extends StatelessWidget {
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: [
         _buildPrivacyButton(context),
-        if (!kIsWeb || !revenuecatWeb) _buildRestoreButton(context),
+        _buildRestoreButton(context),
         _buildTermsButton(context),
       ],
     );

package/templates/firebase/lib/features/{subscription → subscriptions}/ui/widgets/selectable_col.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:kasy_kit/core/haptics/kasy_haptics.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
-import 'package:kasy_kit/features/subscription/ui/widgets/selectable_row.dart';
+import 'package:kasy_kit/features/subscriptions/ui/widgets/selectable_row.dart';
 
 
 class SelectableColGroup<T> extends StatefulWidget {