Merge branch 'qasim90-master'

teranetsrl · Jul 17, 2022 · 820a35d · 820a35d
2 parents d7d095a + b80f220
commit 820a35d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/lib/oauth2_client.dart b/lib/oauth2_client.dart
@@ -82,7 +82,8 @@ class OAuth2Client {
       String? state,
       httpClient,
       BaseWebAuth? webAuthClient,
-      Map<String, dynamic>? webAuthOpts}) async {
+      Map<String, dynamic>? webAuthOpts,
+      Map<String, dynamic>? customParams}) async {
     httpClient ??= http.Client();
     webAuthClient ??= this.webAuthClient;
 
@@ -94,7 +95,8 @@ class OAuth2Client {
         scopes: scopes,
         enableState: enableState,
         state: state,
-        redirectUri: redirectUri);
+        redirectUri: redirectUri,
+        customParams: customParams);
 
     // Present the dialog to the user
     try {
@@ -163,8 +165,9 @@ class OAuth2Client {
           webAuthOpts: webAuthOpts);
 
       if (authResp.isAccessGranted()) {
-        if (afterAuthorizationCodeCb != null)
+        if (afterAuthorizationCodeCb != null) {
           afterAuthorizationCodeCb(authResp);
+        }
 
         tknResp = await requestAccessToken(
             httpClient: httpClient,

diff --git a/lib/oauth2_helper.dart b/lib/oauth2_helper.dart
@@ -146,7 +146,8 @@ class OAuth2Helper {
           scopes: scopes,
           enableState: enableState,
           webAuthClient: webAuthClient,
-          webAuthOpts: webAuthOpts);
+          webAuthOpts: webAuthOpts,
+          customParams: authCodeParams);
     } else {
       tknResp = AccessTokenResponse.errorResponse();
     }

diff --git a/test/oauth2_helper_test.mocks.dart b/test/oauth2_helper_test.mocks.dart
@@ -127,7 +127,8 @@ class MockOAuth2Client extends _i1.Mock implements _i8.OAuth2Client {
           String? state,
           dynamic httpClient,
           _i2.BaseWebAuth? webAuthClient,
-          Map<String, dynamic>? webAuthOpts}) =>
+          Map<String, dynamic>? webAuthOpts,
+          Map<String, dynamic>? customParams}) =>
       (super.noSuchMethod(
               Invocation.method(#getTokenWithImplicitGrantFlow, [], {
                 #clientId: clientId,
@@ -136,7 +137,8 @@ class MockOAuth2Client extends _i1.Mock implements _i8.OAuth2Client {
                 #state: state,
                 #httpClient: httpClient,
                 #webAuthClient: webAuthClient,
-                #webAuthOpts: webAuthOpts
+                #webAuthOpts: webAuthOpts,
+                #customParams: customParams
               }),
               returnValue: Future<_i3.AccessTokenResponse>.value(
                   _FakeAccessTokenResponse_1()))