Skip to content

Commit 943b6b6

Browse files
thisisabhashthisisabhash
committed
chore: resolve build failure after rebase with main
1 parent 264a0c9 commit 943b6b6

File tree

19 files changed

+248
-505
lines changed

19 files changed

+248
-505
lines changed

‎Amplify/Categories/Predictions/Error/PredictionsError+ClientError.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,42 +36,42 @@ extension PredictionsError.ClientError: @unchecked Sendable {
3636
recoverySuggestion: "Try choosing an image and sending it again."
3737
)
3838

39-
static let invalidRegion = Self(
39+
public static let invalidRegion = Self(
4040
description: "Invalid region",
4141
recoverySuggestion: "Ensure that you provide a valid region in your configuration"
4242
)
4343

44-
static let missingSourceLanguage = Self(
44+
public static let missingSourceLanguage = Self(
4545
description: "Source language is not provided",
4646
recoverySuggestion: "Provide a supported source language"
4747
)
4848

49-
static let missingTargetLanguage = Self(
49+
public static let missingTargetLanguage = Self(
5050
description: "Target language is not provided",
5151
recoverySuggestion: "Provide a supported target language"
5252
)
5353

54-
static let onlineIdentityServiceUnavailable = Self(
54+
public static let onlineIdentityServiceUnavailable = Self(
5555
description: "Online identify service is not available",
5656
recoverySuggestion: "Please check if the values are proprely initialized"
5757
)
5858

59-
static let offlineIdentityServiceUnavailable = Self(
59+
public static let offlineIdentityServiceUnavailable = Self(
6060
description: "Offline identify service is not available",
6161
recoverySuggestion: "Please check if the values are proprely initialized"
6262
)
6363

64-
static let onlineInterpretServiceUnavailable = Self(
64+
public static let onlineInterpretServiceUnavailable = Self(
6565
description: "Online interpret service is not available",
6666
recoverySuggestion: "Please check if the values are proprely initialized"
6767
)
6868

69-
static let offlineInterpretServiceUnavailable = Self(
69+
public static let offlineInterpretServiceUnavailable = Self(
7070
description: "Offline interpret service is not available",
7171
recoverySuggestion: "Please check if the values are proprely initialized"
7272
)
7373

74-
static let unableToInterpretText = Self(
74+
public static let unableToInterpretText = Self(
7575
description: "No result found for the text",
7676
recoverySuggestion: "Interpret text did not produce any result"
7777
)

‎AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeClient.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
//
77

88
import Amplify
9+
import Foundation
910
@preconcurrency import Combine
1011
@_spi(WebSocket) import AWSPluginsCore
1112

‎AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/AWSCognitoAuthPlugin+Configure.swift‎

Lines changed: 43 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
import Foundation
99
@_spi(InternalAmplifyConfiguration) import Amplify
10-
import AWSClientRuntime
1110
import AWSCognitoIdentity
1211
import AWSCognitoIdentityProvider
1312
import AWSPluginsCore
1413
import ClientRuntime
14+
import AWSClientRuntime
1515
@_spi(PluginHTTPClientEngine) import InternalAmplifyCredentials
1616
@_spi(InternalHttpEngineProxy) import AWSPluginsCore
17-
import SmithyRetries
1817
import SmithyRetriesAPI
18+
import SmithyRetries
1919

2020
extension AWSCognitoAuthPlugin {
2121

@@ -35,16 +35,13 @@ extension AWSCognitoAuthPlugin {
3535
} else {
3636
throw PluginError.pluginConfigurationError(
3737
AuthPluginErrorConstants.decodeConfigurationError.errorDescription,
38-
AuthPluginErrorConstants.decodeConfigurationError.recoverySuggestion
39-
)
38+
AuthPluginErrorConstants.decodeConfigurationError.recoverySuggestion)
4039
}
4140

4241
let credentialStoreResolver = CredentialStoreState.Resolver().eraseToAnyResolver()
4342
let credentialEnvironment = credentialStoreEnvironment(authConfiguration: authConfiguration)
44-
let credentialStoreMachine = StateMachine(
45-
resolver: credentialStoreResolver,
46-
environment: credentialEnvironment
47-
)
43+
let credentialStoreMachine = StateMachine(resolver: credentialStoreResolver,
44+
environment: credentialEnvironment)
4845
let credentialsClient = CredentialStoreOperationClient(
4946
credentialStoreStateMachine: credentialStoreMachine)
5047

@@ -59,40 +56,35 @@ extension AWSCognitoAuthPlugin {
5956
let hubEventHandler = AuthHubEventHandler()
6057
let analyticsHandler = try UserPoolAnalytics(
6158
authConfiguration.getUserPoolConfiguration(),
62-
credentialStoreEnvironment: credentialEnvironment.credentialStoreEnvironment
63-
)
64-
65-
configure(
66-
authConfiguration: authConfiguration,
67-
authEnvironment: authEnvironment,
68-
authStateMachine: authStateMachine,
69-
credentialStoreStateMachine: credentialStoreMachine,
70-
hubEventHandler: hubEventHandler,
71-
analyticsHandler: analyticsHandler
72-
)
59+
credentialStoreEnvironment: credentialEnvironment.credentialStoreEnvironment)
60+
61+
configure(authConfiguration: authConfiguration,
62+
authEnvironment: authEnvironment,
63+
authStateMachine: authStateMachine,
64+
credentialStoreStateMachine: credentialStoreMachine,
65+
hubEventHandler: hubEventHandler,
66+
analyticsHandler: analyticsHandler)
7367
}
7468

75-
func configure(
76-
authConfiguration: AuthConfiguration,
77-
authEnvironment: AuthEnvironment,
78-
authStateMachine: AuthStateMachine,
79-
credentialStoreStateMachine: CredentialStoreStateMachine,
80-
hubEventHandler: AuthHubEventBehavior,
81-
analyticsHandler: UserPoolAnalyticsBehavior,
82-
queue: OperationQueue = OperationQueue()
83-
) {
69+
func configure(authConfiguration: AuthConfiguration,
70+
authEnvironment: AuthEnvironment,
71+
authStateMachine: AuthStateMachine,
72+
credentialStoreStateMachine: CredentialStoreStateMachine,
73+
hubEventHandler: AuthHubEventBehavior,
74+
analyticsHandler: UserPoolAnalyticsBehavior,
75+
queue: OperationQueue = OperationQueue()) {
8476

8577
self.authConfiguration = authConfiguration
8678
self.queue = queue
8779
self.queue.maxConcurrentOperationCount = 1
8880
self.authEnvironment = authEnvironment
8981
self.authStateMachine = authStateMachine
9082
self.credentialStoreStateMachine = credentialStoreStateMachine
91-
internalConfigure()
92-
listenToStateMachineChanges()
83+
self.internalConfigure()
84+
self.listenToStateMachineChanges()
9385
self.hubEventHandler = hubEventHandler
9486
self.analyticsHandler = analyticsHandler
95-
taskQueue = TaskQueue()
87+
self.taskQueue = TaskQueue()
9688
}
9789

9890
// MARK: - Configure Helpers
@@ -105,7 +97,7 @@ extension AWSCognitoAuthPlugin {
10597
endpointResolver: userPoolConfig.endpoint?.resolver
10698
)
10799

108-
if var httpClientEngineProxy {
100+
if var httpClientEngineProxy = httpClientEngineProxy {
109101
httpClientEngineProxy.target = baseClientEngine(for: configuration)
110102
configuration.httpClientEngine = UserAgentSettingClientEngine(
111103
target: httpClientEngineProxy
@@ -222,8 +214,7 @@ extension AWSCognitoAuthPlugin {
222214
authenticationEnvironment: authenticationEnvironment,
223215
authorizationEnvironment: nil,
224216
credentialsClient: credentialsClient,
225-
logger: log
226-
)
217+
logger: log)
227218

228219
case .identityPools(let identityPoolConfigurationData):
229220
let authorizationEnvironment = authorizationEnvironment(
@@ -235,13 +226,10 @@ extension AWSCognitoAuthPlugin {
235226
authenticationEnvironment: nil,
236227
authorizationEnvironment: authorizationEnvironment,
237228
credentialsClient: credentialsClient,
238-
logger: log
239-
)
229+
logger: log)
240230

241-
case .userPoolsAndIdentityPools(
242-
let userPoolConfigurationData,
243-
let identityPoolConfigurationData
244-
):
231+
case .userPoolsAndIdentityPools(let userPoolConfigurationData,
232+
let identityPoolConfigurationData):
245233
let authenticationEnvironment = authenticationEnvironment(
246234
userPoolConfigData: userPoolConfigurationData)
247235
let authorizationEnvironment = authorizationEnvironment(
@@ -253,49 +241,39 @@ extension AWSCognitoAuthPlugin {
253241
authenticationEnvironment: authenticationEnvironment,
254242
authorizationEnvironment: authorizationEnvironment,
255243
credentialsClient: credentialsClient,
256-
logger: log
257-
)
244+
logger: log)
258245
}
259246
}
260247

261248
private func authenticationEnvironment(userPoolConfigData: UserPoolConfigurationData) -> AuthenticationEnvironment {
262249

263-
let srpAuthEnvironment = BasicSRPAuthEnvironment(
264-
userPoolConfiguration: userPoolConfigData,
265-
cognitoUserPoolFactory: makeUserPool
266-
)
250+
let srpAuthEnvironment = BasicSRPAuthEnvironment(userPoolConfiguration: userPoolConfigData,
251+
cognitoUserPoolFactory: makeUserPool)
267252
let srpSignInEnvironment = BasicSRPSignInEnvironment(srpAuthEnvironment: srpAuthEnvironment)
268253
let userPoolEnvironment = BasicUserPoolEnvironment(
269254
userPoolConfiguration: userPoolConfigData,
270255
cognitoUserPoolFactory: makeUserPool,
271256
cognitoUserPoolASFFactory: makeCognitoASF,
272-
cognitoUserPoolAnalyticsHandlerFactory: makeUserPoolAnalytics
273-
)
257+
cognitoUserPoolAnalyticsHandlerFactory: makeUserPoolAnalytics)
274258
let hostedUIEnvironment = hostedUIEnvironment(userPoolConfigData)
275-
return BasicAuthenticationEnvironment(
276-
srpSignInEnvironment: srpSignInEnvironment,
277-
userPoolEnvironment: userPoolEnvironment,
278-
hostedUIEnvironment: hostedUIEnvironment
279-
)
259+
return BasicAuthenticationEnvironment(srpSignInEnvironment: srpSignInEnvironment,
260+
userPoolEnvironment: userPoolEnvironment,
261+
hostedUIEnvironment: hostedUIEnvironment)
280262
}
281263

282264
private func hostedUIEnvironment(_ configuration: UserPoolConfigurationData) -> HostedUIEnvironment? {
283265
guard let hostedUIConfig = configuration.hostedUIConfig else {
284266
return nil
285267
}
286-
return BasicHostedUIEnvironment(
287-
configuration: hostedUIConfig,
288-
hostedUISessionFactory: makeHostedUISession,
289-
urlSessionFactory: makeURLSession,
290-
randomStringFactory: makeRandomString
291-
)
268+
return BasicHostedUIEnvironment(configuration: hostedUIConfig,
269+
hostedUISessionFactory: makeHostedUISession,
270+
urlSessionFactory: makeURLSession,
271+
randomStringFactory: makeRandomString)
292272
}
293273

294274
private func authorizationEnvironment(identityPoolConfigData: IdentityPoolConfigurationData) -> AuthorizationEnvironment {
295-
BasicAuthorizationEnvironment(
296-
identityPoolConfiguration: identityPoolConfigData,
297-
cognitoIdentityFactory: makeIdentityClient
298-
)
275+
BasicAuthorizationEnvironment(identityPoolConfiguration: identityPoolConfigData,
276+
cognitoIdentityFactory: makeIdentityClient)
299277
}
300278

301279
private func credentialStoreEnvironment(authConfiguration: AuthConfiguration) -> CredentialEnvironment {
@@ -313,9 +291,8 @@ extension AWSCognitoAuthPlugin {
313291
let operation = AuthConfigureOperation(
314292
request: request,
315293
authStateMachine: authStateMachine,
316-
credentialStoreStateMachine: credentialStoreStateMachine
317-
)
318-
queue.addOperation(operation)
294+
credentialStoreStateMachine: credentialStoreStateMachine)
295+
self.queue.addOperation(operation)
319296
}
320297
}
321298

‎AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/MigrateAuth/InitiateMigrateAuth.swift‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,6 @@ struct InitiateMigrateAuth: Action {
9999
signInMethod: .apiBased(.userPassword))
100100
}
101101

102-
private func sendRequest(request: RespondToAuthChallengeInput,
103-
environment: UserPoolEnvironment) async throws -> StateMachineEvent {
104-
105-
let cognitoClient = try environment.cognitoUserPoolFactory()
106-
logVerbose("\(#fileID) Starting execution", environment: environment)
107-
108-
let response = try await cognitoClient.respondToAuthChallenge(input: request)
109-
return UserPoolSignInHelper.parseResponse(response,
110-
for: username,
111-
signInMethod: .apiBased(.userPassword))
112-
}
113-
114102
private func sendRequest(
115103
request: InitiateAuthInput,
116104
environment: UserPoolEnvironment

‎AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/SRPAuth/InitiateAuthSRP.swift‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -124,18 +124,7 @@ struct InitiateAuthSRP: Action {
124124
logVerbose("\(#fileID) InitiateAuth response success", environment: environment)
125125
return SignInEvent(eventType: .respondPasswordVerifier(srpStateData, response, clientMetadata))
126126
}
127-
128-
private func sendRequest(request: RespondToAuthChallengeInput,
129-
environment: UserPoolEnvironment,
130-
srpStateData: SRPStateData) async throws -> SignInEvent {
131-
132-
let cognitoClient = try environment.cognitoUserPoolFactory()
133-
logVerbose("\(#fileID) Starting execution", environment: environment)
134-
let response = try await cognitoClient.respondToAuthChallenge(input: request)
135-
logVerbose("\(#fileID) InitiateAuth response success", environment: environment)
136-
return SignInEvent(eventType: .respondPasswordVerifier(srpStateData, response, clientMetadata))
137-
}
138-
127+
139128
private func sendRequest(
140129
request: InitiateAuthInput,
141130
environment: UserPoolEnvironment,

‎AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/ClientBehavior/AWSCognitoAuthPlugin+ClientBehavior.swift‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -191,17 +191,6 @@ extension AWSCognitoAuthPlugin: AuthCategoryBehavior {
191191
} as! AuthSignInResult
192192
}
193193

194-
public func autoSignIn() async throws -> AuthSignInResult {
195-
let options = AuthAutoSignInRequest.Options()
196-
let request = AuthAutoSignInRequest(options: options)
197-
let task = AWSAuthAutoSignInTask(request,
198-
authStateMachine: self.authStateMachine,
199-
authEnvironment: authEnvironment)
200-
return try await taskQueue.sync {
201-
return try await task.value
202-
} as! AuthSignInResult
203-
}
204-
205194
public func autoSignIn() async throws -> AuthSignInResult {
206195
let options = AuthAutoSignInRequest.Options()
207196
let request = AuthAutoSignInRequest(options: options)

‎AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Events/SignInEvent.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
//
77

88
import AWSCognitoIdentityProvider
9+
import Foundation
910
#if os(iOS) || os(macOS) || os(visionOS)
1011
import typealias Amplify.AuthUIPresentationAnchor
1112
#endif

‎AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/AuthState+Debug.swift‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,19 @@ extension AuthState: CustomDebugStringConvertible {
1111

1212
var debugDictionary: [String: Any] {
1313

14-
let additionalMetadataDictionary: [String: Any] = switch self {
14+
let additionalMetadataDictionary: [String: Any]
15+
16+
switch self {
1517
case .notConfigured:
16-
[:]
18+
additionalMetadataDictionary = [:]
1719
case .configuringAuth:
18-
[:]
20+
additionalMetadataDictionary = [:]
1921
case .configuringAuthentication(let authenticationState):
20-
authenticationState.debugDictionary
22+
additionalMetadataDictionary = authenticationState.debugDictionary
2123
case .validatingCredentialsAndConfiguration:
22-
[:]
24+
additionalMetadataDictionary = [:]
2325
case .configuringAuthorization(let authenticationState, let authorizationState):
24-
authenticationState.debugDictionary.merging(
26+
additionalMetadataDictionary = authenticationState.debugDictionary.merging(
2527
authorizationState.debugDictionary, uniquingKeysWith: {$1}
2628
)
2729
case .configured(let authenticationState, let authorizationState, let signUpState):

0 commit comments

Comments
 (0)