Fix PR issues

aws-amplify · Dec 14, 2022 · 92a8e87 · 92a8e87
1 parent ba67224
commit 92a8e87
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 204 deletions.
diff --git a/...nalytics/amplify_analytics_pinpoint/ios/Classes/SwiftAmplifyAnalyticsPinpointPlugin.swift b/...nalytics/amplify_analytics_pinpoint/ios/Classes/SwiftAmplifyAnalyticsPinpointPlugin.swift
@@ -38,7 +38,6 @@ class KeychainReader {
         return String(data: data, encoding: .utf8)
     }
 
-
     private func data(forKey key: String) -> Data? {
         let query = [
           kSecClass: kSecClassGenericPassword,
@@ -51,12 +50,10 @@ class KeychainReader {
         let status = SecItemCopyMatching(query, &result)
 
         guard status != errSecItemNotFound else {
-            print("\(key) not found")
             return nil
         }
 
         guard status == errSecSuccess else {
-            print("Read for \(key) failed")
             return nil
         }
 

diff --git a/packages/analytics/amplify_analytics_pinpoint/lib/main.dart b/packages/analytics/amplify_analytics_pinpoint/lib/main.dart
diff --git a/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml
@@ -45,4 +45,4 @@ flutter:
         package: com.amazonaws.amplify.amplify_analytics_pinpoint.amplify_analytics_pinpoint
         pluginClass: AmplifyAnalyticsPinpointPlugin
       ios:
-        pluginClass: AmplifyAnalyticsPinpointPlugin
+        pluginClass: AmplifyAnalyticsPinpointPlugin
diff --git a/packages/analytics/amplify_analytics_pinpoint/test/widget_test.dart b/packages/analytics/amplify_analytics_pinpoint/test/widget_test.dart
diff --git a/...s/secure_storage/amplify_secure_storage/ios/Classes/SwiftAmplifySecureStoragePlugin.swift b/...s/secure_storage/amplify_secure_storage/ios/Classes/SwiftAmplifySecureStoragePlugin.swift
@@ -6,68 +6,15 @@ public class SwiftAmplifySecureStoragePlugin: NSObject, FlutterPlugin, NSUserDef
     public static func register(with registrar: FlutterPluginRegistrar) {
         let instance = SwiftAmplifySecureStoragePlugin()
         NSUserDefaultsAPISetup(registrar.messenger(), instance)
-
-        let keychainItemQuery = [
-          kSecAttrService: "com.amazonaws.AWSPinpointContext",
-          kSecClass: "kSecClassGenericPassword"
-        ] as CFDictionary
-
-        let status = SecItemAdd(keychainItemQuery, nil)
-        print("Operation finished with status: \(status)")
-
-        // New attempt
-        let keychain = KeychainReader()
-            guard let uniqueId = keychain.string(forKey: "com.amazonaws.AWSPinpointContextKeychainUniqueIdKey") else {
-            return
-        }
-
-        print(uniqueId)
-
-
-
     }
-    
+
     public func setBoolKey(_ key: String, value: NSNumber) async -> FlutterError? {
         UserDefaults.standard.set(value, forKey: key)
         return nil
     }
-    
+
     public func bool(forKey key: String) async -> (NSNumber?, FlutterError?) {
         let containsScope = UserDefaults.standard.bool(forKey: key) as NSNumber
         return (containsScope, nil)
     }
 }
-
-class KeychainReader {
-    func string(forKey key: String) -> String? {
-        guard let data = data(forKey: key) else {
-            return nil
-        }
-        return String(data: data, encoding: .utf8)
-    }
-
-
-    func data(forKey key: String) -> Data? {
-        let query = [
-          kSecClass: kSecClassGenericPassword,
-          kSecAttrService: "com.amazonaws.AWSPinpointContext",
-          kSecAttrAccount: key,
-          kSecReturnData: true
-        ] as CFDictionary
-
-        var result: AnyObject?
-        let status = SecItemCopyMatching(query, &result)
-
-        guard status != errSecItemNotFound else {
-            print("\(key) not found")
-            return nil
-        }
-
-        guard status == errSecSuccess else {
-            print("Read for \(key) failed")
-            return nil
-        }
-
-        return result as? Data
-    }
-}