Merge pull request #5 from DutchCodingCompany/feature/support-for-id-token

Feature/support for id token

Author: Bas de Vaan

lib/src/oauth_token.dart

@@ -4,14 +4,15 @@ class OAuthToken {
   final String accessToken;
   final String? refreshToken;
   final DateTime? expiration;
+  final String? idToken;
 
-  bool get isExpired =>
-      expiration != null && DateTime.now().isAfter(expiration!);
+  bool get isExpired => expiration != null && DateTime.now().isAfter(expiration!);
 
   const OAuthToken._(
     this.accessToken,
     this.refreshToken,
     this.expiration,
+    this.idToken,
   );
 
   factory OAuthToken.fromJson(String json) {
@@ -23,5 +24,6 @@ class OAuthToken {
         credentials.accessToken,
         credentials.refreshToken,
         credentials.expiration,
+        credentials.idToken,
       );
 }

test/oauth_chopper_test.dart

@@ -13,7 +13,7 @@ void main() {
    {
  	"accessToken": "accesToken",
  	"refreshToken": "refreshToken",
- 	"idToken": null,
+ 	"idToken": "idToken",
  	"tokenEndpoint": "https://test.test/oauth/token",
  	"scopes": [],
  	"expiration": 1664359530234
@@ -63,6 +63,7 @@ void main() {
     // assert
     expect(token?.accessToken, 'accesToken');
     expect(token?.refreshToken, 'refreshToken');
+    expect(token?.idToken, 'idToken');
   });
 
   test('Returns no token if not in storage', () async {
@@ -98,6 +99,7 @@ void main() {
     verify(grantMock.handle(any, 'identifier', 'secret')).called(1);
     verify(storageMock.saveCredentials(testJson)).called(1);
     expect(token.accessToken, 'accesToken');
+    expect(token?.idToken, 'idToken');
     expect(token.refreshToken, 'refreshToken');
   });
 }

test/oauth_interceptor_test.dart

@@ -4,7 +4,6 @@ import 'package:mockito/mockito.dart';
 import 'package:oauth2/oauth2.dart';
 import 'package:oauth_chopper/oauth_chopper.dart';
 import 'package:oauth_chopper/src/oauth_interceptor.dart';
-import 'package:oauth_chopper/src/oauth_token.dart';
 import 'package:test/test.dart';
 
 @GenerateMocks([OAuthChopper])
@@ -20,6 +19,15 @@ void main() {
     ),
   );
 
+  final testIDtoken = OAuthToken.fromCredentials(
+    Credentials(
+      'token',
+      refreshToken: 'refresh',
+      idToken: 'idToken',
+      expiration: DateTime(2022, 9, 1),
+    ),
+  );
+
   final testRequest = Request('GET', Uri(host: 'test'), Uri(host: 'test'));
 
   test('HeaderInterceptor adds available token to headers', () async {
@@ -34,6 +42,20 @@ void main() {
     // assert
     expect(result.headers, expected);
   });
+
+  test('HeaderInterceptor does not add IDToken when available to headers', () async {
+    // arrange
+    when(mockOAuthChopper.token).thenAnswer((_) async => testIDtoken);
+    final interceptor = OAuthInterceptor(mockOAuthChopper);
+    final expected = {'Authorization': 'Bearer token'};
+
+    // act
+    final result = await interceptor.onRequest(testRequest);
+
+    // assert
+    expect(result.headers, expected);
+  });
+
   test('HeaderInterceptor adds no token to headers', () async {
     // arrange
     when(mockOAuthChopper.token).thenAnswer((_) async => null);