code clean up

Author: lawmicha

Amplify/Categories/DataStore/DataStoreCategory+HubPayloadEventName.swift

@@ -23,7 +23,4 @@ public extension HubPayload.EventName.DataStore {
     /// Dispatched when DataStore receives a sync response from the remote API via the API category. The Hub Payload
     /// will be a `MutationEvent` instance that caused the conditional save failed.
     static let conditionalSaveFailed = "DataStore.conditionalSaveFailed"
-
-    /// Dispatched when DataStore completes a clear operation
-    static let clearCompleted = "DataStore.clearCompleted"
 }

Amplify/Core/Configuration/AmplifyConfiguration.swift

@@ -101,24 +101,23 @@ extension Amplify {
         try configure(Logging, using: configuration)
         try configure(Hub, using: configuration)
 
-        // Auth is a special case for other plugins which depend on using Auth when being configured themselves.
-        try configure(Auth, using: configuration)
-
         // Looping through all categories to ensure we don't accidentally forget a category at some point in the future
-        let remainingCategories = CategoryType.allCases.filter { $0 != .hub && $0 != .logging && $0 != .auth }
+        let remainingCategories = CategoryType.allCases.filter { $0 != .hub && $0 != .logging }
         for categoryType in remainingCategories {
             switch categoryType {
             case .analytics:
                 try configure(Analytics, using: configuration)
             case .api:
                 try configure(API, using: configuration)
+            case .auth:
+                try configure(Auth, using: configuration)
             case .dataStore:
                 try configure(DataStore, using: configuration)
             case .predictions:
                 try configure(Predictions, using: configuration)
             case .storage:
                 try configure(Storage, using: configuration)
-            case .hub, .logging, .auth:
+            case .hub, .logging:
                 // Already configured
                 break
             }

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/AWSDataStorePlugin+DataStoreBaseBehavior.swift

@@ -127,8 +127,6 @@ extension AWSDataStorePlugin: DataStoreBaseBehavior {
 
     public func clear(completion: @escaping DataStoreCallback<Void>) {
         if storageEngine == nil {
-            Amplify.Hub.dispatch(to: .dataStore,
-                                 payload: HubPayload(eventName: HubPayload.EventName.DataStore.clearCompleted))
             completion(.successfulVoid)
             return
         }
@@ -140,8 +138,6 @@ extension AWSDataStorePlugin: DataStoreBaseBehavior {
                 }
             }
             self.dataStorePublisher = nil
-            Amplify.Hub.dispatch(to: .dataStore,
-                                 payload: HubPayload(eventName: HubPayload.EventName.DataStore.clearCompleted))
             completion(result)
         }
     }

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/RemoteSyncEngine+Resolver.swift

@@ -36,11 +36,6 @@ extension RemoteSyncEngine {
             case (.performingInitialSync, .errored(let error)):
                 return .cleaningUp(error)
 
-            case (.performingInitialSync, .performedInitialSync):
-                return .activatingCloudSubscriptions
-            case (.performingInitialSync, .errored(let error)):
-                return .cleaningUp(error)
-
             case (.activatingCloudSubscriptions, .activatedCloudSubscriptions(let api,
                                                                               let mutationEventPublisher)):
                 return .activatingMutationQueue(api, mutationEventPublisher)

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/SubscriptionSync/IncomingAsyncSubscriptionEventPublisher.swift

@@ -156,7 +156,7 @@ final class IncomingAsyncSubscriptionEventPublisher: Cancellable {
     ) -> GraphQLSubscriptionOperation<Payload> {
 
         let request: GraphQLRequest<Payload>
-        if let auth = auth, let user = auth.getCurrentUser() {
+        if let auth = auth, modelType.schema.hasAuth, let user = auth.getCurrentUser() {
             // TODO: check model schema to see what is the identityClaim before retrieving the right one adding it as ownerId
             request = GraphQLRequest<Payload>.subscription(to: modelType, subscriptionType: subscriptionType, ownerId: user.username)
         } else {

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/SubscriptionSync/ReconcileAndLocalSave/AWSModelReconciliationQueue.swift

@@ -66,9 +66,6 @@ final class AWSModelReconciliationQueue: ModelReconciliationQueue {
     private var incomingEventsSink: AnyCancellable?
     private var reconcileAndLocalSaveOperationSink: AnyCancellable?
 
-    private var signInListener: UnsubscribeToken?
-    private var ownerId: String?
-
     private let modelReconciliationQueueSubject: PassthroughSubject<ModelReconciliationQueueEvent, DataStoreError>
     var publisher: AnyPublisher<ModelReconciliationQueueEvent, DataStoreError> {
         return modelReconciliationQueueSubject.eraseToAnyPublisher()

AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginTests/Sync/InitialSync/InitialSyncOperationTests.swift

@@ -263,7 +263,7 @@ class InitialSyncOperationTests: XCTestCase {
     /// - When:
     ///    - I invoke main() against an API that returns .signedOut error
     /// - Then:
-    ///    - The method submits the returned data to the reconciliation queue
+    ///    - The method completes with a failure result, error handler is called.
     func testQueriesAPIReturnSignedOutError() throws {
         let responder = QueryRequestListenerResponder<PaginatedList<AnyModel>> { _, listener in
             let authError = AuthError.signedOut("", "", nil)