@@ -6,6 +6,8 @@ import 'package:amplify_auth_cognito_dart/src/asf/asf_worker.dart';
6
6
import 'package:amplify_auth_cognito_dart/src/credentials/cognito_keys.dart' ;
7
7
import 'package:amplify_auth_cognito_dart/src/sdk/cognito_identity_provider.dart' ;
8
8
import 'package:amplify_core/amplify_core.dart' ;
9
+ // ignore: implementation_imports
10
+ import 'package:amplify_core/src/config/amplify_outputs/auth/auth_outputs.dart' ;
9
11
import 'package:amplify_secure_storage_dart/amplify_secure_storage_dart.dart' ;
10
12
import 'package:async/async.dart' ;
11
13
@@ -22,14 +24,14 @@ final class ASFContextDataProvider with AWSDebuggable, AWSLoggerMixin {
22
24
/// Retrieves context data as required for advanced security features (ASF).
23
25
ASFDeviceInfoCollector get _platform => _dependencyManager.getOrCreate ();
24
26
25
- /// The Cognito user pool configuration.
26
- CognitoUserPoolConfig ? get _userPoolConfig => _dependencyManager.get ();
27
+ /// The Auth configuration.
28
+ AuthOutputs ? get _authOutputs => _dependencyManager.get ();
27
29
28
30
SecureStorageInterface get _secureStorage => _dependencyManager.expect ();
29
31
30
32
/// The unique device ID (`DeviceID` ).
31
33
Future <String > get _deviceId async {
32
- final userPoolKeys = CognitoUserPoolKeys (_userPoolConfig ! .appClientId );
34
+ final userPoolKeys = CognitoUserPoolKeys (_authOutputs ! .userPoolClientId ! );
33
35
var deviceId = await _secureStorage.read (
34
36
key: userPoolKeys[CognitoUserPoolKey .asfDeviceId],
35
37
);
@@ -73,15 +75,16 @@ final class ASFContextDataProvider with AWSDebuggable, AWSLoggerMixin {
73
75
/// Builds the [UserContextDataType] object which can be attached to SDK
74
76
/// calls.
75
77
Future <UserContextDataType ?> buildRequestData (String username) async {
76
- final userPoolConfig = _userPoolConfig;
77
- if (userPoolConfig == null ) {
78
+ if (_authOutputs == null ||
79
+ _authOutputs? .userPoolClientId == null ||
80
+ _authOutputs? .userPoolId == null ) {
78
81
return null ;
79
82
}
80
83
final nativeContextData = await _platform.getNativeContextData ();
81
84
logger.verbose ('Got native context data: $nativeContextData ' );
82
85
final deviceId = await _deviceId;
83
- final userPoolId = userPoolConfig.poolId ;
84
- final clientId = userPoolConfig.appClientId ;
86
+ final userPoolId = _authOutputs ! .userPoolId ! ;
87
+ final clientId = _authOutputs ! .userPoolClientId ! ;
85
88
86
89
final request = ASFWorkerRequest (
87
90
userPoolId: userPoolId,
0 commit comments