8000 BIT-2410: Support managed app config environment URLs by matt-livefront · Pull Request #731 · bitwarden/ios · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

BIT-2410: Support managed app config environment URLs #731

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

Merged
merged 1 commit into from
Jul 15, 2024
Merged

BIT-2410: Support managed app config environment URLs #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions BitwardenShared/Core/Platform/Services/EnvironmentService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,21 @@ class DefaultEnvironmentService: EnvironmentService {
/// The app's current environment URLs.
private var environmentUrls: EnvironmentUrls

/// The shared UserDefaults instance (NOTE: this should be the standard one just for the app,
/// not one in the app group).
private let standardUserDefaults: UserDefaults

// MARK: Initialization

/// Initialize a `DefaultEnvironmentService`.
///
/// - Parameter stateService: The service used by the application to manage account state.
/// - Parameters:
/// - stateService: The service used by the application to manage account state.
/// - standardUserDefaults: The shared UserDefaults instance.
///
init(stateService: StateService) {
init(stateService: StateService, standardUserDefaults: UserDefaults = .standard) {
self.stateService = stateService
self.standardUserDefaults = standardUserDefaults

environmentUrls = EnvironmentUrls(environmentUrlData: .defaultUS)
}
Expand All @@ -84,14 +91,18 @@ class DefaultEnvironmentService: EnvironmentService {

func loadURLsForActiveAccount() async {
let urls: EnvironmentUrlData
let managedSettingsUrls = managedSettingsUrls()
if let environmentUrls = try? await stateService.getEnvironmentUrls() {
urls = environmentUrls
} else if let managedSettingsUrls {
urls = managedSettingsUrls
} else if let preAuthUrls = await stateService.getPreAuthEnvironmentUrls() {
urls = preAuthUrls
} else {
urls = .defaultUS
}
await setPreAuthURLs(urls: urls)

await setPreAuthURLs(urls: managedSettingsUrls ?? urls)
environmentUrls = EnvironmentUrls(environmentUrlData: urls)

// swiftformat:disable:next redundantSelf
Expand All @@ -105,6 +116,22 @@ class DefaultEnvironmentService: EnvironmentService {
// swiftformat:disable:next redundantSelf
Logger.application.info("Setting pre-auth URLs: \(String(describing: self.environmentUrls))")
}

// MARK: Private

/// Returns the URLs that are specified as part of a managed app configuration.
///
/// - Returns: The environment URLs that are specified as part of a managed app configuration.
///
private func managedSettingsUrls() -> EnvironmentUrlData? {
let managedSettings = standardUserDefaults.dictionary(forKey: "com.apple.configuration.managed")
guard let baseUrlString = managedSettings?["baseEnvironmentUrl"] as? String,
let baseUrl = URL(string: baseUrlString)
else {
return nil
}
return EnvironmentUrlData(base: baseUrl)
}
}

extension DefaultEnvironmentService {
Expand Down
58 changes: 57 additions & 1 deletion BitwardenShared/Core/Platform/Services/EnvironmentServiceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ class EnvironmentServiceTests: XCTestCase {
// MARK: Properties

var stateService: MockStateService!
var standardUserDefaults: UserDefaults!
var subject: EnvironmentService!

// MARK: Setup & Teardown
Expand All @@ -14,14 +15,20 @@ class EnvironmentServiceTests: XCTestCase {
super.setUp()

stateService = MockStateService()
standardUserDefaults = UserDefaults(suiteName: "test")
standardUserDefaults.removeObject(forKey: "com.apple.configuration.managed")

subject = DefaultEnvironmentService(stateService: stateService)
subject = DefaultEnvironmentService(
stateService: stateService,
standardUserDefaults: standardUserDefaults
)
}

override func tearDown() {
super.tearDown()

stateService = nil
standardUserDefaults = nil
subject = nil
}

Expand Down Expand Up @@ -82,6 +89,55 @@ class EnvironmentServiceTests: XCTestCase {
XCTAssertEqual(stateService.preAuthEnvironmentUrls, urls)
}

/// `loadURLsForActiveAccount()` loads the managed config URLs.
func test_loadURLsForActiveAccount_managedConfig() async throws {
standardUserDefaults.setValue(
["baseEnvironmentUrl": "https://vault.example.com"],
forKey: "com.apple.configuration.managed"
)

await subject.loadURLsForActiveAccount()

let urls = try EnvironmentUrlData(base: XCTUnwrap(URL(string: "https://vault.example.com")))
XCTAssertEqual(subject.apiURL, URL(string: "https://vault.example.com/api"))
XCTAssertEqual(subject.eventsURL, URL(string: "https://vault.example.com/events"))
XCTAssertEqual(subject.iconsURL, URL(string: "https://vault.example.com/icons"))
XCTAssertEqual(subject.identityURL, URL(string: "https://vault.example.com/identity"))
XCTAssertEqual(subject.importItemsURL, URL(string: "https://vault.example.com/#/tools/import"))
XCTAssertEqual(subject.region, .selfHosted)
XCTAssertEqual(subject.sendShareURL, URL(string: "https://vault.example.com/#/send"))
XCTAssertEqual(subject.settingsURL, URL(string: "https://vault.example.com/#/settings"))
XCTAssertEqual(subject.webVaultURL, URL(string: "https://vault.example.com"))
XCTAssertEqual(stateService.preAuthEnvironmentUrls, urls)
}

/// `loadURLsForActiveAccount()` doesn't load the managed config URLs if there's an active
/// account, but sets the pre-auth URLs to the managed config URLs.
func test_loadURLsForActiveAccount_managedConfigActiveAccount() async throws {
let account = Account.fixture()
stateService.activeAccount = account
stateService.environmentUrls[account.profile.userId] = .defaultUS
standardUserDefaults.setValue(
["baseEnvironmentUrl": "https://vault.example.com"],
forKey: "com.apple.configuration.managed"
)

await subject.loadURLsForActiveAccount()

XCTAssertEqual(subject.apiURL, URL(string: "https://vault.bitwarden.com/api"))
XCTAssertEqual(subject.eventsURL, URL(string: "https://vault.bitwarden.com/events"))
XCTAssertEqual(subject.iconsURL, URL(string: "https://vault.bitwarden.com/icons"))
XCTAssertEqual(subject.identityURL, URL(string: "https://vault.bitwarden.com/identity"))
XCTAssertEqual(subject.importItemsURL, URL(string: "https://vault.bitwarden.com/#/tools/import"))
XCTAssertEqual(subject.region, .unitedStates)
XCTAssertEqual(subject.sendShareURL, URL(string: "https://vault.bitwarden.com/#/send"))
XCTAssertEqual(subject.settingsURL, URL(string: "https://vault.bitwarden.com/#/settings"))
XCTAssertEqual(subject.webVaultURL, URL(string: "https://vault.bitwarden.com"))

let urls = try EnvironmentUrlData(base: XCTUnwrap(URL(string: "https://vault.example.com")))
XCTAssertEqual(stateService.preAuthEnvironmentUrls, urls)
}

/// `loadURLsForActiveAccount()` loads the default URLs if there's no active account
/// and no preauth URLs.
func test_loadURLsForActiveAccount_noAccount() async {
Expand Down
Loading
0