Skip to content
This repository was archived by the owner on Feb 24, 2025. It is now read-only.

Change service name for NetP auth tokens. #479

Merged
diegoreymendez merged 2 commits into from
Aug 25, 2023
Merged

Change service name for NetP auth tokens. #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93a2c4a
Resolves an issue with NetworkProtectionTokenStore
diegoreymendez Aug 25, 2023
532d1e0
Corrects some swiftlint issues
diegoreymendez Aug 25, 2023
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
4 changes: 2 additions & 2 deletions Sources/NetworkProtection/KeyManagement/NetworkProtectionKeychainStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ final class NetworkProtectionKeychainStore {
private let keychainType: KeychainType

init(label: String,
serviceName: String,
keychainType: KeychainType) {
serviceName: String,
keychainType: KeychainType) {

self.label = label
self.serviceName = serviceName
Expand Down
7 changes: 4 additions & 3 deletions Sources/NetworkProtection/KeyManagement/NetworkProtectionTokenStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,17 @@ public final class NetworkProtectionKeychainTokenStore: NetworkProtectionTokenSt
private let keychainStore: NetworkProtectionKeychainStore
private let errorEvents: EventMapping<NetworkProtectionError>?

private struct Defaults {
public struct Defaults {
static let tokenStoreEntryLabel = "DuckDuckGo Network Protection Auth Token"
static let tokenStoreService = "\(Bundle.main.bundleIdentifier!).authToken"
public static let tokenStoreService = "com.duckduckgo.networkprotection.authToken"
static let tokenStoreName = "com.duckduckgo.networkprotection.token"
}

public init(keychainType: KeychainType,
serviceName: String = Defaults.tokenStoreService,
errorEvents: EventMapping<NetworkProtectionError>?) {
keychainStore = NetworkProtectionKeychainStore(label: Defaults.tokenStoreEntryLabel,
serviceName: Defaults.tokenStoreService,
serviceName: serviceName,
keychainType: keychainType)
self.errorEvents = errorEvents
}
Expand Down