[flutter_appauth_platform_interface] remove toMap method (MaikuB#118)

* update API docs

* remove toMap from being in public API surface

* update breaking change details

* revert code change in example main.dart file

* update docs and changelog

* revert code changes in flutter_appauth

This reverts commit 556a7a3.

Author: MaikuB

flutter_appauth_platform_interface/CHANGELOG.md

@@ -1,5 +1,6 @@
-## [1.0.3]
+## [2.0.0]
 
+* **BREAKING CHANGE** Removed the `toMap` methods so that it's not part of the public API surface. This was done as these methods were for internal use. Currently `flutter_appauth` (version 0.8.3) is constrained to depend on versions >= 1.0.2 and < 2.0.0. As it's possible that plugin consumers were calling the methods via the plugin, where the platform interface is a transitive dependency, the platform interface has been bumped to version 2.0.0 instead of 1.1.0 to be safe.
 * Added `preferEphemeralSession` to `AuthorizationRequest` and `AuthorizationTokenRequest` classes. Thanks to the PR from [Matthew Smith](https://github.com/matthewtsmith).
 
 ## [1.0.2]

flutter_appauth_platform_interface/lib/src/authorization_parameters.dart

@@ -1,6 +1,4 @@
-import 'mappable.dart';
-
-mixin AuthorizationParameters on Mappable {
+mixin AuthorizationParameters {
   /// Hint to the Authorization Server about the login identifier the End-User might use to log in.
   String loginHint;
 
@@ -11,13 +9,4 @@ mixin AuthorizationParameters on Mappable {
   ///
   /// This property is only applicable to iOS versions 13 and above.
   bool preferEphemeralSession;
-
-  @override
-  Map<String, dynamic> toMap() {
-    final Map<String, dynamic> map = super.toMap();
-    map['loginHint'] = loginHint;
-    map['promptValues'] = promptValues;
-    map['preferEphemeralSession'] = preferEphemeralSession;
-    return map;
-  }
 }

flutter_appauth_platform_interface/lib/src/authorization_response.dart

@@ -1,3 +1,4 @@
+/// Contains the response from making an authorization request.
 class AuthorizationResponse {
   AuthorizationResponse(
     this.authorizationCode,

flutter_appauth_platform_interface/lib/src/authorization_service_configuration.dart

@@ -8,11 +8,4 @@ class AuthorizationServiceConfiguration {
   final String authorizationEndpoint;
 
   final String tokenEndpoint;
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'tokenEndpoint': tokenEndpoint,
-      'authorizationEndpoint': authorizationEndpoint
-    };
-  }
 }

flutter_appauth_platform_interface/lib/src/common_request_details.dart

@@ -1,7 +1,6 @@
 import 'authorization_service_configuration.dart';
-import 'mappable.dart';
 
-class CommonRequestDetails implements Mappable {
+class CommonRequestDetails {
   /// The client id.
   String clientId;
 
@@ -27,18 +26,4 @@ class CommonRequestDetails implements Mappable {
   ///
   /// This property is only applicable to Android.
   bool allowInsecureConnections;
-
-  @override
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'clientId': clientId,
-      'issuer': issuer,
-      'discoveryUrl': discoveryUrl,
-      'redirectUrl': redirectUrl,
-      'scopes': scopes,
-      'serviceConfiguration': serviceConfiguration?.toMap(),
-      'additionalParameters': additionalParameters,
-      'allowInsecureConnections': allowInsecureConnections,
-    };
-  }
 }

flutter_appauth_platform_interface/lib/src/mappable.dart

@@ -5,6 +5,7 @@ import 'authorization_response.dart';
 import 'authorization_token_request.dart';
 import 'authorization_token_response.dart';
 import 'flutter_appauth_platform.dart';
+import 'method_channel_mappers.dart';
 import 'token_request.dart';
 import 'token_response.dart';
 

flutter_appauth_platform_interface/lib/src/method_channel_flutter_appauth.dart

@@ -0,0 +1,85 @@
+import 'authorization_parameters.dart';
+import 'authorization_request.dart';
+import 'authorization_service_configuration.dart';
+import 'authorization_token_request.dart';
+import 'common_request_details.dart';
+import 'grant_types.dart';
+import 'token_request.dart';
+
+Map<String, Object> _convertCommonRequestDetailsToMap(
+    CommonRequestDetails commonRequestDetails) {
+  return <String, Object>{
+    'clientId': commonRequestDetails.clientId,
+    'issuer': commonRequestDetails.issuer,
+    'discoveryUrl': commonRequestDetails.discoveryUrl,
+    'redirectUrl': commonRequestDetails.redirectUrl,
+    'scopes': commonRequestDetails.scopes,
+    'serviceConfiguration': commonRequestDetails.serviceConfiguration?.toMap(),
+    'additionalParameters': commonRequestDetails.additionalParameters,
+    'allowInsecureConnections': commonRequestDetails.allowInsecureConnections,
+  };
+}
+
+extension AuthorizationRequestParameters on AuthorizationRequest {
+  Map<String, Object> toMap() {
+    return _convertAuthorizationParametersToMap(this)
+      ..addAll(_convertCommonRequestDetailsToMap(this));
+  }
+}
+
+extension AuthorizationServiceConfigurationMapper
+    on AuthorizationServiceConfiguration {
+  Map<String, Object> toMap() {
+    return <String, Object>{
+      'tokenEndpoint': tokenEndpoint,
+      'authorizationEndpoint': authorizationEndpoint,
+    };
+  }
+}
+
+extension TokenRequestMapper on TokenRequest {
+  Map<String, Object> toMap() {
+    return _convertTokenRequestToMap(this);
+  }
+}
+
+extension AuthorizationTokenRequestMapper on AuthorizationTokenRequest {
+  Map<String, Object> toMap() {
+    return _convertTokenRequestToMap(this)
+      ..addAll(_convertAuthorizationParametersToMap(this));
+  }
+}
+
+Map<String, Object> _convertTokenRequestToMap(TokenRequest tokenRequest) {
+  return <String, Object>{
+    'clientSecret': tokenRequest.clientSecret,
+    'refreshToken': tokenRequest.refreshToken,
+    'authorizationCode': tokenRequest.authorizationCode,
+    'grantType': _inferGrantType(tokenRequest),
+    'codeVerifier': tokenRequest.codeVerifier,
+  }..addAll(_convertCommonRequestDetailsToMap(tokenRequest));
+}
+
+String _inferGrantType(TokenRequest tokenRequest) {
+  if (tokenRequest.grantType != null) {
+    return tokenRequest.grantType;
+  }
+  if (tokenRequest.refreshToken != null) {
+    return GrantType.refreshToken;
+  }
+  if (tokenRequest.authorizationCode != null) {
+    return GrantType.authorizationCode;
+  }
+
+  throw ArgumentError.value(
+      null, 'grantType', 'Grant type not specified and cannot be inferred');
+}
+
+Map<String, Object> _convertAuthorizationParametersToMap(
+    AuthorizationParameters authorizationParameters) {
+  return <String, Object>{
+    'loginHint': authorizationParameters.loginHint,
+    'promptValues': authorizationParameters.promptValues,
+    'preferEphemeralSession': authorizationParameters.preferEphemeralSession,
+  };
+}

flutter_appauth_platform_interface/lib/src/method_channel_mappers.dart

@@ -1,6 +1,5 @@
 import 'authorization_service_configuration.dart';
 import 'common_request_details.dart';
-import 'grant_types.dart';
 
 /// Details for a token exchange request.
 class TokenRequest with CommonRequestDetails {
@@ -50,31 +49,4 @@ class TokenRequest with CommonRequestDetails {
 
   /// The code verifier to be sent with the authorization code. This should match the code verifier used when performing the authorization request
   final String codeVerifier;
-
-  @override
-  Map<String, dynamic> toMap() {
-    final Map<String, dynamic> map = super.toMap();
-    final String inferredGrantType = _inferGrantType();
-    map['clientSecret'] = clientSecret;
-    map['refreshToken'] = refreshToken;
-    map['authorizationCode'] = authorizationCode;
-    map['grantType'] = inferredGrantType;
-    map['codeVerifier'] = codeVerifier;
-    return map;
-  }
-
-  String _inferGrantType() {
-    if (grantType != null) {
-      return grantType;
-    }
-    if (refreshToken != null) {
-      return GrantType.refreshToken;
-    }
-    if (authorizationCode != null) {
-      return GrantType.authorizationCode;
-    }
-
-    throw ArgumentError.value(
-        null, 'grantType', 'Grant type not specified and cannot be inferred');
-  }
 }

flutter_appauth_platform_interface/lib/src/token_request.dart

@@ -1,4 +1,4 @@
-/// Details from making a successful token exchange
+/// Details from making a successful token exchange.
 class TokenResponse {
   TokenResponse(
     this.accessToken,

flutter_appauth_platform_interface/lib/src/token_response.dart

@@ -1,10 +1,10 @@
 name: flutter_appauth_platform_interface
 description: A common platform interface for the flutter_appauth plugin.
-version: 1.0.3
+version: 2.0.0
 homepage: https://github.com/MaikuB/flutter_appauth/tree/master/flutter_appauth_platform_interface
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  sdk: ">=2.6.0 <3.0.0"
   flutter: ">=1.10.0"
 
 dependencies: