Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Subscription oauth v2 #3480

Draft
wants to merge 48 commits into
base: main
Choose a base branch
from
Draft

Subscription oauth v2 #3480

wants to merge 48 commits into from

Commits on Oct 16, 2024

  1. builds

    @federicocappelli
    federicocappelli committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    cc16889 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into fcappelli/subscription_oauth_api_v2 

    # Conflicts:
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
    @federicocappelli
    federicocappelli committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    8b07ea5 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. auth and first purchase improved

    @federicocappelli
    federicocappelli committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    79faa6b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into fcappelli/subscription_oauth_api_v2 

    # Conflicts:
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/AppDependencyProvider.swift
#	DuckDuckGo/NetworkProtectionRootView.swift
#	DuckDuckGo/NetworkProtectionTunnelController.swift
#	DuckDuckGo/Subscription/DefaultSubscriptionManager+AccountManagerKeychainAccessDelegate.swift
#	DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift
#	DuckDuckGo/Subscription/ViewModel/SubscriptionSettingsViewModel.swift
#	DuckDuckGo/Subscription/Views/SubscriptionContainerViewFactory.swift
#	PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift
    @federicocappelli
    federicocappelli committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    44e00ee View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2024

  1. purchase flow fixed

    @federicocappelli
    federicocappelli committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    c6c2bef View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into fcappelli/subscription_oauth_api_v2 

    # Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo/AppDependencyProvider.swift
    @federicocappelli
    federicocappelli committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    c640a91 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. purchase fixed

    @federicocappelli
    federicocappelli committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    018751a View commit details
    Browse the repository at this point in the history

  2. token fixes

    @federicocappelli
    federicocappelli committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    de81314 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. loggers improved and restore fixed

    @federicocappelli
    federicocappelli committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    b4c661e View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. subscription refresh improved

    @federicocappelli
    federicocappelli committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    d123038 View commit details
    Browse the repository at this point in the history

  2. v1 to v2 auth migration

    @federicocappelli
    federicocappelli committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    9d90ccf View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into fcappelli/subscription_oauth_api_v2 

    # Conflicts:
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
    @federicocappelli
    federicocappelli committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    457922c View commit details
    Browse the repository at this point in the history

  4. lint ad restore commented code

    @federicocappelli
    federicocappelli committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    60d4012 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. review suggestions applied

    @federicocappelli
    federicocappelli committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    07e2cc0 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. tests and logs

    @federicocappelli
    federicocappelli committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    bd5bb1b View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. vpn fixed

    @federicocappelli
    federicocappelli committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    e92d0db View commit details
    Browse the repository at this point in the history

  2. debug menu improved

    @federicocappelli
    federicocappelli committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    1406315 View commit details
    Browse the repository at this point in the history

  3. unit tests and lint

    @federicocappelli
    federicocappelli committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    eebbc48 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2024

  1. unit tests and improvements

    @federicocappelli
    federicocappelli committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    8ea3254 View commit details
    Browse the repository at this point in the history

  2. signout as async

    @federicocappelli
    federicocappelli committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    c78a9c2 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2024

  1. Merge branch 'main' into fcappelli/subscription_oauth_api_v2 

    # Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/Feedback/VPNMetadataCollector.swift
    @federicocappelli
    federicocappelli committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    c021b95 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into fcappelli/subscription_oauth_api_v2 

    # Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
    @federicocappelli
    federicocappelli committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    0f426a1 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. lint

    @federicocappelli
    federicocappelli committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    f06370b View commit details
    Browse the repository at this point in the history

  2. BSK points to branch now

    @federicocappelli
    federicocappelli committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    5f69e54 View commit details
    Browse the repository at this point in the history

  3. bsk updated

    @federicocappelli
    federicocappelli committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    929e12d View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2024

  1. Merge branch 'main' of https://github.com/duckduckgo/iOS into fcappel… 

    …li/subscription_oauth_api_v2

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
    @federicocappelli
    federicocappelli committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    386fd70 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2024

  1. bsk local

    @federicocappelli
    federicocappelli committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    b018cce View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/duckduckgo/iOS into fcappel… 

    …li/subscription_oauth_api_v2

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
    @federicocappelli
    federicocappelli committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    00e55c5 View commit details
    Browse the repository at this point in the history

  3. BSK

    @federicocappelli
    federicocappelli committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    a955a78 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into fcappelli/subscription_oauth_api_v2

    @federicocappelli
    federicocappelli committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    b67e5d4 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2024

  1. BSK update

    @federicocappelli
    federicocappelli committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    47ac372 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2024

  1. Merge branch 'main' into fcappelli/subscription_oauth_api_v2 

    # Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/AppDependencyProvider.swift
#	DuckDuckGo/NetworkProtectionTunnelController.swift
    @federicocappelli
    federicocappelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    80be4fe View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2024

  1. DI improved

    @federicocappelli
    federicocappelli committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    bd51e3f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into fcappelli/subscription_oauth_api_v2 

    # Conflicts:
#	.github/workflows/pr.yml
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
    @federicocappelli
    federicocappelli committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    7327d2d View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2024

  1. token v1/v2 exchange fixed, token providing improved

    @federicocappelli
    federicocappelli committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    67d5d50 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2024

  1. updates after mac integration

    @federicocappelli
    federicocappelli committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    d0c8344 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into fcappelli/subscription_oauth_api_v2 

    # Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/AppDelegate.swift
#	DuckDuckGoTests/Subscription/SubscriptionPagesUseSubscriptionFeatureTests.swift
    @federicocappelli
    federicocappelli committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    60bad87 View commit details
    Browse the repository at this point in the history

  3. merge

    @federicocappelli
    federicocappelli committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    170ed9e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into fcappelli/subscription_oauth_api_v2 

    # Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
    @federicocappelli
    federicocappelli committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    32e5de6 View commit details
    Browse the repository at this point in the history

  5. local bsk

    @federicocappelli
    federicocappelli committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    87455ba View commit details
    Browse the repository at this point in the history

  6. project fix

    @federicocappelli
    federicocappelli committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    0191b02 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2024

  1. unit tests builds

    @federicocappelli
    federicocappelli committed Nov 28, 2024
    Configuration menu
    Copy the full SHA
    bd5cb7c View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2024

  1. main merge

    @federicocappelli
    federicocappelli committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    f229b65 View commit details
    Browse the repository at this point in the history

  2. BSK > branch

    @federicocappelli
    federicocappelli committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    e4fbf00 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into fcappelli/subscription_oauth_api_v2 

    # Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo/SubscriptionDebugViewController.swift
    @federicocappelli
    federicocappelli committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    f8eabd5 View commit details
    Browse the repository at this point in the history

  4. packages

    @federicocappelli
    federicocappelli committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    a745b49 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2024

  1. Merge branch 'main' into fcappelli/subscription_oauth_api_v2 

    # Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/AppDependencyProvider.swift
#	DuckDuckGo/NetworkProtectionRootView.swift
#	DuckDuckGo/NetworkProtectionStatusView.swift
#	DuckDuckGo/SettingsOthersView.swift
#	DuckDuckGo/SettingsState.swift
#	DuckDuckGo/SettingsViewModel.swift
#	DuckDuckGo/Subscription/Feedback/UnifiedFeedbackFormViewModel.swift
#	DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift
#	DuckDuckGo/Subscription/Views/SubscriptionSettingsView.swift
#	DuckDuckGoTests/Subscription/SubscriptionContainerViewModelTests.swift
#	DuckDuckGoTests/Subscription/SubscriptionFlowViewModelTests.swift
#	DuckDuckGoTests/Subscription/SubscriptionPagesUseSubscriptionFeatureTests.swift
    @federicocappelli
    federicocappelli committed Dec 2, 2024
    Configuration menu
    Copy the full SHA
    b3482bd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into fcappelli/subscription_oauth_api_v2 

    # Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
    @federicocappelli
    federicocappelli committed Dec 2, 2024
    Configuration menu
    Copy the full SHA
    464e598 View commit details
    Browse the repository at this point in the history