diff --git a/Package.resolved b/Package.resolved index 22cb682..93b4449 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/aws-amplify/amplify-swift", "state" : { - "revision" : "fa6ca64f42c3e4e72cf6b62c30bc45b2be7b05bc", - "version" : "2.35.1" + "revision" : "dbc4a0412f4b5cd96f3e756e78bbd1e8e0a35a2f", + "version" : "2.35.4" } }, { diff --git a/Sources/Authenticator/Views/Primitives/Button.swift b/Sources/Authenticator/Views/Primitives/Button.swift index 785a361..24340d4 100644 --- a/Sources/Authenticator/Views/Primitives/Button.swift +++ b/Sources/Authenticator/Views/Primitives/Button.swift @@ -200,13 +200,14 @@ private struct AuthenticatorButtonStyle: ButtonStyle { if useOverlay { content(for: configuration) .overlay( - RoundedRectangle(cornerRadius: .infinity) + RoundedRectangle(cornerRadius: cornerRadius) .stroke(borderColor, lineWidth: borderWidth) ) } else { content(for: configuration) + .cornerRadius(cornerRadius) .border(borderColor, width: borderWidth) } } diff --git a/Tests/AuthenticatorHostApp/AuthenticatorHostApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Tests/AuthenticatorHostApp/AuthenticatorHostApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 1c4d179..9e5fb7c 100644 --- a/Tests/AuthenticatorHostApp/AuthenticatorHostApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Tests/AuthenticatorHostApp/AuthenticatorHostApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,12 +1,13 @@ { + "originHash" : "aa50950c4756f6cc1e41a45105a6b4bbed3e817c73e36d24f00ec955e5792ec9", "pins" : [ { "identity" : "amplify-swift", "kind" : "remoteSourceControl", "location" : "https://github.com/aws-amplify/amplify-swift", "state" : { - "revision" : "94a3f341254a7e9c5b78ef2f1a9fe0ec289f0305", - "version" : "2.17.2" + "revision" : "fa6ca64f42c3e4e72cf6b62c30bc45b2be7b05bc", + "version" : "2.35.1" } }, { @@ -14,17 +15,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/aws-amplify/amplify-swift-utils-notifications.git", "state" : { - "revision" : "f970384ad1035732f99259255cd2f97564807e41", - "version" : "1.1.0" - } - }, - { - "identity" : "aws-appsync-realtime-client-ios", - "kind" : "remoteSourceControl", - "location" : "https://github.com/aws-amplify/aws-appsync-realtime-client-ios.git", - "state" : { - "revision" : "c7ec93dcbbcd8abc90c74203937f207a7fcaa611", - "version" : "3.1.1" + "revision" : "959eec669ba97c7d923b963c3e66ca8a0b2737f6", + "version" : "1.1.1" } }, { @@ -32,8 +24,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/awslabs/aws-crt-swift", "state" : { - "revision" : "6feec6c3787877807aa9a00fad09591b96752376", - "version" : "0.6.1" + "revision" : "0d0a0cf2e2cb780ceeceac190b4ede94f4f96902", + "version" : "0.26.0" } }, { @@ -41,17 +33,17 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/awslabs/aws-sdk-swift.git", "state" : { - "revision" : "24bae88a2391fe75da8a940a544d1ef6441f5321", - "version" : "0.13.0" + "revision" : "47922c05dd66be717c7bce424651a534456717b7", + "version" : "0.36.2" } }, { "identity" : "smithy-swift", "kind" : "remoteSourceControl", - "location" : "https://github.com/awslabs/smithy-swift", + "location" : "https://github.com/smithy-lang/smithy-swift", "state" : { - "revision" : "7b28da158d92cd06a3549140d43b8fbcf64a94a6", - "version" : "0.15.0" + "revision" : "8a5b0105c1b8a1d26a9435fb0af3959a7f5de578", + "version" : "0.41.1" } }, { @@ -59,26 +51,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/stephencelis/SQLite.swift.git", "state" : { - "revision" : "5f5ad81ac0d0a0f3e56e39e646e8423c617df523", - "version" : "0.13.2" - } - }, - { - "identity" : "starscream", - "kind" : "remoteSourceControl", - "location" : "https://github.com/daltoniam/Starscream", - "state" : { - "revision" : "df8d82047f6654d8e4b655d1b1525c64e1059d21", - "version" : "4.0.4" - } - }, - { - "identity" : "swift-collections", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-collections", - "state" : { - "revision" : "937e904258d22af6e447a0b72c0bc67583ef64a2", - "version" : "1.0.4" + "revision" : "a95fc6df17d108bd99210db5e8a9bac90fe984b8", + "version" : "0.15.3" } }, { @@ -86,19 +60,10 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-log.git", "state" : { - "revision" : "532d8b529501fb73a2455b179e0bbb6d49b652ed", - "version" : "1.5.3" - } - }, - { - "identity" : "xmlcoder", - "kind" : "remoteSourceControl", - "location" : "https://github.com/MaxDesiatov/XMLCoder.git", - "state" : { - "revision" : "b1e944cbd0ef33787b13f639a5418d55b3bed501", - "version" : "0.17.1" + "revision" : "e97a6fcb1ab07462881ac165fdbb37f067e205d5", + "version" : "1.5.4" } } ], - "version" : 2 + "version" : 3 } diff --git a/Tests/AuthenticatorHostApp/AuthenticatorHostApp/Mocks/MockAuthenticationService.swift b/Tests/AuthenticatorHostApp/AuthenticatorHostApp/Mocks/MockAuthenticationService.swift index 02086e9..4dc25d9 100644 --- a/Tests/AuthenticatorHostApp/AuthenticatorHostApp/Mocks/MockAuthenticationService.swift +++ b/Tests/AuthenticatorHostApp/AuthenticatorHostApp/Mocks/MockAuthenticationService.swift @@ -123,6 +123,15 @@ class MockAuthenticationService: AuthenticationService { throw AuthenticatorError.error(message: "Unable to resend confirmation code for attribute") } + func sendVerificationCode(forUserAttributeKey userAttributeKey: AuthUserAttributeKey, options: AuthSendUserAttributeVerificationCodeRequest.Options?) async throws -> AuthCodeDeliveryDetails { + resendConfirmationCodeForAttributeCount += 1 + if let mockedResendConfirmationCodeForAttributeResult = mockedResendConfirmationCodeForAttributeResult { + return mockedResendConfirmationCodeForAttributeResult + } + + throw AuthenticatorError.error(message: "Unable to send verification code for attribute") + } + var confirmUserAttributeCount = 0 var mockedConfirmUserAttributeError: AuthenticatorError? func confirm(userAttribute: AuthUserAttributeKey, confirmationCode: String, options: AuthConfirmUserAttributeRequest.Options?) async throws {