Merge pull request #18 from finkmoritz/develop

Develop
finkmoritz · May 13, 2023 · 9e3eb8c · 9e3eb8c
2 parents cfd4cb7 + 683f68c
commit 9e3eb8c
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 18 deletions.
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
@@ -2,7 +2,6 @@ name: Dart
 
 on:
   push:
-    branches: [ main, develop ]
   pull_request:
     branches: [ main, develop ]
 
@@ -24,7 +23,7 @@ jobs:
         run: dart format --output=none --set-exit-if-changed .
 
       - name: Analyze project source
-        run: dart analyze
+        run: flutter analyze
 
       - name: Run tests
         run: flutter test
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,8 @@ example/target
 # Files and directories created by pub
 .dart_tool/
 .packages
+.flutter-plugins
+.flutter-plugins-dependencies
 
 # Omit commiting pubspec.lock for library packages:
 # https://dart.dev/guides/libraries/private-files#pubspeclock

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
-## 0.1.6 (2022-09-15)
+## 1.1.0 (2023-05-13)
+
+- Use same release version as amplify_flutter package
+- Added support for web platform
+
+- ## 0.1.6 (2022-09-15)
 
 - Fix imports in templates
 - Use CognitoUserAttributeKey attributes for sign up

diff --git a/README.md b/README.md
@@ -71,7 +71,7 @@ into your project.
 To use this plugin, add `flutter_amplify_auth_ui` as a `dev_dependency` in your pubspec.yaml:
 ```
 dev_dependencies:
-  flutter_amplify_auth_ui: ^0.1.6
+  flutter_amplify_auth_ui: ^1.1.0
 ```
 
 Run `flutter pub get` to install the plugin.

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -1,7 +1,6 @@
 # Defines a default set of lint rules enforced for
 # projects at Google. For details and rationale,
 # see https://github.com/dart-lang/pedantic#enabled-lints.
-include: package:pedantic/analysis_options.yaml
 
 # For lint rules and documentation, see http://dart-lang.github.io/linter/lints.
 # Uncomment to specify additional rules.

diff --git a/lib/src/auth_config/auth_config.dart b/lib/src/auth_config/auth_config.dart
@@ -20,7 +20,7 @@ class AuthConfig {
       allowUnauthenticatedIdentities: json['allowUnauthenticatedIdentities'],
       requiredAttributes: _getAsList(json, 'requiredAttributes'),
       usernameAttributes: _getAsList(json, 'usernameAttributes'),
-      authProviders: _getAsList(json, 'authProviders'),
+      authProviders: _getAsList(json, 'authProvidersUserPool'),
       mfaConfiguration: json['mfaConfiguration'],
       mfaTypes: _getAsList(json, 'mfaTypes'),
     );
@@ -36,7 +36,7 @@ class AuthConfig {
     "allowUnauthenticatedIdentities": $allowUnauthenticatedIdentities,
     "requiredAttributes": $requiredAttributes,
     "usernameAttributes": $usernameAttributes,
-    "authProviders": $authProviders,
+    "authProvidersUserPool": $authProviders,
     "mfaConfiguration": $mfaConfiguration,
     "mfaTypes": $mfaTypes,
     ''';

diff --git a/lib/src/auth_config/auth_config_reader.dart b/lib/src/auth_config/auth_config_reader.dart
@@ -25,7 +25,7 @@ class AuthConfigReader {
         return File(file.path);
       }
     }
-    ;
+
     throw FlutterAmplifyAuthUiException('''
     Could not find "parameters.json"!
     Please check if you have already configured Amplify Auth for this project.''');

diff --git a/lib/templates/sign_up/sign_up_page.dart b/lib/templates/sign_up/sign_up_page.dart
@@ -1,4 +1,3 @@
-import 'package:amplify_auth_cognito/amplify_auth_cognito.dart';
 import 'package:amplify_flutter/amplify_flutter.dart';
 import 'package:flutter/material.dart';
 
@@ -525,7 +524,7 @@ class _SignUpPageState extends State<SignUpPage> {
         username: _phoneNumberController.text.trim(),
         +++END usernameAttributes[phone_number]+++*/
         password: _passwordController.text.trim(),
-        options: CognitoSignUpOptions(
+        options: SignUpOptions(
           userAttributes: Map<CognitoUserAttributeKey, String>.from({
             /*+++START requiredAttributes[email]+++*/
             CognitoUserAttributeKey.email: _emailController.text.trim(),

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,23 +1,23 @@
 name: flutter_amplify_auth_ui
 description: Flutter plugin that automatically generates authentication widget templates based on your Amplify CLI Authentication configuration.
-version: 0.1.6
+version: 1.1.0
 homepage: https://github.com/finkmoritz/flutter_amplify_auth_ui
 repository: https://github.com/finkmoritz/flutter_amplify_auth_ui
 issue_tracker: https://github.com/finkmoritz/flutter_amplify_auth_ui/issues
 documentation: https://github.com/finkmoritz/flutter_amplify_auth_ui/blob/main/README.md
 
 environment:
-  sdk: '>=2.12.3 <3.0.0'
-  flutter: '>=2.8.0'
+  sdk: ">=3.0.0 <4.0.0"
+  flutter: '>=3.10.0'
 
 dependencies:
   flutter:
     sdk: flutter
 
-  amplify_flutter: '>=0.6.0 <1.0.0'
-  amplify_auth_cognito: '>=0.6.0 <1.0.0'
-  path: ^1.8.0
+  amplify_flutter: ^1.1.0
+  amplify_auth_cognito: ^1.1.0
+  path: ^1.8.3
 
 dev_dependencies:
-  pedantic: ^1.9.0
-  test: ^1.14.4
+  lints: ^2.1.0
+  test: ^1.24.2