Merge pull request #25 from adaptyteam/dev

Merge dev to master

Author: StanislavMayorov

AdaptyCapacitor.podspec

@@ -12,8 +12,8 @@ Pod::Spec.new do |s|
   s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
   s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.dependency 'Capacitor'
-  s.dependency 'Adapty', '3.11.0'
-  s.dependency 'AdaptyUI', '3.11.0'
-  s.dependency 'AdaptyPlugin', '3.11.0'
+  s.dependency 'Adapty', '3.12.1'
+  s.dependency 'AdaptyUI', '3.12.1'
+  s.dependency 'AdaptyPlugin', '3.12.1'
   s.swift_version = '5.1'
 end

CHANGELOG.md

@@ -4,6 +4,94 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [3.12.0-beta.1]
+
+### Added
+
+- Support for Local Access Levels, allowing the SDK to verify purchases directly with the store even when Adapty servers are unreachable. [Read More.](http://adapty.io/docs/local-access-levels)
+- Support for StoreKit Testing in Xcode. [Read More.](http://adapty.io/docs/local-sk-files)
+- **Customer Identity Parameters**: New identity parameters support in `activate()` and `identify()` methods
+  - **iOS**: `appAccountToken` parameter for App Store customer identification
+  - **Android**: `obfuscatedAccountId` parameter for Google Play customer identification
+  - **Android**: `pendingPrepaidPlansEnabled` parameter to enable pending prepaid plans support
+
+- **Product Information Enhancement**: Added new fields to products
+  - `accessLevelId` field in `ProductReference`
+  - `productType` field in `ProductReference`
+  - `accessLevelId` field in `AdaptyPaywallProduct`
+  - `productType` field in `AdaptyPaywallProduct`
+
+- **Purchase Transaction Data**: Platform-specific transaction information in purchase results
+  - **iOS**: `jwsTransaction` (JSON Web Signature) in successful purchase results
+  - **Android**: `purchaseToken` (Google Play purchase token) in successful purchase results
+
+- iOS presentation styles support: added `iosPresentationStyle` parameter (`'full_screen'` (default) | `'page_sheet'`) to `present()` methods in paywall and onboarding view controllers
+  ```typescript
+  // Before (still supported)
+  await paywallView.present();
+  
+  // New (with presentation style)
+  await paywallView.present({ iosPresentationStyle: 'page_sheet' });
+  ```
+
+### Changed
+
+- **Native iOS SDK**: Updated to version 3.12.1
+- **Native Android SDK**: Updated to version 3.12.1
+
+- **identify() method signature**: Now accepts an options object with optional identity parameters
+  ```typescript
+  // Before (still supported)
+  await adapty.identify({ customerUserId: 'user_123' });
+  
+  // New (with identity parameters)
+  await adapty.identify({ 
+    customerUserId: 'user_123',
+    params: {
+      ios: { appAccountToken: 'uuid-string' },
+      android: { obfuscatedAccountId: 'obfuscated-id' }
+    }
+  });
+  ```
+
+
+### Removed
+
+- **BREAKING CHANGE**: Removed deprecated fields from `AdaptyAndroidPurchaseParams`
+  - `obfuscatedAccountId` - use `activate()` or `identify()` with `android.obfuscatedAccountId` instead
+  - `obfuscatedProfileId` - no longer supported
+
+  **Migration guide:**
+  ```typescript
+  // BEFORE (v3.11.x) - No longer works
+  await adapty.makePurchase({ 
+    product,
+    android: {
+      obfuscatedAccountId: 'account-id',
+      obfuscatedProfileId: 'profile-id'
+    }
+  });
+  
+  // AFTER (v3.12.0) - Set during activation
+  await adapty.activate({
+    apiKey: 'your-key',
+    params: {
+      android: {
+        obfuscatedAccountId: 'account-id'
+      }
+    }
+  });
+  await adapty.makePurchase({ 
+    product
+  });
+  ```
+
+## [3.11.1-beta.0]
+
+### Fixed
+
+- **Android**: Fixed `dismiss()` method in `AdaptyOnboardingViewController` not working properly.
+
 ## [3.11.0-beta.0]
 
 ### Removed ⚠️ BREAKING CHANGES

Package.swift

@@ -11,7 +11,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0"),
-        .package(url: "https://github.com/adaptyteam/AdaptySDK-iOS.git", exact: "3.11.0")
+        .package(url: "https://github.com/adaptyteam/AdaptySDK-iOS.git", exact: "3.12.1")
     ],
     targets: [
         .target(

README.md

@@ -26,18 +26,19 @@ Adapty SDK is an open-source framework that makes implementing in-app subscripti
 
 ## Why Adapty?
 
-- [No-code paywall builder](https://adapty.io/paywall-builder/?utm_source=github&utm_medium=referral&utm_campaign=AdaptySDK-Capacitor). Create and edit conversion-optimized paywalls in minutes with native-rendered UI (not WebView). Apply changes in real-time without app releases.
-- [On-the-fly paywalls price testing](https://adapty.io/docs/ab-tests/?utm_source=github&utm_medium=referral&utm_campaign=AdaptySDK-Capacitor). Test different prices, duration, offers, messages, and designs simultaneously, all without new app releases.
-- [Full customer's payment history](https://adapty.io/docs/profiles-crm/?utm_source=github&utm_medium=referral&utm_campaign=AdaptySDK-Capacitor). Explore the user's payment events from the trial start to subscription cancellation or billing issues.
-- [In-app purchase data integration](https://adapty.io/docs/event-feed/?utm_source=github&utm_medium=referral&utm_campaign=AdaptySDK-Capacitor). Send subscription events to 3rd-party analytics, attribution, and ad services with no coding, even if the user uninstalls the app.
-- [Advanced analytics](https://adapty.io/docs/analytics-charts/?utm_source=github&utm_medium=referral&utm_campaign=AdaptySDK-Capacitor). Analyze your app real-time metrics with advanced filters, such as Ad network, Ad campaign, country, A/B test, etc.
+- [No server code implementation](https://adapty.io/docs/sdk-installation-capacitor?utm_source=github&utm_medium=referral&utm_campaign=AdaptySDK-Capacitor). Integrate in-app purchases with server-side receipt validation in minutes — in your own paywall or one created in the no-code builder.
+- [No-code paywall builder](https://adapty.io/docs/adapty-paywall-builder?utm_source=github&utm_medium=referral&utm_campaign=AdaptySDK-Capacitor). Create a beautiful, natively rendered paywall in the no-code editor and display it in your app to start getting paid instantly.
+- [On-the-fly paywalls price testing](https://docs.adapty.io/v3.0/docs/ab-tests?utm_source=github&utm_medium=referral&utm_campaign=AdaptySDK-Capacitor). Test different prices, duration, offers, messages, and designs simultaneously, all without new app releases.
+- [Beautiful onboardings](https://adapty.io/docs/onboardings?utm_source=github&utm_medium=referral&utm_campaign=AdaptySDK-Capacitor). Design onboardings in the no-code editor and guide users through their first app experience.
+- [Full customer's payment history](https://docs.adapty.io/v3.0/docs/profiles-crm?utm_source=github&utm_medium=referral&utm_campaign=AdaptySDK-Capacitor). Explore the user's payment events from the trial start to subscription cancellation or billing issues.
+- [3rd-party integrations](https://docs.adapty.io/v3.0/docs/events?utm_source=github&utm_medium=referral&utm_campaign=AdaptySDK-Capacitor). Send subscription events to 3rd-party analytics, attribution, and ad services with no coding, even if the user uninstalls the app.
+- [Advanced analytics](https://docs.adapty.io/v3.0/docs/charts?utm_source=github&utm_medium=referral&utm_campaign=AdaptySDK-Capacitor). Analyze your app real-time metrics with advanced filters, such as Ad network, Ad campaign, country, A/B test, etc.
 
 <h3 align="center" style="border-bottom: none; margin-top: -15px; margin-bottom: -15px; font-size: 150%">
-<a href="https://adapty.io/schedule-demo?utm_source=github&utm_medium=referral&utm_campaign=AdaptySDK-Capacitor_schedule-demo">Talk to Us to Learn More</a>
+<a href="https://adapty.io/schedule-demo?utm_source=github&utm_medium=referral&utm_campaign=AdaptySDK-Unity_schedule-demo">Talk to Us to Learn More</a>
 </h3>
 
-
-## Integrate IAPs Within a Few Hours Without Server Coding
+## Integrate IAPs within a few hours without server coding
 
 **Adapty handles everything, from free trials to refunds, in a simple, developer-friendly SDK.**
 
@@ -46,31 +47,33 @@ Adapty SDK is an open-source framework that makes implementing in-app subscripti
 - One-time purchases and lifetime subscriptions supported.
 - Sync subscribers' states across iOS, Android, and Web.
 
-## Price Testing for In-app Purchases on Capacitor Without App Releases
+## Design paywalls in the no-code builder
 
-- Optimize in-app subscriptions with the paywall A/B testing. Conversions, trials, revenue, cancellations, and more — everything is calculated for you: each paywall and each A/B test.
-- Change images, colors, layouts, and literally anything with a custom JSON. Configure different prices, trial periods, promo offers, and more in Adapty without app releases.
+![No-code builder](https://adapty.io/assets/uploads/2024/09/[email protected])
+
+With Adapty, you can create a complete, purchase-ready paywall in the no-code builder.
 
-## Paywall A/B Testing on Capacitor
+Adapty automatically renders it and handles all the complex purchase flow, receipt validation, and subscription management behind the scenes.
+
+## Test paywalls & prices on Capacitor without app releases
 
 ![Adapty: In-app subscriptions with paywall A/B testing](https://adapty-portal-media-production.s3.amazonaws.com/github/ab-test-new.png)
 
-- Conversions, trials, revenue, cancellations, and more  everything is calculated for you: each paywall and each A/B test.
-- Change images, colors, layouts and literally anything with a custom JSON.
-- Price testing is seamlessly integrated for any platform.
+- Optimize in-app subscriptions with the paywall A/B testing. Conversions, trials, revenue, cancellations, and more — everything is calculated for you: each paywall and each A/B test.
+- Change images, colors, layouts, and literally anything using the no-code builder or a custom JSON. Configure different prices, trial periods, promo offers, and more in Adapty without app releases.
 
-## Real-time Analytics for Your Capacitor App
+## Real-time analytics for your Capacitor app
 
 ![Adapty: How Adapty works](https://adapty-portal-media-production.s3.amazonaws.com/github/analyticss.gif)
 
 - Manage the subscription's state without managing transactions.
-- 99.5% accuracy with App Store Connect.
+- 99.5% accuracy.
 - View and analyze data by attributes, such as status, channels, campaigns, and more.
 - Filter, group, and measure metrics by attribution, platform, custom users' segments, and more in a few clicks.
 
-## Mobile App Monetization's Largest Community
+## Mobile app monetization's largest community
 
-Ask questions, participate in discussions about Adapty-related topics, become a part of our community for mobile app developers and marketers. Learn how to monetize your app, ask questions, post jobs, read industry news and analytics. Ad free.
+Ask questions, participate in discussions about Adapty-related topics, become a part of our community for app developers and marketers. Learn how to monetize your app, ask questions, post jobs, read industry news and analytics. Ad free.
 
 <a href="https://discord.gg/subscriptions-hub"><img src="https://adapty-portal-media-production.s3.amazonaws.com/github/join-discord.svg" /></a>
 
@@ -82,7 +85,7 @@ npm install @adapty/capacitor
 npx cap sync
 ```
 
-Read the [documentation](https://adapty.io/docs/sdk-installation-capacitor/?utm_source=github&utm_medium=referral&utm_campaign=AdaptySDK-Capacitor) to install and configure Adapty SDK. Set up purchases in hours instead of weeks :rocket:
+Follow our [quickstart guide](https://adapty.io/docs/sdk-installation-capacitor/?utm_source=github&utm_medium=referral&utm_campaign=AdaptySDK-Capacitor) to install and configure Adapty SDK. Set up purchases in hours instead of weeks :rocket:
 
 ### Platform Support
 

android/build.gradle

@@ -61,9 +61,9 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
     // Adapty SDK dependencies
-    implementation 'io.adapty:android-sdk:3.11.1'
-    implementation 'io.adapty:android-ui:3.11.1'
-    implementation 'io.adapty.internal:crossplatform:3.11.4'
+    implementation 'io.adapty:android-sdk:3.12.1'
+    implementation 'io.adapty:android-ui:3.12.0'
+    implementation 'io.adapty.internal:crossplatform:3.12.0'
 
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"

cross_platform.yaml

@@ -1,5 +1,5 @@
 $schema: "https://json-schema.org/draft/2020-12/schema"
-$id: "https://adapty.io/crossPlatform/3.11.0/schema"
+$id: "https://adapty.io/crossPlatform/3.12.0/schema"
 title: "Cross Platform Format"
 
 $requests:
@@ -112,6 +112,7 @@ $requests:
     properties:
       method: { const: "adapty_ui_present_onboarding_view" }
       id: { type: string, description: "View Id" }
+      ios_presentation_style: { $ref: "#/$defs/AdaptyUI.IOSPresentationStyle" }
 
   AdaptyUIPresentOnboardingView.Response: #response
     type: object
@@ -130,6 +131,7 @@ $requests:
     properties:
       method: { const: "adapty_ui_present_paywall_view" }
       id: { type: string, description: "View Id" }
+      ios_presentation_style: { $ref: "#/$defs/AdaptyUI.IOSPresentationStyle" }
 
   AdaptyUIPresentPaywallView.Response: #response
     type: object
@@ -288,7 +290,7 @@ $requests:
     properties:
       method: { const: "identify" }
       customer_user_id: { type: string }
-      app_account_token: { $ref: "#/$defs/UUID" }
+      parameters: { $ref: "#/$defs/CustomerIdentityParameters" }
 
   Identify.Response: #response
     type: object
@@ -505,7 +507,7 @@ $requests:
           error: { $ref: "#/$defs/AdaptyError" }
       - required: [success]
         properties:
-          success: { $ref: "#/$defs/AdaptyProfile" }
+          success: { const: true }
 
   ### restorePurchases ###
   RestorePurchases.Request: #request
@@ -924,7 +926,7 @@ $defs:
     type: string
     format: uuid
     pattern: "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"
-    description: "UUID in RFC 4122"
+    description: "UUID in RFC 4122 format"
     example: "123e4567-e89b-12d3-a456-426614174000"
 
   Date: #response #request
@@ -937,10 +939,11 @@ $defs:
     properties:
       api_key: { type: string }
       customer_user_id: { type: string }
-      app_account_token: { $ref: "#/$defs/UUID" , description: "used only if customer_user_id is not null"}
+      customer_identity_parameters: { $ref: "#/$defs/CustomerIdentityParameters" }
       observer_mode: { type: boolean, default: false }
       apple_idfa_collection_disabled: { type: boolean, default: false }
       google_adid_collection_disabled: { type: boolean, default: false }
+      google_enable_pending_prepaid_plans: { type: boolean, default: false }
       ip_address_collection_disabled: { type: boolean, default: false }
       server_cluster: { type: string, enum: ["default", "eu", "cn"] }
       backend_base_url: { type: string }
@@ -961,11 +964,20 @@ $defs:
           memory_storage_count_limit: { type: integer }
           disk_storage_size_limit: { type: integer, description: "bytes" }
 
+  CustomerIdentityParameters: #request
+    type: object
+    properties:
+      app_account_token: { $ref: "#/$defs/UUID", description: "iOS Only" }
+      obfuscated_account_id: { type: string, description: "Android Only" }
+      obfuscated_profile_id: { type: string, description: "Android Only" }
+
   AdaptyPaywallProduct.Response: #response
     type: object
     required:
       - vendor_product_id
       - adapty_product_id
+      - access_level_id
+      - product_type
       - paywall_product_index
       - paywall_variation_id
       - paywall_ab_test_name
@@ -977,6 +989,8 @@ $defs:
     properties:
       vendor_product_id: { type: string }
       adapty_product_id: { type: string }
+      access_level_id: { type: string }
+      product_type: { type: string }
       paywall_product_index: { type: integer }
       paywall_variation_id: { type: string }
       paywall_ab_test_name: { type: string }
@@ -1026,13 +1040,17 @@ $defs:
     required:
       - vendor_product_id
       - adapty_product_id
+      - access_level_id
+      - product_type
       - paywall_product_index
       - paywall_variation_id
       - paywall_ab_test_name
       - paywall_name
     properties:
       vendor_product_id: { type: string }
       adapty_product_id: { type: string }
+      access_level_id: { type: string }
+      product_type: { type: string }
       paywall_product_index: { type: integer }
       subscription_offer_identifier:
         { $ref: "#/$defs/AdaptySubscriptionOffer.Identifier" }
@@ -1179,9 +1197,13 @@ $defs:
     required:
       - vendor_product_id
       - adapty_product_id
+      - access_level_id
+      - product_type
     properties:
       vendor_product_id: { type: string }
       adapty_product_id: { type: string }
+      access_level_id: { type: string }
+      product_type: { type: string }
       promotional_offer_id: { type: string, description: "iOS Only" }
       win_back_offer_id: { type: string, description: "iOS Only" }
       base_plan_id: { type: string, description: "Android Only" }
@@ -1397,6 +1419,8 @@ $defs:
           type: { type: string, const: "success" }
           profile: { $ref: "#/$defs/AdaptyProfile" }
           jws_transaction: { type: string }
+          google_purchase_token: { type: string }
+
 
   AdaptyInstallationStatus: #response #event
     type: object
@@ -1480,6 +1504,12 @@ $defs:
       nullable: false
     }
 
+  AdaptyUI.IOSPresentationStyle:
+    type: string
+    enum:
+      - full_screen
+      - page_sheet
+
   AdaptyUI.DialogConfiguration: #request
     type: object
     required: [default_action]
@@ -1495,7 +1525,7 @@ $defs:
       - primary
       - secondary
 
-   AdaptyPurchaseParameters:  #request
+  AdaptyPurchaseParameters:  #request
     type: object
     properties:
       subscription_update_params:
@@ -1504,8 +1534,6 @@ $defs:
           description: "Android Only",
         }
       is_offer_personalized: { type: boolean, description: "Android Only" }
-      obfuscated_account_id: { type: string, description: "Android Only" }
-      obfuscated_profile_id: { type: string, description: "Android Only" }
 
 
   AdaptySubscriptionUpdateParameters: #request # Android Only

examples/README.md

@@ -0,0 +1,22 @@
+## Examples
+
+We provide example applications demonstrating Adapty SDK integration with different frameworks and use cases.
+
+### Basic Examples
+
+Minimal applications showing core SDK functionality (activation, paywalls, purchases). Perfect for getting started and understanding the basic integration flow.
+
+- **[React Example](./basic-react-example/)** - React application with hooks and functional components
+- **[Angular Example](./basic-angular-example/)** - Angular application with components and services
+- **[Vue Example](./basic-vue-example/)** - Vue 3 application with Composition API
+
+Each basic example demonstrates:
+- SDK activation and configuration
+- Displaying free and premium content
+- Showing paywall for premium content access
+- Making purchases through Paywall Builder
+- Automatic access to premium content after successful purchase
+
+### Adapty Devtools
+
+**Adapty Devtools** - Advanced development tool for bug reports and SDK testing. This comprehensive example includes detailed logging, debug panels, and testing utilities for developers working on SDK integration or reporting issues.