Skip to content

Shareserver as url and expose list of known shareservers #13

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 5 commits into from
Jun 20, 2017
Merged

Shareserver as url and expose list of known shareservers #13

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f1a260
Support US, NON_US and Custom ShareServer during initialization
dabear Jun 2, 2017
da85d47
remove unnecessary optional and unwrapping
dabear Jun 3, 2017
d1822c0
remove trailing whitespaces as requested
dabear Jun 3, 2017
54228ec
Merge branch 'master' of https://github.com/dabear/dexcom-share-clien…
dabear Jun 17, 2017
b27d5ed
expose list of known share urls, make init take shareserver as a stri…
dabear Jun 17, 2017
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
27 changes: 12 additions & 15 deletions ShareClient/ShareClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ public enum ShareError: Error {
case dateError
}

public enum ShareServer {
case US
case Non_US
case Custom(String)

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

}

// From the Dexcom Share iOS app, via @bewest and @shanselman:
Expand All @@ -38,8 +39,6 @@ private let dexcomUserAgent = "Dexcom Share/3.0.2.11 CFNetwork/711.2.23 Darwin/1
private let dexcomApplicationId = "d89443d2-327c-4a6f-89e5-496bbb0317db"
private let dexcomLoginPath = "/ShareWebServices/Services/General/LoginPublisherAccountByName"
private let dexcomLatestGlucosePath = "/ShareWebServices/Services/Publisher/ReadPublisherLatestGlucoseValues"
private let dexcomServerUS = "https://share1.dexcom.com"
private let dexcomServerNonUS = "https://shareous1.dexcom.com"
private let maxReauthAttempts = 2

// TODO use an HTTP library which supports JSON and futures instead of callbacks.
Expand Down Expand Up @@ -79,17 +78,15 @@ public class ShareClient {
private let shareServer:String
private var token: String?

public init(username: String, password: String, shareServer:ShareServer=ShareServer.US) {
public init(username: String, password: String, shareServer:String=KnownShareServers.US.rawValue) {
Copy link
Owner

@mddub mddub Jun 20, 2017

Choose a reason for hiding this comment

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

nit: since the convenience initializer below has a default value for shareServer, I don't think there should be a default value here.

self.username = username
self.password = password
switch shareServer {
case .US:
self.shareServer=dexcomServerUS
case .Non_US:
self.shareServer=dexcomServerNonUS
case .Custom(let url):
self.shareServer=url
}
self.shareServer = shareServer
}
public convenience init(username: String, password: String, shareServer:KnownShareServers=KnownShareServers.US) {

self.init(username: username, password: password, shareServer:shareServer.rawValue)

}

public func fetchLast(_ n: Int, callback: @escaping (ShareError?, [ShareGlucose]?) -> Void) {
Expand Down