Swap client id and endpoint fields

IniZio · Apr 19, 2024 · 778fd56 · 778fd56
1 parent 7fe0b69
commit 778fd56
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 18 deletions.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -227,6 +227,8 @@ class _MyAppState extends State<MyApp> {
   late SharedPreferences _sharedPreferences;
   final TextEditingController _endpointController = TextEditingController();
   final TextEditingController _clientIDController = TextEditingController();
+  final TextEditingController _authenticationFlowGroupController =
+      TextEditingController();
   StreamSubscription<SessionStateChangeEvent>? _sub;
   bool _loading = false;
   bool _useTransientTokenStorage = false;
@@ -299,6 +301,15 @@ class _MyAppState extends State<MyApp> {
             ),
             body: ListView(
               children: [
+                Container(
+                  padding:
+                      const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+                  child: TextFieldWithLabel(
+                    label: "Client ID",
+                    hintText: "Enter client ID",
+                    controller: _clientIDController,
+                  ),
+                ),
                 Container(
                   padding:
                       const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
@@ -312,9 +323,9 @@ class _MyAppState extends State<MyApp> {
                   padding:
                       const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
                   child: TextFieldWithLabel(
-                    label: "Client ID",
-                    hintText: "Enter client ID",
-                    controller: _clientIDController,
+                    label: "Authentication Flow Group",
+                    hintText: "Enter flow group",
+                    controller: _authenticationFlowGroupController,
                   ),
                 ),
                 RadioGroup<AuthenticationPage>(
@@ -570,6 +581,7 @@ class _MyAppState extends State<MyApp> {
         page: _page,
         colorScheme: _getColorScheme(context),
         wechatRedirectURI: wechatRedirectURI,
+        authenticationFlowGroup: _authenticationFlowGroupController.text,
       );
       setState(() {
         _userInfo = userInfo;
@@ -656,6 +668,7 @@ class _MyAppState extends State<MyApp> {
       final userInfo = await _authgear.reauthenticate(
         redirectURI: redirectURI,
         wechatRedirectURI: wechatRedirectURI,
+        authenticationFlowGroup: _authenticationFlowGroupController.text,
       );
       setState(() {
         _userInfo = userInfo;

diff --git a/lib/src/client.dart b/lib/src/client.dart
@@ -22,7 +22,7 @@ class OIDCAuthenticationRequest {
   final AuthenticationPage? page;
   final String? wechatRedirectURI;
   final SettingsAction? settingsAction;
-  final String? xAuthenticationFlowGroup;
+  final String? authenticationFlowGroup;
 
   OIDCAuthenticationRequest({
     required this.clientID,
@@ -41,7 +41,7 @@ class OIDCAuthenticationRequest {
     this.page,
     this.wechatRedirectURI,
     this.settingsAction,
-    this.xAuthenticationFlowGroup,
+    this.authenticationFlowGroup,
   });
 
   Map<String, String> toQueryParameters() {
@@ -124,9 +124,9 @@ class OIDCAuthenticationRequest {
       q["x_settings_action"] = settingsAction.value;
     }
 
-    final xAuthenticationFlowGroup = this.xAuthenticationFlowGroup;
-    if (xAuthenticationFlowGroup != null) {
-      q["x_authentication_flow_group"] = xAuthenticationFlowGroup;
+    final authenticationFlowGroup = this.authenticationFlowGroup;
+    if (authenticationFlowGroup != null) {
+      q["x_authentication_flow_group"] = authenticationFlowGroup;
     }
 
     return q;

diff --git a/lib/src/container.dart b/lib/src/container.dart
@@ -53,7 +53,7 @@ class AuthenticateOptions {
   final ColorScheme? colorScheme;
   final String? wechatRedirectURI;
   final AuthenticationPage? page;
-  final String? xAuthenticationFlowGroup;
+  final String? authenticationFlowGroup;
 
   AuthenticateOptions({
     required this.redirectURI,
@@ -65,7 +65,7 @@ class AuthenticateOptions {
     this.colorScheme,
     this.wechatRedirectURI,
     this.page,
-    this.xAuthenticationFlowGroup,
+    this.authenticationFlowGroup,
   });
 
   OIDCAuthenticationRequest toRequest(String clientID, CodeVerifier verifier) {
@@ -87,7 +87,7 @@ class AuthenticateOptions {
       state: state,
       loginHint: loginHint,
       wechatRedirectURI: wechatRedirectURI,
-      xAuthenticationFlowGroup: xAuthenticationFlowGroup,
+      authenticationFlowGroup: authenticationFlowGroup,
     );
   }
 }
@@ -100,7 +100,7 @@ class ReauthenticateOptions {
   final ColorScheme? colorScheme;
   final String? wechatRedirectURI;
   final int? maxAge;
-  final String? xAuthenticationFlowGroup;
+  final String? authenticationFlowGroup;
 
   ReauthenticateOptions({
     required this.redirectURI,
@@ -110,7 +110,7 @@ class ReauthenticateOptions {
     this.colorScheme,
     this.wechatRedirectURI,
     this.maxAge,
-    this.xAuthenticationFlowGroup,
+    this.authenticationFlowGroup,
   });
 
   OIDCAuthenticationRequest toRequest(
@@ -130,7 +130,7 @@ class ReauthenticateOptions {
       idTokenHint: idTokenHint,
       maxAge: maxAge,
       wechatRedirectURI: wechatRedirectURI,
-      xAuthenticationFlowGroup: xAuthenticationFlowGroup,
+      authenticationFlowGroup: authenticationFlowGroup,
     );
     return oidcRequest;
   }
@@ -293,7 +293,7 @@ class Authgear implements AuthgearHttpClientDelegate {
     AuthenticationPage? page,
     String? state,
     String? wechatRedirectURI,
-    String? xAuthenticationFlowGroup,
+    String? authenticationFlowGroup,
   }) async {
     final authRequest =
         await internalCreateAuthenticateRequest(AuthenticateOptions(
@@ -305,7 +305,7 @@ class Authgear implements AuthgearHttpClientDelegate {
       colorScheme: colorScheme,
       wechatRedirectURI: wechatRedirectURI,
       page: page,
-      xAuthenticationFlowGroup: xAuthenticationFlowGroup,
+      authenticationFlowGroup: authenticationFlowGroup,
     ));
 
     if (wechatRedirectURI != null) {
@@ -347,7 +347,7 @@ class Authgear implements AuthgearHttpClientDelegate {
     String? wechatRedirectURI,
     BiometricOptionsIOS? biometricIOS,
     BiometricOptionsAndroid? biometricAndroid,
-    String? xAuthenticationFlowGroup,
+    String? authenticationFlowGroup,
   }) async {
     final biometricEnabled = await isBiometricEnabled();
     if (biometricEnabled && biometricIOS != null && biometricAndroid != null) {
@@ -370,7 +370,7 @@ class Authgear implements AuthgearHttpClientDelegate {
       colorScheme: colorScheme,
       wechatRedirectURI: wechatRedirectURI,
       maxAge: maxAge,
-      xAuthenticationFlowGroup: xAuthenticationFlowGroup,
+      authenticationFlowGroup: authenticationFlowGroup,
     );
 
     final request =