Skip to content

Add support for Dexcom Japan and APAC #42

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
Apr 6, 2024
Merged

Add support for Dexcom Japan and APAC #42

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
30 changes: 24 additions & 6 deletions ShareClient/ShareClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,26 @@ public enum ShareError: Error {
}


public enum KnownShareServers: String {
public enum KnownShareServers: String, CaseIterable {
case US="https://share2.dexcom.com"
case NON_US="https://shareous1.dexcom.com"

case APAC="https://share.dexcom.jp"
case Worldwide="https://shareous1.dexcom.com"

// Application IDs obtained from Dexcom Share iOS app,
// including the one covering Japan/APAC region.
var dexcomApplicationId: String {
switch self {
case .US, .Worldwide:
"d89443d2-327c-4a6f-89e5-496bbb0317db"
case .APAC:
"d8665ade-9673-4e27-9ff6-92db4ce13d13"
}
}
}

// From the Dexcom Share iOS app, via @bewest and @shanselman:
// https://github.com/bewest/share2nightscout-bridge
private let dexcomUserAgent = "Dexcom Share/3.0.2.11 CFNetwork/711.2.23 Darwin/14.0.0"
private let dexcomApplicationId = "d89443d2-327c-4a6f-89e5-496bbb0317db"
private let dexcomAuthenticatePath = "/ShareWebServices/Services/General/AuthenticatePublisherAccount"
private let dexcomLoginByIdPath = "/ShareWebServices/Services/General/LoginPublisherAccountById"
private let dexcomLatestGlucosePath = "/ShareWebServices/Services/Publisher/ReadPublisherLatestGlucoseValues"
Expand Down Expand Up @@ -117,10 +127,14 @@ public class ShareClient {
}

private func fetchAccountID(_ callback: @escaping (Result<String, ShareError>) -> Void) {
guard let applicationId = KnownShareServers(rawValue: shareServer)?.dexcomApplicationId else {
return callback(.failure(.fetchError))
}

let data = [
"accountName": username,
"password": password,
"applicationId": dexcomApplicationId
"applicationId": applicationId
]

guard let url = URL(string: shareServer + dexcomAuthenticatePath) else {
Expand Down Expand Up @@ -151,10 +165,14 @@ public class ShareClient {
}

private func fetchTokenByAccountId(_ accountId: String, callback: @escaping (ShareError?, String?) -> Void) {
guard let applicationId = KnownShareServers(rawValue: shareServer)?.dexcomApplicationId else {
return callback(ShareError.fetchError, nil)
}

let data = [
"accountId": accountId,
"password": password,
"applicationId": dexcomApplicationId
"applicationId": applicationId
]

guard let url = URL(string: shareServer + dexcomLoginByIdPath) else {
Expand Down
5 changes: 3 additions & 2 deletions ShareClientUI/ShareService+UI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ extension ShareService: ServiceAuthenticationUI {
options: [
(title: LocalizedString("US", comment: "U.S. share server option title"),
value: KnownShareServers.US.rawValue),
(title: LocalizedString("Outside US", comment: "Outside US share server option title"),
value: KnownShareServers.NON_US.rawValue)
(title: LocalizedString("APAC", comment: "Japan, Phillipines, Singapore share server option title"), value: KnownShareServers.APAC.rawValue),
(title: LocalizedString("Worldwide", comment: "Outside US and APAC share server option title"),
value: KnownShareServers.Worldwide.rawValue)

]
)
Expand Down