Skip to content

Commit 11afa39

Browse files
author
Bas de Vaan
committed
remove defaulting to id token
1 parent 574dd8d commit 11afa39

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

lib/src/oauth_interceptor.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ class OAuthInterceptor extends RequestInterceptor {
1616
FutureOr<Request> onRequest(Request request) async {
1717
final token = await oauthChopper.token;
1818
if (token == null) return request;
19-
return request.addAuthorizationHeader(token.idToken ?? token.accessToken);
19+
return request.addAuthorizationHeader(token.accessToken);
2020
}
2121
}

lib/src/oauth_token.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ class OAuthToken {
66
final DateTime? expiration;
77
final String? idToken;
88

9-
bool get isExpired {
10-
bool expired = expiration != null && DateTime.now().isAfter(expiration!);
11-
return expired;
12-
}
9+
bool get isExpired => expiration != null && DateTime.now().isAfter(expiration!);
1310

1411
const OAuthToken._(
1512
this.accessToken,

test/oauth_interceptor_test.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import 'package:mockito/mockito.dart';
44
import 'package:oauth2/oauth2.dart';
55
import 'package:oauth_chopper/oauth_chopper.dart';
66
import 'package:oauth_chopper/src/oauth_interceptor.dart';
7-
import 'package:oauth_chopper/src/oauth_token.dart';
87
import 'package:test/test.dart';
98

109
@GenerateMocks([OAuthChopper])
@@ -29,7 +28,6 @@ void main() {
2928
),
3029
);
3130

32-
3331
final testRequest = Request('GET', Uri(host: 'test'), Uri(host: 'test'));
3432

3533
test('HeaderInterceptor adds available token to headers', () async {
@@ -45,11 +43,11 @@ void main() {
4543
expect(result.headers, expected);
4644
});
4745

48-
test('HeaderInterceptor adds IDToken when available to headers', () async {
46+
test('HeaderInterceptor does not add IDToken when available to headers', () async {
4947
// arrange
5048
when(mockOAuthChopper.token).thenAnswer((_) async => testIDtoken);
5149
final interceptor = OAuthInterceptor(mockOAuthChopper);
52-
final expected = {'Authorization': 'Bearer idToken'};
50+
final expected = {'Authorization': 'Bearer token'};
5351

5452
// act
5553
final result = await interceptor.onRequest(testRequest);

0 commit comments

Comments
 (0)