Skip to content

Commit 0d88aa2

Browse files
NikaHsnEquartey
NikaHsn
authored and
Equartey
committed
chore(auth): legacy credential provider to use AuthOutputs instead of AmplifyConfig types (#5303)
1 parent 10e5de5 commit 0d88aa2

File tree

8 files changed

+146
-175
lines changed

8 files changed

+146
-175
lines changed

‎packages/auth/amplify_auth_cognito/lib/src/credentials/legacy_credential_provider_android.dart

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ import 'package:amplify_auth_cognito/src/native_auth_plugin.g.dart'
1010
import 'package:amplify_auth_cognito_dart/src/credentials/legacy_credential_provider.dart';
1111
import 'package:amplify_auth_cognito_dart/src/state/cognito_state_machine.dart';
1212
import 'package:amplify_auth_cognito_dart/src/state/state.dart';
13-
import 'package:amplify_core/src/config/auth/cognito/credentials_provider.dart';
14-
import 'package:amplify_core/src/config/auth/cognito/oauth.dart';
15-
import 'package:amplify_core/src/config/auth/cognito/user_pool.dart';
13+
import 'package:amplify_core/src/config/amplify_outputs/auth/auth_outputs.dart';
1614

1715
/// {@template amplify_auth_cognito.legacy_android_credential_provider}
1816
/// The implementation of [LegacyCredentialProvider] for migrating
@@ -25,54 +23,51 @@ class LegacyCredentialProviderAndroid implements LegacyCredentialProvider {
2523
final CognitoAuthStateMachine _stateMachine;
2624

2725
@override
28-
Future<CredentialStoreData?> fetchLegacyCredentials({
29-
CognitoUserPoolConfig? userPoolConfig,
30-
CognitoIdentityCredentialsProvider? identityPoolConfig,
31-
CognitoOAuthConfig? hostedUiConfig,
32-
}) async {
26+
Future<CredentialStoreData?> fetchLegacyCredentials(
27+
AuthOutputs authOutputs,
28+
) async {
3329
final bridge = _stateMachine.expect<auth_cognito.NativeAuthBridge>();
3430
final legacyCredentials = await bridge.getLegacyCredentials(
35-
identityPoolConfig?.poolId,
36-
userPoolConfig?.appClientId,
31+
authOutputs.identityPoolId,
32+
authOutputs.userPoolClientId,
3733
);
3834
return legacyCredentials.toCredentialStoreData();
3935
}
4036

4137
@override
42-
Future<void> deleteLegacyCredentials({
43-
CognitoUserPoolConfig? userPoolConfig,
44-
CognitoIdentityCredentialsProvider? identityPoolConfig,
45-
CognitoOAuthConfig? hostedUiConfig,
46-
}) {
38+
Future<void> deleteLegacyCredentials(
39+
AuthOutputs authOutputs,
40+
) {
4741
final bridge = _stateMachine.expect<auth_cognito.NativeAuthBridge>();
4842
return bridge.clearLegacyCredentials();
4943
}
5044

5145
@override
52-
Future<LegacyDeviceDetails?> fetchLegacyDeviceSecrets({
53-
required String username,
54-
CognitoUserPoolConfig? userPoolConfig,
55-
}) async {
56-
if (userPoolConfig == null) return null;
46+
Future<LegacyDeviceDetails?> fetchLegacyDeviceSecrets(
47+
String username,
48+
AuthOutputs authOutputs,
49+
) async {
50+
final userPoolId = authOutputs.userPoolId;
51+
if (userPoolId == null) return null;
5752
final bridge = _stateMachine.expect<auth_cognito.NativeAuthBridge>();
5853
final device = await bridge.fetchLegacyDeviceSecrets(
5954
username,
60-
userPoolConfig.poolId,
55+
userPoolId,
6156
);
6257
return device?.toLegacyDeviceDetails();
6358
}
6459

6560
@override
66-
Future<void> deleteLegacyDeviceSecrets({
67-
required String username,
68-
CognitoUserPoolConfig? userPoolConfig,
69-
}) async {
70-
if (userPoolConfig != null) {
71-
final bridge = _stateMachine.expect<auth_cognito.NativeAuthBridge>();
72-
return bridge.deleteLegacyDeviceSecrets(
73-
username,
74-
userPoolConfig.poolId,
75-
);
76-
}
61+
Future<void> deleteLegacyDeviceSecrets(
62+
String username,
63+
AuthOutputs authOutputs,
64+
) async {
65+
final userPoolId = authOutputs.userPoolId;
66+
if (userPoolId == null) return;
67+
final bridge = _stateMachine.expect<auth_cognito.NativeAuthBridge>();
68+
return bridge.deleteLegacyDeviceSecrets(
69+
username,
70+
userPoolId,
71+
);
7772
}
7873
}

‎packages/auth/amplify_auth_cognito/lib/src/credentials/legacy_credential_provider_impl.dart

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import 'package:amplify_auth_cognito_dart/src/state/cognito_state_machine.dart';
1212
// ignore: implementation_imports, invalid_use_of_internal_member
1313
import 'package:amplify_auth_cognito_dart/src/state/state.dart';
1414
import 'package:amplify_core/amplify_core.dart';
15+
// ignore: implementation_imports
16+
import 'package:amplify_core/src/config/amplify_outputs/auth/auth_outputs.dart';
1517

1618
/// {@template amplify_auth_cognito.legacy_credential_provider_impl}
1719
/// The implementation of [LegacyCredentialProvider] for migrating
@@ -35,54 +37,46 @@ class LegacyCredentialProviderImpl implements LegacyCredentialProvider {
3537
}();
3638

3739
@override
38-
Future<CredentialStoreData?> fetchLegacyCredentials({
39-
CognitoUserPoolConfig? userPoolConfig,
40-
CognitoIdentityCredentialsProvider? identityPoolConfig,
41-
CognitoOAuthConfig? hostedUiConfig,
42-
}) async {
40+
Future<CredentialStoreData?> fetchLegacyCredentials(
41+
AuthOutputs authOutputs,
42+
) async {
4343
if (_instance == null) return null;
4444
return _instance.fetchLegacyCredentials(
45-
userPoolConfig: userPoolConfig,
46-
identityPoolConfig: identityPoolConfig,
47-
hostedUiConfig: hostedUiConfig,
45+
authOutputs,
4846
);
4947
}
5048

5149
@override
52-
Future<void> deleteLegacyCredentials({
53-
CognitoUserPoolConfig? userPoolConfig,
54-
CognitoIdentityCredentialsProvider? identityPoolConfig,
55-
CognitoOAuthConfig? hostedUiConfig,
56-
}) async {
50+
Future<void> deleteLegacyCredentials(
51+
AuthOutputs authOutputs,
52+
) async {
5753
if (_instance == null) return;
5854
return _instance.deleteLegacyCredentials(
59-
userPoolConfig: userPoolConfig,
60-
identityPoolConfig: identityPoolConfig,
61-
hostedUiConfig: hostedUiConfig,
55+
authOutputs,
6256
);
6357
}
6458

6559
@override
66-
Future<LegacyDeviceDetails?> fetchLegacyDeviceSecrets({
67-
required String username,
68-
CognitoUserPoolConfig? userPoolConfig,
69-
}) async {
60+
Future<LegacyDeviceDetails?> fetchLegacyDeviceSecrets(
61+
String username,
62+
AuthOutputs authOutputs,
63+
) async {
7064
if (_instance == null) return null;
7165
return _instance.fetchLegacyDeviceSecrets(
72-
username: username,
73-
userPoolConfig: userPoolConfig,
66+
username,
67+
authOutputs,
7468
);
7569
}
7670

7771
@override
78-
Future<void> deleteLegacyDeviceSecrets({
79-
required String username,
80-
CognitoUserPoolConfig? userPoolConfig,
81-
}) async {
72+
Future<void> deleteLegacyDeviceSecrets(
73+
String username,
74+
AuthOutputs authOutputs,
75+
) async {
8276
if (_instance == null) return;
8377
return _instance.deleteLegacyDeviceSecrets(
84-
username: username,
85-
userPoolConfig: userPoolConfig,
78+
username,
79+
authOutputs,
8680
);
8781
}
8882
}

‎packages/auth/amplify_auth_cognito/lib/src/credentials/legacy_credential_provider_ios.dart

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import 'package:amplify_auth_cognito_dart/src/credentials/legacy_credential_prov
1414
import 'package:amplify_auth_cognito_dart/src/state/cognito_state_machine.dart';
1515
// ignore: implementation_imports, invalid_use_of_internal_member
1616
import 'package:amplify_auth_cognito_dart/src/state/state.dart';
17+
// ignore: implementation_imports
18+
import 'package:amplify_core/src/config/amplify_outputs/auth/auth_outputs.dart';
1719
import 'package:amplify_flutter/amplify_flutter.dart';
1820
import 'package:async/async.dart';
1921

@@ -28,22 +30,21 @@ class LegacyCredentialProviderIOS implements LegacyCredentialProvider {
2830
final CognitoAuthStateMachine _stateMachine;
2931

3032
@override
31-
Future<CredentialStoreData?> fetchLegacyCredentials({
32-
CognitoUserPoolConfig? userPoolConfig,
33-
CognitoIdentityCredentialsProvider? identityPoolConfig,
34-
CognitoOAuthConfig? hostedUiConfig,
35-
}) async {
33+
Future<CredentialStoreData?> fetchLegacyCredentials(
34+
AuthOutputs authOutputs,
35+
) async {
3636
CognitoUserPoolTokens? userPoolTokens;
37-
if (userPoolConfig != null) {
37+
final userPoolClientId = authOutputs.userPoolClientId;
38+
if (userPoolClientId != null) {
3839
final userPoolStorage = await _getUserPoolStorage();
39-
final cognitoUserKeys = LegacyCognitoUserKeys(userPoolConfig);
40+
final cognitoUserKeys = LegacyCognitoUserKeys(userPoolClientId);
4041
final currentUserId = await userPoolStorage.read(
4142
key: cognitoUserKeys[LegacyCognitoKey.currentUser],
4243
);
4344
if (currentUserId != null) {
4445
final userPoolKeys = LegacyCognitoUserPoolKeys(
4546
currentUserId,
46-
userPoolConfig,
47+
userPoolClientId,
4748
);
4849
final accessToken = await userPoolStorage.read(
4950
key: userPoolKeys[LegacyCognitoUserPoolKey.accessToken],
@@ -56,7 +57,7 @@ class LegacyCredentialProviderIOS implements LegacyCredentialProvider {
5657
);
5758
if (accessToken != null && refreshToken != null && idToken != null) {
5859
// TODO(Jordan-Nelson): fetch sign in method from keychain on iOS
59-
final signInMethod = hostedUiConfig != null
60+
final signInMethod = authOutputs.oauth != null
6061
? CognitoSignInMethod.hostedUi
6162
: CognitoSignInMethod.default$;
6263
userPoolTokens = CognitoUserPoolTokens(
@@ -71,7 +72,7 @@ class LegacyCredentialProviderIOS implements LegacyCredentialProvider {
7172

7273
String? identityId;
7374
AWSCredentials? awsCredentials;
74-
final identityPoolId = identityPoolConfig?.poolId;
75+
final identityPoolId = authOutputs.identityPoolId;
7576
if (identityPoolId != null) {
7677
final identityPoolStorage = await _getIdentityPoolStorage(
7778
identityPoolId,
@@ -122,21 +123,20 @@ class LegacyCredentialProviderIOS implements LegacyCredentialProvider {
122123
}
123124

124125
@override
125-
Future<void> deleteLegacyCredentials({
126-
CognitoUserPoolConfig? userPoolConfig,
127-
CognitoIdentityCredentialsProvider? identityPoolConfig,
128-
CognitoOAuthConfig? hostedUiConfig,
129-
}) async {
130-
if (userPoolConfig != null) {
126+
Future<void> deleteLegacyCredentials(
127+
AuthOutputs authOutputs,
128+
) async {
129+
final userPoolClientId = authOutputs.userPoolClientId;
130+
if (userPoolClientId != null) {
131131
final userPoolStorage = await _getUserPoolStorage();
132-
final cognitoUserKeys = LegacyCognitoUserKeys(userPoolConfig);
132+
final cognitoUserKeys = LegacyCognitoUserKeys(userPoolClientId);
133133
final currentUser = await userPoolStorage.read(
134134
key: cognitoUserKeys[LegacyCognitoKey.currentUser],
135135
);
136136
if (currentUser != null) {
137137
final userPoolKeys = LegacyCognitoUserPoolKeys(
138138
currentUser,
139-
userPoolConfig,
139+
userPoolClientId,
140140
);
141141
await userPoolStorage.deleteMany([
142142
userPoolKeys[LegacyCognitoUserPoolKey.accessToken],
@@ -147,9 +147,9 @@ class LegacyCredentialProviderIOS implements LegacyCredentialProvider {
147147
}
148148
}
149149

150-
final identityPoolId = identityPoolConfig?.poolId;
151-
if (identityPoolId != null) {
152-
final identityPoolStorage = await _getIdentityPoolStorage(identityPoolId);
150+
if (authOutputs.identityPoolId != null) {
151+
final identityPoolStorage =
152+
await _getIdentityPoolStorage(authOutputs.identityPoolId!);
153153
const identityPoolKeys = LegacyCognitoIdentityPoolKeys();
154154
await identityPoolStorage.deleteMany([
155155
identityPoolKeys[LegacyCognitoIdentityPoolKey.identityId],
@@ -162,20 +162,22 @@ class LegacyCredentialProviderIOS implements LegacyCredentialProvider {
162162
}
163163

164164
@override
165-
Future<LegacyDeviceDetails?> fetchLegacyDeviceSecrets({
166-
required String username,
167-
CognitoUserPoolConfig? userPoolConfig,
168-
}) async {
169-
if (userPoolConfig == null) return null;
165+
Future<LegacyDeviceDetails?> fetchLegacyDeviceSecrets(
166+
String username,
167+
AuthOutputs authOutputs,
168+
) async {
169+
final userPoolClientId = authOutputs.userPoolClientId;
170+
if (userPoolClientId == null) return null;
170171
final userPoolStorage = await _getUserPoolStorage();
171-
final cognitoUserKeys = LegacyCognitoUserKeys(userPoolConfig);
172+
final cognitoUserKeys = LegacyCognitoUserKeys(userPoolClientId);
172173
final currentUserId = await userPoolStorage.read(
173174
key: cognitoUserKeys[LegacyCognitoKey.currentUser],
174175
);
175-
if (currentUserId == null) return null;
176+
final userPoolId = authOutputs.userPoolId;
177+
if (currentUserId == null || userPoolId == null) return null;
176178
final keys = LegacyDeviceSecretKeys(
177179
currentUserId,
178-
userPoolConfig,
180+
userPoolId,
179181
);
180182
final deviceKey = await userPoolStorage.read(
181183
key: keys[LegacyDeviceSecretKey.id],
@@ -187,7 +189,7 @@ class LegacyCredentialProviderIOS implements LegacyCredentialProvider {
187189
key: keys[LegacyDeviceSecretKey.group],
188190
);
189191

190-
final asfKeys = LegacyAsfDeviceKeys(currentUserId, userPoolConfig);
192+
final asfKeys = LegacyAsfDeviceKeys(currentUserId, userPoolId);
191193
final asfDeviceId = await userPoolStorage.read(
192194
key: asfKeys[LegacyAsfDeviceKey.id],
193195
);
@@ -201,19 +203,21 @@ class LegacyCredentialProviderIOS implements LegacyCredentialProvider {
201203
}
202204

203205
@override
204-
Future<void> deleteLegacyDeviceSecrets({
205-
required String username,
206-
CognitoUserPoolConfig? userPoolConfig,
207-
}) async {
208-
if (userPoolConfig == null) return;
206+
Future<void> deleteLegacyDeviceSecrets(
207+
String username,
208+
AuthOutputs authOutputs,
209+
) async {
210+
final userPoolClientId = authOutputs.userPoolClientId;
211+
if (userPoolClientId == null) return;
209212
final userPoolStorage = await _getUserPoolStorage();
210-
final cognitoUserKeys = LegacyCognitoUserKeys(userPoolConfig);
213+
final cognitoUserKeys = LegacyCognitoUserKeys(userPoolClientId);
211214
final currentUserId = await userPoolStorage.read(
212215
key: cognitoUserKeys[LegacyCognitoKey.currentUser],
213216
);
214-
if (currentUserId == null) return;
215-
final keys = LegacyDeviceSecretKeys(currentUserId, userPoolConfig);
216-
final asfKeys = LegacyAsfDeviceKeys(currentUserId, userPoolConfig);
217+
final userPoolId = authOutputs.userPoolId;
218+
if (currentUserId == null || userPoolId == null) return;
219+
final keys = LegacyDeviceSecretKeys(currentUserId, userPoolId);
220+
final asfKeys = LegacyAsfDeviceKeys(currentUserId, userPoolId);
217221
await userPoolStorage.deleteMany([
218222
keys[LegacyDeviceSecretKey.id],
219223
keys[LegacyDeviceSecretKey.secret],

0 commit comments

Comments
 (0)