Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V4.2.1 #337

Merged
merged 89 commits into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from 86 commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
eb8a7d4
model tests
frankmer Aug 24, 2023
162ce74
Merge remote-tracking branch 'origin/master' into 4.2.0-tests
frankmer Aug 28, 2023
f81959d
dependency injection and unit tests
frankmer Aug 31, 2023
42515f5
Merge remote-tracking branch 'origin/master' into 4.2.0-tests
frankmer Aug 31, 2023
2963270
more unit tests
frankmer Aug 31, 2023
e25c3a2
first intefration test
frankmer Sep 4, 2023
35fe412
app customizer
frankmer Sep 7, 2023
bf0a41f
app customizer
frankmer Sep 7, 2023
41dee43
Merge branch 'master' into for-appcustomizer
frankmer Sep 7, 2023
4ae02eb
some little changes
frankmer Sep 12, 2023
9eaf5a4
Merge branch '4.2.0-open-beta-fixes' into for-appcustomizer
frankmer Sep 15, 2023
9ef5285
.
frankmer Sep 18, 2023
ddf5daa
Merge branch '4.2.0-open-beta-fixes' into for-appcustomizer
frankmer Sep 19, 2023
304be19
.
frankmer Sep 19, 2023
333926c
.
frankmer Sep 19, 2023
4af83b9
.
frankmer Sep 20, 2023
60c4943
GEOMAR Authenticator
frankmer Sep 21, 2023
510bfdd
merge
frankmer Sep 21, 2023
ed382f9
Authenticator Original
frankmer Sep 22, 2023
c464ca3
Merge branch '4.2.0-open-beta-fixes' into for-appcustomizer
frankmer Sep 22, 2023
033a591
.
frankmer Sep 22, 2023
fc32e45
.
frankmer Sep 25, 2023
3f370f3
.
frankmer Sep 25, 2023
032b873
.
frankmer Sep 25, 2023
150d1db
Merge branch '4.2.0-open-beta-fixes' into for-appcustomizer
frankmer Sep 25, 2023
179d416
.
frankmer Sep 25, 2023
019624f
Merge remote-tracking branch 'origin/master' into for-appcustomizer
frankmer Sep 26, 2023
3752498
.
frankmer Sep 27, 2023
ae5cfe7
Merge branch 'main' into for-appcustomizer
frankmer Sep 27, 2023
6ea7dd9
shellscript
frankmer Sep 29, 2023
8b886b8
Merge remote-tracking branch 'origin/master' into for-appcustomizer
frankmer Sep 29, 2023
aed13a2
.
frankmer Oct 2, 2023
a263bc6
removed token information
frankmer Oct 11, 2023
01026df
update version number
frankmer Oct 11, 2023
ea2629a
Merge remote-tracking branch 'origin/Remove-Token-information-from-lo…
frankmer Oct 11, 2023
956cdfe
.
frankmer Oct 12, 2023
2405c95
.
frankmer Oct 12, 2023
8aba181
.
frankmer Oct 12, 2023
2d1ef4b
.
frankmer Oct 12, 2023
0056475
null safty
frankmer Oct 12, 2023
3afc9c6
refactoring
frankmer Oct 12, 2023
a2e8014
.
frankmer Oct 13, 2023
b5da0b6
Fix renaming class
frankmer Oct 13, 2023
a87e651
.
frankmer Oct 13, 2023
805c54b
.
frankmer Oct 13, 2023
0f18f16
.
frankmer Oct 16, 2023
929bd6d
.
frankmer Oct 16, 2023
5241af5
can now cancel authentication on ios
frankmer Oct 16, 2023
4c53739
.
frankmer Oct 16, 2023
f6f5a31
updated tests
frankmer Oct 16, 2023
3ac87b1
.
frankmer Oct 16, 2023
6a262c3
updated logging
frankmer Oct 16, 2023
b6cef30
null check for every value of the required keys
frankmer Oct 16, 2023
ca55208
Replaced the green flashing button with an arrow button
frankmer Oct 16, 2023
a0910ed
.
frankmer Oct 16, 2023
7852701
.
frankmer Oct 16, 2023
b724d4a
.
frankmer Oct 16, 2023
6c5497a
.
frankmer Oct 16, 2023
eb0f63b
.
frankmer Oct 17, 2023
4a7a89d
localization
frankmer Oct 17, 2023
687a058
.
frankmer Oct 17, 2023
0f621a5
.
frankmer Oct 17, 2023
4cbbe37
.
frankmer Oct 17, 2023
1404875
.
frankmer Oct 20, 2023
d5f9fc6
.
frankmer Oct 20, 2023
50586d9
.
frankmer Oct 20, 2023
5036335
.
frankmer Oct 20, 2023
24baad9
fixed rename and delete test
frankmer Oct 20, 2023
793936e
fixes rolloutPushToken test
frankmer Oct 20, 2023
a922871
Merge branch 'v4.2.1' into v4.2.1-tests
frankmer Oct 20, 2023
9465990
new package works great
frankmer Oct 20, 2023
5f0b3fc
Merge pull request #328 from privacyidea/v4.2.1-tests
frankmer Oct 20, 2023
a374a46
increased timeout for failed test
frankmer Oct 20, 2023
300864e
Merge branch 'v4.2.1' of https://github.com/privacyidea/pi-authentica…
frankmer Oct 20, 2023
e49a332
.
frankmer Oct 20, 2023
20b39b5
.
frankmer Oct 23, 2023
fa67150
.
frankmer Oct 23, 2023
b07d586
Merge branch 'v4.2.1' into 44-write-additional-tests
frankmer Oct 23, 2023
9a86c09
implemented new test and fixed two step rollout
frankmer Oct 25, 2023
349e4fe
.
frankmer Oct 25, 2023
11a0803
modified logger
frankmer Oct 25, 2023
a941412
flutter_lints: ^3.0.0
frankmer Oct 26, 2023
a1116ae
updated .gitignore so git uploads the recommanded vscode files
frankmer Oct 26, 2023
66ac8c6
fixed
frankmer Oct 26, 2023
ce65bdd
added some logging
frankmer Oct 27, 2023
844679c
Resolved
frankmer Oct 27, 2023
cc22258
fixed test and added aditional timeout
frankmer Oct 27, 2023
0c42e36
test fix
frankmer Oct 27, 2023
5084536
402102
frankmer Oct 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/flutter_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- run: "flutter upgrade"
- run: "flutter --version"
- run: "flutter pub get"
- run: "flutter build ios --no-codesign"
- run: "flutter build ios -t 'lib/main_netknights.dart' --no-codesign"

build_appbundle:
name: (Android)
Expand All @@ -41,7 +41,7 @@ jobs:
# matrix job fails.
fail-fast: false
matrix:
api-level: [ 21,31 ] # [minSdk, most used, newest (30 is not working :(] 19 would be minSDK but does not support x86_64
api-level: [ 21, 30, 34 ] # [minSdk, most used, newest]
target: [ default ] # [default, google_apis]
steps:
- uses: actions/checkout@v2
Expand All @@ -56,5 +56,5 @@ jobs:
- run: "flutter --version"
- run: "flutter pub get"
- run: 'flutter clean'
- run: "flutter build apk --debug"
- run: "flutter build apk -t 'lib/main_netknights.dart' --debug"

35 changes: 35 additions & 0 deletions .github/workflows/test-integration.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Flutter integration test
on:
push:
branches:
- master
pull_request:
jobs:
drive_android:
runs-on: macos-latest
strategy:
matrix:
api-level: [29]
target: [playstore]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'

- uses: subosito/flutter-action@v1
with:
flutter-version: '3.13.2'
channel: 'stable'

# Run integration test
- name: Run Flutter Driver tests
uses: reactivecircus/android-emulator-runner@v2
with:
target: ${{ matrix.target }}
api-level: ${{ matrix.api-level }}
arch: x86_64
profile: Nexus 6
script: flutter test integration_test

3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
*.iws
.idea/

# Visual Studio Code related
.vscode/

# Flutter/Dart/Pub related
**/doc/api/
.dart_tool/
Expand Down
29 changes: 29 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "pi-authenticator (release mode)",
"request": "launch",
"type": "dart",
"program": "lib/main_netknights.dart",
"flutterMode": "release"
},
{
"name": "pi-authenticator (debug mode)",
"request": "launch",
"type": "dart",
"program": "lib/main_netknights.dart",
"flutterMode": "debug"
},
{
"name": "pi-authenticator (profile mode)",
"request": "launch",
"type": "dart",
"program": "lib/main_netknights.dart",
"flutterMode": "profile"
},
]
}
7 changes: 6 additions & 1 deletion analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
include: package:flutter_lints/flutter.yaml
include: package:flutter_lints/flutter.yaml

linter:
rules:
unnecessary_string_escapes: false
unnecessary_string_interpolations: false
13 changes: 13 additions & 0 deletions android/.settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
arguments=--init-script C\:\\Users\\FRANKM~1\\AppData\\Local\\Temp\\d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script C\:\\Users\\FRANKM~1\\AppData\\Local\\Temp\\52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
auto.sync=false
build.scans.enabled=false
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.project.dir=
eclipse.preferences.version=1
gradle.user.home=
java.home=C\:/Program Files/Java/jdk-17
jvm.arguments=
offline.mode=false
override.workspace.settings=true
show.console.view=true
show.executions.view=true
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
android:exported="true"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
android:launchMode="singleTop"
android:launchMode="singleInstance"
android:theme="@style/LaunchTheme"
android:windowSoftInputMode="adjustResize">
<!-- Deep Links -->
Expand Down
Loading
Loading