-
Notifications
You must be signed in to change notification settings - Fork 3.4k
[google_sign_in_web] Fixes force unwrap on values that can be null #4374
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
auto-submit
merged 1 commit into
flutter:main
from
kamilpowalowski:google-sign-in-web-null-force-unwrap
Jul 6, 2023
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,6 +18,12 @@ final CredentialResponse goodCredential = | |
'credential': goodJwtToken, | ||
}); | ||
|
||
/// A CredentialResponse wrapping a known good JWT Token as its `credential`. | ||
final CredentialResponse minimalCredential = | ||
jsifyAs<CredentialResponse>(<String, Object?>{ | ||
'credential': minimalJwtToken, | ||
}); | ||
|
||
/// A JWT token with predefined values. | ||
/// | ||
/// 'email': '[email protected]', | ||
|
@@ -38,6 +44,22 @@ const String goodJwtToken = | |
const String goodPayload = | ||
'eyJlbWFpbCI6ImFkdWx0bWFuQGV4YW1wbGUuY29tIiwic3ViIjoiMTIzNDU2IiwibmFtZSI6IlZpbmNlbnQgQWR1bHRtYW4iLCJwaWN0dXJlIjoiaHR0cHM6Ly90aGlzcGVyc29uZG9lc25vdGV4aXN0LmNvbS9pbWFnZT94PS5qcGcifQ'; | ||
|
||
/// A JWT token with minimal set of predefined values. | ||
/// | ||
/// 'email': '[email protected]', | ||
/// 'sub': '123456' | ||
/// | ||
/// Signed with HS256 and the private key: 'symmetric-encryption-is-weak' | ||
const String minimalJwtToken = | ||
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.$minimalPayload.UTAe7dpdtFIMwsOqkZkjyjqyHnho5xHCcQylUFmOutM'; | ||
|
||
/// The payload of a JWT token that contains only non-nullable values. | ||
/// | ||
/// "email": "[email protected]", | ||
/// "sub": "123456" | ||
const String minimalPayload = | ||
'eyJlbWFpbCI6ImFkdWx0bWFuQGV4YW1wbGUuY29tIiwic3ViIjoiMTIzNDU2In0'; | ||
|
||
// More encrypted JWT Tokens may be created on https://jwt.io. | ||
// | ||
// First, decode the `goodJwtToken` above, modify to your heart's | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -57,6 +57,17 @@ void main() { | |
expect(data.idToken, goodJwtToken); | ||
}); | ||
|
||
testWidgets('happy case (minimal)', (_) async { | ||
final GoogleSignInUserData data = | ||
gisResponsesToUserData(minimalCredential)!; | ||
|
||
expect(data.displayName, isNull); | ||
expect(data.id, '123456'); | ||
expect(data.email, '[email protected]'); | ||
expect(data.photoUrl, isNull); | ||
expect(data.idToken, minimalJwtToken); | ||
}); | ||
|
||
testWidgets('null response -> null', (_) async { | ||
expect(gisResponsesToUserData(null), isNull); | ||
}); | ||
|
@@ -90,6 +101,14 @@ void main() { | |
)); | ||
}); | ||
|
||
testWidgets('happy case (minimal) -> data', (_) async { | ||
final Map<String, Object?>? data = getJwtTokenPayload(minimalJwtToken); | ||
|
||
expect(data, isNotNull); | ||
expect(data, containsPair('email', '[email protected]')); | ||
expect(data, containsPair('sub', '123456')); | ||
}); | ||
|
||
testWidgets('null Token -> null', (_) async { | ||
final Map<String, Object?>? data = getJwtTokenPayload(null); | ||
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -72,8 +72,8 @@ GoogleSignInUserData? gisResponsesToUserData( | |
return GoogleSignInUserData( | ||
email: payload['email']! as String, | ||
id: payload['sub']! as String, | ||
displayName: payload['name']! as String, | ||
photoUrl: payload['picture']! as String, | ||
displayName: payload['name'] as String?, | ||
photoUrl: payload['picture'] as String?, | ||
Comment on lines
-75
to
+76
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This makes total sense. Even the documentation of
|
||
idToken: credentialResponse.credential, | ||
); | ||
} | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for adding a test!
I'm glad you managed to create one of these, it's not a trivial process!