Merge pull request #832 from givtnl/develop

Production release 4.2.22
givtnl · Jun 24, 2024 · 70e643a · 70e643a
2 parents ece37e6 + 640e2b3
commit 70e643a
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 23 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -57,7 +57,9 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with: 
+          ruby-version: '3.0'
           bundler-cache: true
+          working-directory: 'android'
 
       - uses: actions/setup-java@v4
         with:
@@ -78,10 +80,11 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
+          cache: true
           flutter-version: ${{ inputs.flutter-version }}
 
       - name: Run Fastlane
-        uses: maierj/fastlane-action@v2.3.0
+        uses: maierj/fastlane-action@v3.1.0
         with:
           lane: android build_and_deploy
           subdirectory: android

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -62,7 +62,9 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with: 
+          ruby-version: '3.0'
           bundler-cache: true
+          working-directory: 'ios'
 
       - name: Auth codesigning
         uses: webfactory/ssh-agent@v0.9.0
@@ -78,10 +80,11 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
+          cache: true
           flutter-version: ${{ inputs.flutter-version }}
 
       - name: Run Fastlane
-        uses: maierj/fastlane-action@v2.3.0
+        uses: maierj/fastlane-action@v3.1.0
         with:
           lane: ios release
           subdirectory: ios

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -1,10 +1,11 @@
 name: givt_app
 
 concurrency:
-  group: $-$
+  group: ci-${{ github.ref }}
   cancel-in-progress: true
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main

diff --git a/lib/core/logging/log_message.dart b/lib/core/logging/log_message.dart
@@ -17,6 +17,7 @@ class LogMessage extends Equatable {
     this.appVersion,
     this.lang,
     this.deviceId,
+    this.correlationId,
   });
 
   String? guid;
@@ -33,6 +34,7 @@ class LogMessage extends Equatable {
   String? appVersion;
   String? lang;
   String? deviceId;
+  String? correlationId;
 
   Map<String, dynamic> toJson() => {
         'guid': guid,
@@ -49,6 +51,7 @@ class LogMessage extends Equatable {
         'appVersion': appVersion,
         'lang': lang,
         'deviceId': deviceId,
+        'correlation-id': correlationId,
       };
 
   LogMessage copyWith({
@@ -66,6 +69,7 @@ class LogMessage extends Equatable {
     String? appVersion,
     String? lang,
     String? deviceId,
+    String? correlationId,
   }) {
     return LogMessage(
       guid: guid ?? this.guid,
@@ -82,6 +86,7 @@ class LogMessage extends Equatable {
       appVersion: appVersion ?? this.appVersion,
       lang: lang ?? this.lang,
       deviceId: deviceId ?? this.deviceId,
+      correlationId: correlationId ?? this.correlationId,
     );
   }
 
@@ -101,5 +106,6 @@ class LogMessage extends Equatable {
         appVersion,
         lang,
         deviceId,
+        correlationId,
       ];
 }
diff --git a/lib/core/logging/logging_service.dart b/lib/core/logging/logging_service.dart
@@ -23,6 +23,8 @@ mixin ILoggingInfo {
 
   Future<void> error(String message);
 
+  Future<void> logRequest(String method, String string, String correlationId);
+
   void logExceptionForDebug(Object e, {StackTrace? stacktrace});
 }
 
@@ -35,7 +37,12 @@ class LoggingInfo implements ILoggingInfo {
 
   static LoggingInfo get instance => _singleton;
 
-  Future<void> _log(String message, String methodName, Level level) async {
+  Future<void> _log(
+    String message,
+    String methodName,
+    Level level, {
+    String? correlationId,
+  }) async {
     dev.log(message);
     final info = await PackageInfo.fromPlatform();
     final isDebug = info.packageName.contains('test');
@@ -50,6 +57,7 @@ class LoggingInfo implements ILoggingInfo {
       lang: Platform.localeName,
       method: methodName,
       appVersion: '${info.version}.${info.buildNumber}',
+      correlationId: correlationId,
     );
 
     if (Platform.isAndroid) {
@@ -175,4 +183,18 @@ class LoggingInfo implements ILoggingInfo {
   void logExceptionForDebug(Object e, {StackTrace? stacktrace}) {
     unawaited(debug(e.toString(), methodName: stacktrace.toString()));
   }
+
+  @override
+  Future<void> logRequest(
+    String method,
+    String url,
+    String correlationId,
+  ) async {
+    await _log(
+      '$method: $url',
+      'Request',
+      Level.INFO,
+      correlationId: correlationId,
+    );
+  }
 }
diff --git a/lib/core/network/token_interceptor.dart b/lib/core/network/token_interceptor.dart
@@ -7,18 +7,23 @@ import 'package:givt_app/features/auth/models/session.dart';
 import 'package:givt_app/features/auth/repositories/auth_repository.dart';
 import 'package:http_interceptor/http_interceptor.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:uuid/uuid.dart';
 
 class TokenInterceptor implements InterceptorContract {
   @override
   Future<BaseRequest> interceptRequest({required BaseRequest request}) async {
+    final correlationId = const Uuid().v4();
+
     try {
       final prefs = await SharedPreferences.getInstance();
       final sessionString = prefs.getString(Session.tag);
 
       if (!request.headers.containsKey('Content-Type')) {
         request.headers['Content-Type'] = 'application/json';
       }
+
       request.headers['Accept'] = 'application/json';
+      request.headers['Correlation-Id'] = correlationId;
 
       if (sessionString == null) {
         return request;
@@ -37,8 +42,11 @@ class TokenInterceptor implements InterceptorContract {
         methodName: stackTrace.toString(),
       );
     }
-    await LoggingInfo.instance.info(
-      '${request.method}: ${request.url}',
+
+    await LoggingInfo.instance.logRequest(
+      request.method,
+      request.url.toString(),
+      correlationId,
     );
     return request;
   }

diff --git a/lib/features/give/pages/bt_scan_page.dart b/lib/features/give/pages/bt_scan_page.dart
@@ -15,7 +15,9 @@ import 'package:go_router/go_router.dart';
 import 'package:sprintf/sprintf.dart';
 
 class BTScanPage extends StatefulWidget {
-  const BTScanPage({super.key});
+  const BTScanPage({
+    super.key,
+  });
 
   @override
   State<BTScanPage> createState() => _BTScanPageState();
@@ -94,31 +96,24 @@ class _BTScanPageState extends State<BTScanPage> {
               },
             ),
           );
+        case BluetoothAdapterState.unavailable:
         case BluetoothAdapterState.off:
           await LoggingInfo.instance.info('Bluetooth adapter is off');
           if (Platform.isAndroid) {
             await LoggingInfo.instance.info('Trying to turn it on...');
-            await FlutterBluePlus.turnOn();
+            try {
+              await FlutterBluePlus.turnOn(timeout: 10);
+            } catch (_) {
+              // We can't turn on the bluetooth automatically, so show a dialog
+              await showTurnOnBluetoothDialog();
+            }
           }
           if (Platform.isIOS) {
             await LoggingInfo.instance.info('iOS User has Bluetooth off...');
             if (!context.mounted) {
               return;
             }
-            await showDialog<void>(
-              context: context,
-              builder: (_) => WarningDialog(
-                title: context.l10n.turnOnBluetooth,
-                content: context.l10n.bluetoothErrorMessage,
-                onConfirm: () async {
-                  await startBluetoothScan();
-                  if (!context.mounted) {
-                    return;
-                  }
-                  Navigator.of(context).pop();
-                },
-              ),
-            );
+            await showTurnOnBluetoothDialog();
           }
         // We don't want to handle other cases at the moment, so:
         // ignore: no_default_cases
@@ -137,6 +132,19 @@ class _BTScanPageState extends State<BTScanPage> {
     });
   }
 
+  Future<void> showTurnOnBluetoothDialog() {
+    return showDialog<void>(
+      context: context,
+      builder: (_) => WarningDialog(
+        title: context.l10n.turnOnBluetooth,
+        content: context.l10n.bluetoothErrorMessage,
+        onConfirm: () async {
+          Navigator.of(context).pop();
+        },
+      ),
+    );
+  }
+
   void _onPeripheralsDetectedData(List<ScanResult> results) {
     for (final scanResult in results) {
       if (scanResult.advertisementData.advName.isEmpty) {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: givt_app
 description: Givt App
-version: 4.2.21
+version: 4.2.22
 publish_to: none
 
 environment: