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.

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

Update BSK with NetP auth changes #2077

Closed
wants to merge 6 commits into from

Conversation

samsymons
Copy link
Contributor

Task/Issue URL: https://app.asana.com/0/0/1205645389501250/f
Tech Design URL:
CC:

Description:

This PR updates NetP with auth changes.

Steps to test this PR:

  1. Make sure that the NetP invite code flow still works

Copy Testing:

  • Use of correct apostrophes in new copy, ie rather than '

Orientation Testing:

  • Portrait
  • Landscape

Device Testing:

  • iPhone SE (1st Gen)
  • iPhone 8
  • iPhone X
  • iPhone 14 Pro
  • iPad

OS Testing:

  • iOS 14
  • iOS 15
  • iOS 16

Theme Testing:

  • Light theme
  • Dark theme

Internal references:

Software Engineering Expectations
Technical Design Template

@samsymons samsymons requested a review from graeme October 8, 2023 23:20
Comment on lines 13 to 14
/* The body of the notification shown when Network Protection connects successfully with the city + state/country as formatted parameter */
"network.protection.success.notification.subtitle.including.serverLocation" = "Routing device traffic through \(serverLocation).";
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@graeme I noticed this appearing after building, presumably as the user text build phase step runs - committing the change here even though it isn't directly related to this PR.

Copy link
Contributor

@graeme graeme left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good so far! Unsure whether you wanted to add more before merging but it’s good to go as is.

# By Graeme Arthur (14) and others
# Via Graeme Arthur (7) and others
* develop: (87 commits)
  NetP waitlist (#2160)
  NetP VPN locations screen (#2183)
  bump bsk for CBR energy usage  (#2195)
  Fix sync Form Factor specific favorites tests (#2164)
  Release 7.98.0 (#2193)
  Update BSK ref to latest one (#2191)
  Release 7.97.1 (#2190)
  Revert "Breakage report improvements" (#2189)
  Breakage report improvements (#2168)
  bump C-S-S to 4.52.0 (#2186)
  Revert "refactor bookmarks and fire pixel if migration happens more than once"
  refactor bookmarks and fire pixel if migration happens more than once
  Release 7.98.0 (#2179)
  Bump autoconsent to 6.4.0 (#2174)
  remove redundant orientation detection (#2178)
  Removed unarchiveTopLevelObjectWithData deprecation (#2176)
  fix pass kit related crash on iPad (#2171)
  Update email protection e2e test to match the new UI (#2170)
  Updates BSK (#2173)
  Rolls back a BSK change by mistake
  ...

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift
#	PacketTunnelProvider/en.lproj/Localizable.strings
@jaceklyp jaceklyp deleted the branch develop December 6, 2023 15:48
@jaceklyp jaceklyp closed this Dec 6, 2023
samsymons added a commit to duckduckgo/BrowserServicesKit that referenced this pull request Dec 25, 2023
Required:

Task/Issue URL: https://app.asana.com/0/0/1205645389501250/f
iOS PR: duckduckgo/iOS#2077
macOS PR: duckduckgo/macos-browser#1710
What kind of version bump will this require?: Major

Description:

This PR adds support for exchanging access tokens for auth tokens.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants