chore: kickoff release

Author: lawmicha

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Service/Helpers/ListDevicesOutputResponse+Helper.swift

@@ -13,23 +13,20 @@ import AWSPluginsCore
 extension CognitoIdentityProviderClientTypes.DeviceType {
 
     func toAWSAuthDevice() -> AuthDevice {
-        let id = deviceKey ?? ""
-        let name = ""
         var attributes: [String: String] = [:]
-        if deviceAttributes != nil {
-            for attr in deviceAttributes! {
+        if let deviceAttributes {
+            for attr in deviceAttributes {
                 if let attrName = attr.name, let attrValue = attr.value {
                     attributes[attrName] = attrValue
                 }
             }
         }
-        let device = AWSAuthDevice(id: id,
-                                   name: name,
-                                   attributes: attributes,
-                                   createdDate: deviceCreateDate,
-                                   lastAuthenticatedDate: deviceLastAuthenticatedDate,
-                                   lastModifiedDate: deviceLastModifiedDate)
-
-        return device
+        return AWSAuthDevice(
+            id: deviceKey ?? "",
+            name: attributes["device_name", default: ""],
+            attributes: attributes,
+            createdDate: deviceCreateDate,
+            lastAuthenticatedDate: deviceLastAuthenticatedDate,
+            lastModifiedDate: deviceLastModifiedDate)
     }
 }

AmplifyPlugins/Auth/Tests/AWSCognitoAuthPluginUnitTests/TaskTests/DeviceBehaviorTests/DeviceBehaviorFetchDevicesTests.swift

@@ -69,17 +69,40 @@ class DeviceBehaviorFetchDevicesTests: BasePluginTest {
     ///    - I should get a successful result with one device fetched
     ///
     func testSuccessfulListDevices() async throws {
-
+        let dateToTest = Date()
+        let deviceName = "test device"
+        let deviceId = "deviceId"
         mockIdentityProvider = MockIdentityProvider(
             mockListDevicesOutput: { _ in
-                ListDevicesOutput(devices: [CognitoIdentityProviderClientTypes.DeviceType(deviceKey: "id")], paginationToken: nil)
+                ListDevicesOutput(
+                    devices: [
+                        CognitoIdentityProviderClientTypes.DeviceType(
+                            deviceAttributes: [
+                                .init(name: "device_name", value: deviceName)
+                            ],
+                            deviceCreateDate: dateToTest,
+                            deviceKey: deviceId,
+                            deviceLastAuthenticatedDate: dateToTest,
+                            deviceLastModifiedDate: dateToTest
+                        )
+                    ], paginationToken: nil)
             }
         )
         let listDevicesResult = try await plugin.fetchDevices()
         guard listDevicesResult.count == 1 else {
             XCTFail("Result should have device count of 1")
             return
         }
+        guard let awsAuthDevice = listDevicesResult.first as? AWSAuthDevice else {
+            XCTFail("Resultant device type should be AWSAuthDevice")
+            return
+        }
+        XCTAssertEqual(awsAuthDevice.name, deviceName)
+        XCTAssertEqual(awsAuthDevice.id, deviceId)
+        XCTAssertNotEqual(awsAuthDevice.attributes?.count, 0)
+        XCTAssertEqual(awsAuthDevice.createdDate, dateToTest)
+        XCTAssertEqual(awsAuthDevice.lastAuthenticatedDate, dateToTest)
+        XCTAssertEqual(awsAuthDevice.lastModifiedDate, dateToTest)
     }
 
     /// Test a fetchDevices call with invalid response from service

AmplifyPlugins/Auth/Tests/AuthHostApp/AuthIntegrationTests/DeviceTests/AuthFetchDeviceTests.swift

@@ -63,5 +63,15 @@ class AuthFetchDeviceTests: AWSAuthBaseTest {
         let devices = try await Amplify.Auth.fetchDevices()
         XCTAssertNotNil(devices)
         XCTAssertEqual(devices.count, 1)
+        XCTAssertEqual(devices.first?.name.isEmpty, false)
+        XCTAssertEqual(devices.first?.id.isEmpty, false)
+        guard let awsDevice = devices.first as? AWSAuthDevice else {
+            XCTFail("Should be able to cast to AWSAuthDevice")
+            return
+        }
+        XCTAssertEqual(awsDevice.attributes.isEmpty, false)
+        XCTAssertNotNil(awsDevice.createdDate)
+        XCTAssertNotNil(awsDevice.lastAuthenticatedDate)
+        XCTAssertNotNil(awsDevice.lastModifiedDate)
     }
 }

AmplifyPlugins/Auth/Tests/AuthHostApp/AuthIntegrationTests/DeviceTests/AuthRememberDeviceTests.swift

@@ -60,5 +60,15 @@ class AuthRememberDeviceTests: AWSAuthBaseTest {
         let devices = try await Amplify.Auth.fetchDevices()
         XCTAssertNotNil(devices)
         XCTAssertGreaterThan(devices.count, 0)
+        XCTAssertEqual(devices.first?.name.isEmpty, false)
+        XCTAssertEqual(devices.first?.id.isEmpty, false)
+        guard let awsDevice = devices.first as? AWSAuthDevice else {
+            XCTFail("Should be able to cast to AWSAuthDevice")
+            return
+        }
+        XCTAssertEqual(awsDevice.attributes.isEmpty, false)
+        XCTAssertNotNil(awsDevice.createdDate)
+        XCTAssertNotNil(awsDevice.lastAuthenticatedDate)
+        XCTAssertNotNil(awsDevice.lastModifiedDate)
     }
 }

AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Support/Internal/Attempt.swift

@@ -13,7 +13,7 @@ import Foundation
 ///   - fail: error handler
 /// - Returns: optional result
 func attempt<T>(_ expression: @autoclosure () throws -> T,
-                fail: @autoclosure () -> ((Swift.Error) -> Void) = { _ in }) -> T? {
+                fail: @autoclosure () -> ((Swift.Error) -> Void)) -> T? {
     do {
         return try expression()
     } catch {
@@ -29,7 +29,7 @@ func attempt<T>(_ expression: @autoclosure () throws -> T,
 /// - Returns: success
 @discardableResult
 func attempt(_ expression: @autoclosure () throws -> Void,
-             fail: @autoclosure () -> ((Swift.Error) -> Void) = { _ in }) -> Bool {
+             fail: @autoclosure () -> ((Swift.Error) -> Void)) -> Bool {
     do {
         try expression()
         return true

AmplifyPlugins/Storage/Tests/AWSS3StoragePluginTests/Support/Internal/AttemptTests.swift

@@ -48,12 +48,14 @@ class AttemptTests: XCTestCase {
     }
 
     func testAttemptNoFailClosureNoThrow() throws {
-        let result = attempt(try work1(number: badNumber))
+        let result = attempt(try work1(number: badNumber), 
+                             fail: { error in })
         XCTAssertNil(result)
     }
 
     func testAttemptNoFailClosureThrow() throws {
-        let result = attempt(try work2(number: badNumber))
+        let result = attempt(try work2(number: badNumber),
+                             fail: { error in })
         XCTAssertEqual(false, result)
     }