Merge pull request #382 from privacyidea/v4.3.1

V4.3.1
privacyidea · Apr 29, 2024 · 93bf791 · 93bf791
2 parents 1fcb73e + 979b56a
commit 93bf791
Show file tree

Hide file tree

Showing 50 changed files with 712 additions and 316 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -43,5 +43,18 @@
                 "--release"
             ]
         },
+        {
+            "name": "privacyIDEA Authenticator - internal debug",
+            "type": "dart",
+            "request": "launch",
+            "program": "lib/mains/main_netknights.dart",
+            "args": [
+                "--flavor",
+                "netknights_debug",
+                "--target",
+                "lib/mains/main_netknights.dart",
+                "--debug"
+            ]
+        },
     ]
 }
diff --git a/android/app/src/debug/google-services.json b/android/app/src/debug/google-services.json
@@ -40,6 +40,42 @@
           ]
         }
       }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:838329625695:android:b2c30ebc37698bc3243fea",
+        "android_client_info": {
+          "package_name": "it.netknights.piauthenticator.debug.debug"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "838329625695-sb84hi21ds91m1afd7hta7rq5arr7ck9.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCU_OYNBRAHPsgR4X7jlikxIozw6EwibH4"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "838329625695-sb84hi21ds91m1afd7hta7rq5arr7ck9.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "838329625695-2atauche4u5p406p0pklghk2fu25jago.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "privacyidea.authenticator"
+              }
+            }
+          ]
+        }
+      }
     }
   ],
   "configuration_version": "1"

diff --git a/integration_test/add_tokens_test.dart b/integration_test/add_tokens_test.dart
@@ -58,7 +58,7 @@ void main() {
           settingsProvider.overrideWith((ref) => SettingsNotifier(repository: mockSettingsRepository)),
           tokenProvider.overrideWith((ref) => TokenNotifier(repository: mockTokenRepository)),
           tokenFolderProvider.overrideWith((ref) => TokenFolderNotifier(repository: mockTokenFolderRepository)),
-          introductionProvider.overrideWith((ref) => InrtroductionNotifier(repository: mockIntroductionRepository)),
+          introductionProvider.overrideWith((ref) => IntroductionNotifier(repository: mockIntroductionRepository)),
         ],
         child: PrivacyIDEAAuthenticator(customization: ApplicationCustomization.defaultCustomization),
       ));

diff --git a/integration_test/rename_and_delete_test.dart b/integration_test/rename_and_delete_test.dart
@@ -9,6 +9,7 @@ import 'package:privacyidea_authenticator/model/enums/introduction.dart';
 import 'package:privacyidea_authenticator/model/states/introduction_state.dart';
 import 'package:privacyidea_authenticator/model/states/settings_state.dart';
 import 'package:privacyidea_authenticator/model/tokens/hotp_token.dart';
+import 'package:privacyidea_authenticator/state_notifiers/completed_introduction_notifier.dart';
 import 'package:privacyidea_authenticator/state_notifiers/settings_notifier.dart';
 import 'package:privacyidea_authenticator/state_notifiers/token_folder_notifier.dart';
 import 'package:privacyidea_authenticator/state_notifiers/token_notifier.dart';
@@ -52,6 +53,7 @@ void main() {
         settingsProvider.overrideWith((ref) => SettingsNotifier(repository: mockSettingsRepository)),
         tokenProvider.overrideWith((ref) => TokenNotifier(repository: mockTokenRepository)),
         tokenFolderProvider.overrideWith((ref) => TokenFolderNotifier(repository: mockTokenFolderRepository)),
+        introductionProvider.overrideWith((ref) => IntroductionNotifier(repository: mockIntroductionRepository)),
       ],
       child: PrivacyIDEAAuthenticator(customization: ApplicationCustomization.defaultCustomization),
     ));
@@ -75,6 +77,7 @@ Future<void> _renameToken(WidgetTester tester, String newName) async {
   expect(find.byType(TextFormField), findsNWidgets(3));
   await tester.pumpAndSettle();
   await tester.enterText(find.byType(TextFormField).first, '');
+  await tester.pumpAndSettle();
   await tester.enterText(find.byType(TextFormField).first, newName);
   await pumpUntilFindNWidgets(tester, find.widgetWithText(TextFormField, newName), 1, const Duration(seconds: 2));
   await tester.tap(find.text(AppLocalizationsEn().save));

diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig
@@ -1,2 +1,3 @@
 #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug-netknights.xcconfig"
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug-netknights_debug.xcconfig"
 #include "Generated.xcconfig"
diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig
@@ -1,2 +1,3 @@
-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release-netknights.xcconfig"
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release-netknights_debug.xcconfig"
 #include "Generated.xcconfig"
diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh
@@ -5,9 +5,9 @@ export "FLUTTER_APPLICATION_PATH=/Users/frankmerkel/Documents/GitHub/pi-authenti
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_TARGET=/Users/frankmerkel/Documents/GitHub/pi-authenticator/lib/mains/main_netknights.dart"
 export "FLUTTER_BUILD_DIR=build"
-export "FLUTTER_BUILD_NAME=4.3.0"
-export "FLUTTER_BUILD_NUMBER=403006"
-export "DART_DEFINES=RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ==,RkxVVFRFUl9XRUJfQ0FOVkFTS0lUX1VSTD1odHRwczovL3d3dy5nc3RhdGljLmNvbS9mbHV0dGVyLWNhbnZhc2tpdC8wNDgxN2M5OWM5ZmQ0OTU2ZjI3NTA1MjA0ZjdlMzQ0MzM1ODEwYWVkLw==,RkxVVFRFUl9BUFBfRkxBVk9SPW5ldGtuaWdodHM="
+export "FLUTTER_BUILD_NAME=4.3.1"
+export "FLUTTER_BUILD_NUMBER=403106"
+export "DART_DEFINES=RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ==,RkxVVFRFUl9XRUJfQ0FOVkFTS0lUX1VSTD1odHRwczovL3d3dy5nc3RhdGljLmNvbS9mbHV0dGVyLWNhbnZhc2tpdC8yZTRiYTljNmZiNDk5Y2NkNGU4MTQyMDU0Mzc4M2NjNzI2N2FlNDA2Lw==,RkxVVFRFUl9BUFBfRkxBVk9SPW5ldGtuaWdodHM="
 export "DART_OBFUSCATION=false"
 export "TRACK_WIDGET_CREATION=true"
 export "TREE_SHAKE_ICONS=false"