Skip to content
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

Jump to bottom

Fix #6474: reconfig FxA in the notification service EVERY time a push arrives #6496

Merged
merged 1 commit into from
Apr 29, 2020
Merged

Fix #6474: reconfig FxA in the notification service EVERY time a push arrives #6496

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
88 changes: 45 additions & 43 deletions Account/FxAPushMessageHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,55 +60,57 @@ extension FxAPushMessageHandler {
// return handle(plaintext: string)
let deferred = PushMessageResult()
RustFirefoxAccounts.startup(prefs: profile.prefs) { fxa in
fxa.accountManager.deviceConstellation()?.processRawIncomingAccountEvent(pushPayload: string) {
result in
guard case .success(let events) = result else {
if case .failure(let error) = result {
let err = PushMessageError.messageIncomplete(error.localizedDescription)
deferred.fill(Maybe(failure: err))
}
return
}
events.forEach { event in
switch event {
case .incomingDeviceCommand(let deviceCommand):
switch deviceCommand {
case .tabReceived(_, let tabData):
let title = tabData.last?.title ?? ""
let url = tabData.last?.url ?? ""
let message = PushMessage.commandReceived(tab: ["title": title, "url": url])
deferred.fill(Maybe(success: message))
RustFirefoxAccounts.reconfig {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This line is the actual code change, the rest is an indentation change

fxa.accountManager.deviceConstellation()?.processRawIncomingAccountEvent(pushPayload: string) {
result in
guard case .success(let events) = result else {
if case .failure(let error) = result {
let err = PushMessageError.messageIncomplete(error.localizedDescription)
deferred.fill(Maybe(failure: err))
}
case .deviceConnected(let deviceName):
let message = PushMessage.deviceConnected(deviceName)
deferred.fill(Maybe(success: message))
case .deviceDisconnected(let deviceInfo):
if deviceInfo.isLocalDevice {
// We can't disconnect the device from the account until we have access to the application, so we'll handle this properly in the AppDelegate (as this code in an extension),
// by calling the FxALoginHelper.applicationDidDisonnect(application).
self.profile.prefs.setBool(true, forKey: PendingAccountDisconnectedKey)
let message = PushMessage.thisDeviceDisconnected
return
}
events.forEach { event in
switch event {
case .incomingDeviceCommand(let deviceCommand):
switch deviceCommand {
case .tabReceived(_, let tabData):
let title = tabData.last?.title ?? ""
let url = tabData.last?.url ?? ""
let message = PushMessage.commandReceived(tab: ["title": title, "url": url])
deferred.fill(Maybe(success: message))
}
case .deviceConnected(let deviceName):
let message = PushMessage.deviceConnected(deviceName)
deferred.fill(Maybe(success: message))
return
}
case .deviceDisconnected(let deviceInfo):
if deviceInfo.isLocalDevice {
// We can't disconnect the device from the account until we have access to the application, so we'll handle this properly in the AppDelegate (as this code in an extension),
// by calling the FxALoginHelper.applicationDidDisonnect(application).
self.profile.prefs.setBool(true, forKey: PendingAccountDisconnectedKey)
let message = PushMessage.thisDeviceDisconnected
deferred.fill(Maybe(success: message))
return
}

guard let profile = self.profile as? BrowserProfile else {
// We can't look up a name in testing, so this is the same as not knowing about it.
let message = PushMessage.deviceDisconnected(nil)
deferred.fill(Maybe(success: message))
return
}
guard let profile = self.profile as? BrowserProfile else {
// We can't look up a name in testing, so this is the same as not knowing about it.
let message = PushMessage.deviceDisconnected(nil)
deferred.fill(Maybe(success: message))
return
}

profile.remoteClientsAndTabs.getClient(fxaDeviceId: deviceInfo.deviceId).uponQueue(.main) { result in
guard let device = result.successValue else { return }
let message = PushMessage.deviceDisconnected(device?.name)
if let id = device?.guid {
profile.remoteClientsAndTabs.deleteClient(guid: id).uponQueue(.main) { _ in
print("deleted client")
profile.remoteClientsAndTabs.getClient(fxaDeviceId: deviceInfo.deviceId).uponQueue(.main) { result in
guard let device = result.successValue else { return }
let message = PushMessage.deviceDisconnected(device?.name)
if let id = device?.guid {
profile.remoteClientsAndTabs.deleteClient(guid: id).uponQueue(.main) { _ in
print("deleted client")
}
}
}

deferred.fill(Maybe(success: message))
deferred.fill(Maybe(success: message))
}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions RustFxA/RustFirefoxAccounts.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ open class RustFirefoxAccounts {
return id
}

public static func reconfig() {
public static func reconfig(_ completion: (() -> Void)? = nil) {
shared.accountManager = createAccountManager()
shared.accountManager.initialize() { _ in
print("FxA reconfigured")
completion?()
}
}

Expand Down