make sure credential provider works appropriately when not authenticated (#1031)

* make sure credential provider works appropriately when not authenticated

* use map syntax

Author: sashei

CredentialProvider/Presenter/CredentialProviderPresenter.swift

@@ -48,10 +48,14 @@ class CredentialProviderPresenter {
         self.credentialProviderStore = credentialProviderStore
 
         self.accountStore.syncCredentials
-            .filterNil()
-            .bind { [weak self] (syncInfo) in
-                self?.dispatcher.dispatch(action: DataStoreAction.updateCredentials(syncInfo: syncInfo))
+            .map { syncInfo -> Action in
+                if let credentials = syncInfo {
+                    return DataStoreAction.updateCredentials(syncInfo: credentials)
+                } else {
+                    return DataStoreAction.reset
+                }
             }
+            .bind { self.dispatcher.dispatch(action: $0) }
             .disposed(by: self.disposeBag)
 
         self.dispatcher.register
@@ -130,6 +134,14 @@ class CredentialProviderPresenter {
                     }
                 })
                 .disposed(by: self.credentialProvisionBag)
+
+        self.dataStore.storageState
+                .filter { $0 == .Unprepared }
+                .asDriver(onErrorJustReturn: .Unprepared)
+                .drive(onNext: { [weak self] _ in
+                    self?.view?.displayWelcome()
+                })
+                .disposed(by: self.credentialProvisionBag)
     }
 }
 

CredentialProvider/Presenter/CredentialWelcomePresenter.swift

@@ -22,7 +22,7 @@ class CredentialWelcomePresenter: BaseWelcomePresenter {
 
     private var okButtonObserver: AnyObserver<Void> {
         return Binder(self) { target, _ in
-            self.dispatcher.dispatch(action: CredentialStatusAction.extensionConfigured)
+            self.dispatcher.dispatch(action: CredentialStatusAction.cancelled(error: .userCanceled))
         }.asObserver()
     }
 

CredentialProvider/View/CredentialProviderView.swift

@@ -24,7 +24,7 @@ class CredentialProviderView: ASCredentialProviderViewController {
             oldViewController.removeFromParent()
         }
     }
-    
+
     override var preferredStatusBarStyle: UIStatusBarStyle {
         return self.currentViewController?.preferredStatusBarStyle ?? .lightContent
     }

lockbox-iosTests/CredentialProviderPresenterSpec.swift

@@ -71,11 +71,16 @@ class CredentialProviderPresenterSpec: QuickSpec {
     }
 
     class FakeDataStore: DataStore {
+        let stateStub = ReplaySubject<LoginStoreState>.create(bufferSize: 1)
         let lockedStub = ReplaySubject<Bool>.create(bufferSize: 1)
         let getStub = PublishSubject<LoginRecord?>()
 
         var getGuid: String?
 
+        override var storageState: Observable<LoginStoreState> {
+            return self.stateStub.asObservable()
+        }
+
         override var locked: Observable<Bool> {
             return self.lockedStub.asObservable()
         }
@@ -112,6 +117,30 @@ class CredentialProviderPresenterSpec: QuickSpec {
                     dataStore: self.dataStore)
             }
 
+            describe("passing along sync credentials") {
+                describe("nil credentials") {
+                    beforeEach {
+                        self.accountStore._syncCredentials.onNext(nil)
+                    }
+
+                    it("resets the datastore") {
+                        let action = self.dispatcher.actionArguments.popLast() as! DataStoreAction
+                        expect(action).to(equal(DataStoreAction.reset))
+                    }
+                }
+
+                describe("populated credentials") {
+                    beforeEach {
+                        self.accountStore._syncCredentials.onNext(OfflineSyncCredential)
+                    }
+
+                    it("passes them along to the datastore") {
+                        let action = self.dispatcher.actionArguments.popLast() as! DataStoreAction
+                        expect(action).to(equal(DataStoreAction.updateCredentials(syncInfo: OfflineSyncCredential)))
+                    }
+                }
+            }
+
             describe("CredentialStatusAction") {
                 describe("extensionConfigured") {
                     beforeEach {
@@ -331,6 +360,16 @@ class CredentialProviderPresenterSpec: QuickSpec {
                     self.subject.credentialList(for: [] as! [ASCredentialServiceIdentifier])
                 }
 
+                describe("when the datastore is unprepared") {
+                    beforeEach {
+                        self.dataStore.stateStub.onNext(.Unprepared)
+                    }
+
+                    it("routes to the welcome view") {
+                        expect(self.view.displayWelcomeCalled).to(beTrue())
+                    }
+                }
+
                 describe("when the datastore is locked") {
                     beforeEach {
                         self.dataStore.lockedStub.onNext(true)