Display error messaging for cancelled subscriptions #2394

graeme · 2024-03-12T17:18:45Z

Task/Issue URL: https://app.asana.com/0/72649045549333/1205438842252963/f

Description:

When we detect that entitlements have expire AND Netp is enabled:

Disable NetP
Show revoked notification and make sure that Netp disabled notification is NOT shown.
On opening the status view we show the revoked dialog.
When we get 403 response from /register (or any controller APIs), we handle the expired entitlement (refer to first bullet point in this section). (Handled by the iOS equivalent project
When rekey is attempted with invalid entitlements, we will get 403. (Handled by the iOS equivalent project
If user attempts to enable Netp with invalid entitlements, we will get 403. (Handled by the iOS equivalent project
We do a periodic check every 20 minutes calling the subscription API to get entitlements (Handled by the NetworkProtectionEntitlementsMonitor implemented in the iOS equivalent project )
If check succeeds and user has entitlement, we do nothing.
If check succeeds and user has no entitlement, we handle the expired entitlement (refer to first bullet point in this section).
If check fails (no internet, BE failure, tunnel failure), we do nothing.
If Netp is disabled, we stop this check.

On top of this, we also added an additional check on the Settings page.

To correctly show the Netp entry, we check for entitlement through subscription API whenever the Settings page is foregrounded.
If check succeeds and user has entitlement, we show the Netp settings entry.
If check succeeds and user has no entitlement, we handle the expired entitlement (refer to first bullet point in this section) and also hide Netp settings entry.
If check fails (no internet, be failure, tunnel failure), we retain whatever the previous visibility of the Settings entry if available, else hide entry.

Steps to test this PR:
https://app.asana.com/0/0/1206779809102187/f

Internal references:

Pull Request Review Checklist
Software Engineering Expectations
Technical Design Template
Pull Request Documentation

…hange-handling-spike

…eychain-sharing

…lements-change-handling-spike

diegoreymendez · 2024-03-18T13:25:08Z

DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift

@@ -47,6 +47,10 @@ final class DuckDuckGoVPNApplication: NSApplication {

        super.init()
        self.delegate = _delegate
+#if SUBSCRIPTION
+        SubscriptionPurchaseEnvironment.currentServiceEnvironment = .staging


Should this be configured by settings.environment?

diegoreymendez · 2024-03-18T13:26:06Z

DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift

+            await entitlementMonitor.start(entitlementCheck: entitlementsCheck) { [weak self] result in
+                switch result {
+                case .validEntitlement:
+                    UserDefaults.netP.networkProtectionEntitlementsExpired = false


Again wondering if we can check for entitlements instead of relying on a shared user default.

diegoreymendez · 2024-03-18T13:42:41Z

DuckDuckGoVPN/NetworkProtectionBouncer.swift

-    func requireAuthTokenOrKillApp() {
+    func requireAuthenticationOrKillApp() {
+#if SUBSCRIPTION
+        Task {


If the code in the bouncer is async, we need the full method to be async.

This call needs to be blocking for the other logic that happens after in the caller, so that the tunnel won't try to start while this is executing. I'm making a similar change that you can see here.

…hange-handling-spike

diegoreymendez

There's one blocking issue: it seems geolocation is broken at least for waitlist users. I think it may have to do with the environment being hard-coded to staged, but I'm not sure.

…hange-handling-spike

diegoreymendez

We've reviewed this several times in the code, in testing and live on a call.

Approved.

DuckDuckGo/Common/Extensions/NSApplicationExtension.swift

* main: Display error messaging for cancelled subscriptions (#2394) Updated Settings Page (#2329) Add VPN & PIR thank you modal (#2437) Web pixels (handlers + pixels) (#2451) Subscription design review further fixes (#2448) Address bookmarks feedback (#2411) Handle subscription-related iOS use cases (#2427)

# By Michal Smaga (2) and others # Via GitHub (2) and Dominik Kapusta (1) * main: Connect thank you message to DBP method (#2456) Use SubscriptionFeatureAvailability to determine availability of the subscription (#2436) Add Privacy Pro to App Store build (#2440) Display error messaging for cancelled subscriptions (#2394) Updated Settings Page (#2329) Add VPN & PIR thank you modal (#2437) Web pixels (handlers + pixels) (#2451) Subscription design review further fixes (#2448) Address bookmarks feedback (#2411) Handle subscription-related iOS use cases (#2427) Remove hardcoded NetP staging endpoint (#2446) DBP: Make webview non-persistent and delete any old cache data (#2445) Prevents the tunnel from starting without an auth token (#2438) Use History in Suggestions on iOS (#2339) When publishing a DMG, only check out the branch if it exists, otherwise stay on main Bump version to 1.80.0 (146) Update autoconsent to v10.3.0 (#2433) # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

# By Diego Rey Mendez (4) and others # Via GitHub (2) and Dominik Kapusta (1) * main: (28 commits) Entitlements cache fixes (#2465) BSK update for RMF app build version improvement (#2362) Surface the last-used password first in autofill prompt when filling passwords (#2431) Reset subs VPN state from debug menu (#2462) iOS UI improvements (#2412) Updates VPN 128 assets (#2459) Fix sparkle strings for thank you message (#2461) Wire VPN environment to subs menu item (#2460) Makes a method thread safe (#2452) Ensure smooth subs updates (#2424) Update Pointfree snapshot testing library to 1.15.4 (#2449) Connect thank you message to DBP method (#2456) Use SubscriptionFeatureAvailability to determine availability of the subscription (#2436) Add Privacy Pro to App Store build (#2440) Display error messaging for cancelled subscriptions (#2394) Updated Settings Page (#2329) Add VPN & PIR thank you modal (#2437) Web pixels (handlers + pixels) (#2451) Subscription design review further fixes (#2448) Address bookmarks feedback (#2411) ... # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

graeme added 30 commits February 15, 2024 17:14

Point to BSK branch and make compile

d08b1f6

Add basic hardcoded SubscriptionExpiredView

ef56ab2

Show subscription expired prompt

77fa698

Show expired entitlement notifications

4b96312

wip

c71c7a8

wip

b7b881b

Merge remote-tracking branch 'origin/main' into graeme/entitlements-c…

8280c5a

…hange-handling-spike

Get it compiling again

1d2744b

Update to handle recent merge from Anh

52f17d4

Use subscription app group for AccountManager

fed430b

Pull out AccountManager extension into file

c00bbb1

wip

38a20b3

Point to BSK commit

8b9fce7

Use subscription app group for AccountManager

2c48e94

Fix some stuff post-cherry-picking

a322b65

Point to BSK commit with migration

d068dff

Migrate access token

3102a55

Merge remote-tracking branch 'origin/main' into graeme/subscription-k…

0a2c615

…eychain-sharing

Point to update BSK branch after main merge

17612bf

Merge branch 'graeme/subscription-keychain-sharing' into graeme/entit…

0299187

…lements-change-handling-spike

Few fixes post merge of token branch

2266042

wip

4f0069c

Point to updated BSK branch

0d92bdd

Uncomment accidentally commented code

0072d39

Remove AccountManager from NetPTunnelController for now

8a1b8b6

Merge branch 'main' into graeme/subscription-keychain-sharing

8838386

Revert change to xcsttrings

9fda945

Merge branch 'main' into graeme/subscription-keychain-sharing

01fb050

Remove accidental service env change

32d9ec4

Revert change to netP keychain group

6d1ed5f

diegoreymendez reviewed Mar 18, 2024

View reviewed changes

Remove unnecessary Task dispatch

5fe65e9

diegoreymendez self-requested a review March 18, 2024 14:03

graeme added 5 commits March 18, 2024 15:05

Make the bouncer call block subsequent actions

6509729

Remove subscription lib staging configuration

fd39413

replace NSnotification for VPN uninstalled

6a25ed4

Merge remote-tracking branch 'origin/main' into graeme/entitlements-c…

112a9fe

…hange-handling-spike

Point to updated BSK branch

2e42598

diegoreymendez requested changes Mar 18, 2024

View reviewed changes

graeme added 4 commits March 18, 2024 18:50

Remove warning

e33b7d1

Set subs env based on VPN in agent and extension

74f257d

Merge remote-tracking branch 'origin/main' into graeme/entitlements-c…

70b2521

…hange-handling-spike

Update bouncer after main merge

1d3f081

diegoreymendez self-requested a review March 19, 2024 13:10

graeme added 3 commits March 19, 2024 15:05

Adapt to token fetching changes

fcb7a83

Fixes after merging main

bedbfdf

Merge remote-tracking branch 'origin/main' into graeme/entitlements-c…

3a80d5f

…hange-handling-spike

diegoreymendez approved these changes Mar 19, 2024

View reviewed changes

Print out the type of the delegate to see why the cast failed.

f72d958

samsymons reviewed Mar 19, 2024

View reviewed changes

DuckDuckGo/Common/Extensions/NSApplicationExtension.swift Outdated Show resolved Hide resolved

samsymons and others added 3 commits March 19, 2024 10:53

Try another change to get CI working.

a6d68d3

Point to BSK release

3c0dfe1

Create internalUserDecider instance privately

81ddbb8

samsymons merged commit cf1e711 into main Mar 19, 2024
17 checks passed

samsymons deleted the graeme/entitlements-change-handling-spike branch March 19, 2024 18:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Display error messaging for cancelled subscriptions #2394

Display error messaging for cancelled subscriptions #2394

graeme commented Mar 12, 2024 •

edited

Loading

diegoreymendez Mar 18, 2024

diegoreymendez Mar 18, 2024

diegoreymendez Mar 18, 2024

diegoreymendez left a comment •

edited

Loading

diegoreymendez left a comment

Display error messaging for cancelled subscriptions #2394

Display error messaging for cancelled subscriptions #2394

Conversation

graeme commented Mar 12, 2024 • edited Loading

Internal references:

diegoreymendez Mar 18, 2024

Choose a reason for hiding this comment

diegoreymendez Mar 18, 2024

Choose a reason for hiding this comment

diegoreymendez Mar 18, 2024

Choose a reason for hiding this comment

diegoreymendez left a comment • edited Loading

Choose a reason for hiding this comment

diegoreymendez left a comment

Choose a reason for hiding this comment

graeme commented Mar 12, 2024 •

edited

Loading

diegoreymendez left a comment •

edited

Loading