Skip to content

Keep a logged-out Tidepool service and retract the re-login alert #46

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

Open
ps2 wants to merge 1 commit into
base: next-dev
Choose a base branch
from
Open

Keep a logged-out Tidepool service and retract the re-login alert #46

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
20 changes: 16 additions & 4 deletions TidepoolServiceKit/TidepoolService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ public final class TidepoolService: Service, TAPIObserver, ObservableObject {
clearCachedDataSetId()
}

let wasLoggedOut = self.session == nil
self.session = session

do {
Expand All @@ -176,18 +177,24 @@ public final class TidepoolService: Service, TAPIObserver, ObservableObject {
Task {
await serviceDelegate?.issueAlert(
Alert(
identifier: Alert
.Identifier(managerIdentifier: pluginIdentifier,
alertIdentifier: "authentication-needed"),
identifier: authenticationNeededAlertIdentifier,
foregroundContent: content,
backgroundContent: content,
trigger: .immediate
)
)
}
} else if wasLoggedOut {
Task {
await serviceDelegate?.retractAlert(identifier: authenticationNeededAlertIdentifier)
}
}
}

private var authenticationNeededAlertIdentifier: Alert.Identifier {
Alert.Identifier(managerIdentifier: pluginIdentifier, alertIdentifier: "authentication-needed")
}

public func completeCreate() async throws {
self.isOnboarded = true
}
Expand Down Expand Up @@ -615,7 +622,12 @@ extension KeychainManager: SessionStorage {
}

public func getSession(for service: String) throws -> TSession? {
let sessionData = try getGenericPasswordForServiceAsData(service)
let sessionData: Data
do {
sessionData = try getGenericPasswordForServiceAsData(service)
} catch KeychainManagerError.copy(errSecItemNotFound) {
return nil
}
return try JSONDecoder.tidepool.decode(TSession.self, from: sessionData)
}
}
Expand Down
94 changes: 93 additions & 1 deletion TidepoolServiceKitTests/TidepoolServiceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,99 @@ class TidepoolServiceTests: XCTestCase {
XCTAssertEqual(lastCGMSettings!.id, created[4].id)
XCTAssertEqual(lastPumpSettings!.id, created[5].id)
}


}

@MainActor
class TidepoolServiceSessionTests: XCTestCase {
private var tidepoolService: TidepoolService!
private var serviceDelegate: MockServiceDelegate!
private let session = TSession(environment: TEnvironment(host: "test.tidepool.org", port: 443), accessToken: "access", accessTokenExpiration: nil, refreshToken: "refresh", userId: "1234567890", username: "test@test.com", userRoles: [])

override func setUp() {
super.setUp()
serviceDelegate = MockServiceDelegate()
tidepoolService = TidepoolService(hostIdentifier: "Loop", hostVersion: "1.2.3")
tidepoolService.sessionStorage = MockSessionStorage()
tidepoolService.serviceDelegate = serviceDelegate
}

func testLoggingOutIssuesAuthenticationAlert() async {
tidepoolService.apiDidUpdateSession(session)
await serviceDelegate.waitForRetracted(count: 1)

tidepoolService.apiDidUpdateSession(nil)
await serviceDelegate.waitForIssued(count: 1)

XCTAssertEqual(serviceDelegate.issued.first?.alertIdentifier, "authentication-needed")
}

func testLoggingBackInRetractsAuthenticationAlert() async {
tidepoolService.apiDidUpdateSession(session)
tidepoolService.apiDidUpdateSession(nil)
await serviceDelegate.waitForIssued(count: 1)

tidepoolService.apiDidUpdateSession(session)
await serviceDelegate.waitForRetracted(count: 2)

XCTAssertEqual(serviceDelegate.retracted.last?.alertIdentifier, "authentication-needed")
}

func testRefreshingSessionDoesNotRetract() async {
tidepoolService.apiDidUpdateSession(session)
await serviceDelegate.waitForRetracted(count: 1)

let refreshed = TSession(environment: session.environment, accessToken: "access2", accessTokenExpiration: nil, refreshToken: "refresh2", userId: session.userId, username: session.username, userRoles: [])
tidepoolService.apiDidUpdateSession(refreshed)
try? await Task.sleep(nanoseconds: 100_000_000)

XCTAssertEqual(serviceDelegate.retracted.count, 1)
}
}

private class MockSessionStorage: SessionStorage {
var sessions: [String: TSession] = [:]

func setSession(_ session: TSession?, for service: String) throws {
sessions[service] = session
}

func getSession(for service: String) throws -> TSession? {
sessions[service]
}
}

private class MockServiceDelegate: ServiceDelegate {
let hostIdentifier = "Loop"
let hostVersion = "1.2.3"

@MainActor var issued: [Alert.Identifier] = []
@MainActor var retracted: [Alert.Identifier] = []

@MainActor func issueAlert(_ alert: Alert) async {
issued.append(alert.identifier)
}

@MainActor func retractAlert(identifier: Alert.Identifier) async {
retracted.append(identifier)
}

@MainActor func waitForIssued(count: Int) async {
for _ in 0..<100 where issued.count < count {
try? await Task.sleep(nanoseconds: 10_000_000)
}
}

@MainActor func waitForRetracted(count: Int) async {
for _ in 0..<100 where retracted.count < count {
try? await Task.sleep(nanoseconds: 10_000_000)
}
}

func enactRemoteOverride(name: String, durationTime: TimeInterval?, remoteAddress: String) async throws {}
func cancelRemoteOverride() async throws {}
func deliverRemoteCarbs(amountInGrams: Double, absorptionTime: TimeInterval?, foodType: String?, startDate: Date?) async throws {}
func deliverRemoteBolus(amountInUnits: Double, decisionId: UUID?) async throws {}
}

fileprivate extension StoredSettings.ControllerDevice {
Expand Down