Skip to content

Commit acdaa9e

Browse files
tjleingThomas Leing
tjleing
and
Thomas Leing
authored
fix(liveness): Liveness web socket expiration retry (#2615)
Co-authored-by: Thomas Leing <[email protected]>
1 parent cdc905b commit acdaa9e

File tree

22 files changed

+228
-46
lines changed

22 files changed

+228
-46
lines changed

‎aws-analytics-pinpoint/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515

1616
plugins {
17-
id("org.jetbrains.kotlin.plugin.serialization") version "1.6.10"
17+
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10"
1818
id("com.android.library")
1919
id("kotlin-android")
2020
}

‎aws-auth-cognito/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515

1616
plugins {
17-
id("org.jetbrains.kotlin.plugin.serialization") version "1.6.10"
17+
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10"
1818
id("com.android.library")
1919
id("kotlin-android")
2020
}

‎aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AWSCognitoAuthService.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ package com.amplifyframework.auth.cognito
1818
import aws.sdk.kotlin.runtime.http.operation.customUserAgentMetadata
1919
import aws.sdk.kotlin.services.cognitoidentity.CognitoIdentityClient
2020
import aws.sdk.kotlin.services.cognitoidentityprovider.CognitoIdentityProviderClient
21+
import aws.sdk.kotlin.services.cognitoidentityprovider.endpoints.CognitoIdentityProviderEndpointProvider
2122
import aws.smithy.kotlin.runtime.client.RequestInterceptorContext
2223
import aws.smithy.kotlin.runtime.client.endpoints.Endpoint
23-
import aws.smithy.kotlin.runtime.client.endpoints.EndpointProvider
2424
import aws.smithy.kotlin.runtime.http.interceptors.HttpInterceptor
2525
import com.amplifyframework.statemachine.codegen.data.AuthConfiguration
2626

@@ -36,7 +36,7 @@ interface AWSCognitoAuthService {
3636
CognitoIdentityProviderClient {
3737
this.region = it.region
3838
this.endpointProvider = it.endpoint?.let { endpoint ->
39-
EndpointProvider { Endpoint(endpoint) }
39+
CognitoIdentityProviderEndpointProvider { Endpoint(endpoint) }
4040
}
4141
this.interceptors += object : HttpInterceptor {
4242
override suspend fun modifyBeforeSerialization(context: RequestInterceptorContext<Any>): Any {

‎aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/RealAWSCognitoAuthPluginTest.kt‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,7 @@ class RealAWSCognitoAuthPluginTest {
512512
authService.cognitoIdentityProviderClient?.getUser(any())
513513
} returns GetUserResponse.invoke {
514514
this.userAttributes = userAttributes
515+
username = ""
515516
}
516517

517518
every {
@@ -1806,6 +1807,8 @@ class RealAWSCognitoAuthPluginTest {
18061807
GetUserResponse.invoke {
18071808
userMfaSettingList = listOf("SMS_MFA", "SOFTWARE_TOKEN_MFA")
18081809
preferredMfaSetting = "SOFTWARE_TOKEN_MFA"
1810+
userAttributes = listOf()
1811+
username = ""
18091812
}
18101813
}
18111814
plugin.fetchMFAPreference(onSuccess, onError)
@@ -1842,6 +1845,8 @@ class RealAWSCognitoAuthPluginTest {
18421845
GetUserResponse.invoke {
18431846
userMfaSettingList = null
18441847
preferredMfaSetting = null
1848+
userAttributes = listOf()
1849+
username = ""
18451850
}
18461851
}
18471852
plugin.updateMFAPreference(MFAPreference.ENABLED, MFAPreference.PREFERRED, onSuccess, onError)
@@ -1887,6 +1892,8 @@ class RealAWSCognitoAuthPluginTest {
18871892
GetUserResponse.invoke {
18881893
userMfaSettingList = listOf("SMS_MFA", "SOFTWARE_TOKEN_MFA")
18891894
preferredMfaSetting = "SOFTWARE_TOKEN_MFA"
1895+
userAttributes = listOf()
1896+
username = ""
18901897
}
18911898
}
18921899

@@ -1937,6 +1944,8 @@ class RealAWSCognitoAuthPluginTest {
19371944
GetUserResponse.invoke {
19381945
userMfaSettingList = listOf("SMS_MFA", "SOFTWARE_TOKEN_MFA")
19391946
preferredMfaSetting = "SMS_MFA"
1947+
userAttributes = listOf()
1948+
username = ""
19401949
}
19411950
}
19421951

@@ -2040,6 +2049,8 @@ class RealAWSCognitoAuthPluginTest {
20402049
GetUserResponse.invoke {
20412050
userMfaSettingList = null
20422051
preferredMfaSetting = null
2052+
userAttributes = listOf()
2053+
username = ""
20432054
}
20442055
}
20452056

@@ -2090,6 +2101,8 @@ class RealAWSCognitoAuthPluginTest {
20902101
GetUserResponse.invoke {
20912102
userMfaSettingList = null
20922103
preferredMfaSetting = null
2104+
userAttributes = listOf()
2105+
username = ""
20932106
}
20942107
}
20952108

@@ -2140,6 +2153,8 @@ class RealAWSCognitoAuthPluginTest {
21402153
GetUserResponse.invoke {
21412154
userMfaSettingList = null
21422155
preferredMfaSetting = null
2156+
userAttributes = listOf()
2157+
username = ""
21432158
}
21442159
}
21452160

@@ -2190,6 +2205,8 @@ class RealAWSCognitoAuthPluginTest {
21902205
GetUserResponse.invoke {
21912206
userMfaSettingList = null
21922207
preferredMfaSetting = null
2208+
userAttributes = listOf()
2209+
username = ""
21932210
}
21942211
}
21952212

@@ -2240,6 +2257,8 @@ class RealAWSCognitoAuthPluginTest {
22402257
GetUserResponse.invoke {
22412258
userMfaSettingList = null
22422259
preferredMfaSetting = null
2260+
userAttributes = listOf()
2261+
username = ""
22432262
}
22442263
}
22452264

@@ -2290,6 +2309,8 @@ class RealAWSCognitoAuthPluginTest {
22902309
GetUserResponse.invoke {
22912310
userMfaSettingList = null
22922311
preferredMfaSetting = null
2312+
userAttributes = listOf()
2313+
username = ""
22932314
}
22942315
}
22952316

@@ -2340,6 +2361,8 @@ class RealAWSCognitoAuthPluginTest {
23402361
GetUserResponse.invoke {
23412362
userMfaSettingList = null
23422363
preferredMfaSetting = null
2364+
userAttributes = listOf()
2365+
username = ""
23432366
}
23442367
}
23452368

@@ -2390,6 +2413,8 @@ class RealAWSCognitoAuthPluginTest {
23902413
GetUserResponse.invoke {
23912414
userMfaSettingList = listOf("SOFTWARE_TOKEN_MFA")
23922415
preferredMfaSetting = "SOFTWARE_TOKEN_MFA"
2416+
userAttributes = listOf()
2417+
username = ""
23932418
}
23942419
}
23952420

@@ -2440,6 +2465,8 @@ class RealAWSCognitoAuthPluginTest {
24402465
GetUserResponse.invoke {
24412466
userMfaSettingList = listOf("SMS_MFA")
24422467
preferredMfaSetting = "SMS_MFA"
2468+
userAttributes = listOf()
2469+
username = ""
24432470
}
24442471
}
24452472

@@ -2490,6 +2517,8 @@ class RealAWSCognitoAuthPluginTest {
24902517
GetUserResponse.invoke {
24912518
userMfaSettingList = listOf("SMS_MFA")
24922519
preferredMfaSetting = "SMS_MFA"
2520+
userAttributes = listOf()
2521+
username = ""
24932522
}
24942523
}
24952524

@@ -2540,6 +2569,8 @@ class RealAWSCognitoAuthPluginTest {
25402569
GetUserResponse.invoke {
25412570
userMfaSettingList = listOf("SOFTWARE_TOKEN_MFA")
25422571
preferredMfaSetting = "SOFTWARE_TOKEN_MFA"
2572+
userAttributes = listOf()
2573+
username = ""
25432574
}
25442575
}
25452576

@@ -2590,6 +2621,8 @@ class RealAWSCognitoAuthPluginTest {
25902621
GetUserResponse.invoke {
25912622
userMfaSettingList = listOf("SMS_MFA")
25922623
preferredMfaSetting = "SMS_MFA"
2624+
userAttributes = listOf()
2625+
username = ""
25932626
}
25942627
}
25952628

‎aws-auth-cognito/src/test/java/featureTest/utilities/CognitoMockFactory.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ class CognitoMockFactory(
7777
this.userConfirmed = if (responseObject.containsKey("userConfirmed")) {
7878
(responseObject["userConfirmed"] as? JsonPrimitive)?.boolean ?: false
7979
} else false
80+
this.userSub = ""
8081
}
8182
}
8283
}
@@ -139,6 +140,7 @@ class CognitoMockFactory(
139140
value = "000-000-0000"
140141
}
141142
)
143+
username = ""
142144
}
143145
}
144146
}

‎aws-auth-cognito/src/test/resources/feature-test/testsuites/signUp/Sign_up_finishes_if_user_is_confirmed_in_the_first_step.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@
5757
"signUpStep": "DONE",
5858
"additionalInfo": {
5959
}
60-
}
60+
},
61+
"userId": ""
6162
}
6263
}
6364
]

‎aws-auth-cognito/src/test/resources/feature-test/testsuites/signUp/Test_that_signup_invokes_proper_cognito_request_and_returns_success.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
"deliveryMedium": "EMAIL",
6262
"attributeName": "attributeName"
6363
}
64-
}
64+
},
65+
"userId": ""
6566
}
6667
}
6768
]

‎aws-auth-plugins-core/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515

1616
plugins {
17-
id("org.jetbrains.kotlin.plugin.serialization") version "1.6.10"
17+
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10"
1818
id("com.android.library")
1919
id("kotlin-android")
2020
}

‎aws-logging-cloudwatch/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515

1616
plugins {
17-
id("org.jetbrains.kotlin.plugin.serialization") version "1.6.10"
17+
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10"
1818
id("com.android.library")
1919
id("kotlin-android")
2020
}

‎aws-pinpoint-core/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515

1616
plugins {
17-
id("org.jetbrains.kotlin.plugin.serialization") version "1.6.10"
17+
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10"
1818
id("com.android.library")
1919
id("kotlin-android")
2020
}

0 commit comments

Comments
 (0)