ROKMETRO Updates

.gitignore

@@ -27,3 +27,4 @@
 .dart_tool/
 .packages
 build/
+temp.enc

CHANGELOG.md

@@ -8,7 +8,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <!-- The next version number should be the version from pubspec.yaml - 1.7.0 -->
 ### Changed
 - Upgrade to Flutter 3.19.0 [#435](https://github.com/rokwire/app-flutter-plugin/issues/435).
-- Init application services in parallel [#408](https://github.com/rokwire/app-flutter-plugin/issues/408).
+- Integrate auth refactor [#379](https://github.com/rokwire/app-flutter-plugin/issues/379)
+- Use CCT for Android OIDC login [#404](https://github.com/rokwire/app-flutter-plugin/issues/404)
+- Improve services init on app startup [#408](https://github.com/rokwire/app-flutter-plugin/issues/408)
+- Improve services failure processing [#408](https://github.com/rokwire/app-flutter-plugin/issues/408)
+
+### Added
+- Web app authentication support [#291](https://github.com/rokwire/app-flutter-plugin/issues/291)
+- Web app passkey support [#299](https://github.com/rokwire/app-flutter-plugin/issues/299)
+- Anonymous account association [#305](https://github.com/rokwire/app-flutter-plugin/issues/305)
+- Add timestamps to anonymous IDs [#309](https://github.com/rokwire/app-flutter-plugin/issues/309)
+- Web app authentication support [#291](https://github.com/rokwire/app-flutter-plugin/issues/291)
+- Handle more identifiers using passkeys and linking [#330](https://github.com/rokwire/app-flutter-plugin/issues/330)
+- Style code generation tools
+
+### Fixed
+- Improve exception handling for passkeys [#396](https://github.com/rokwire/app-flutter-plugin/issues/396)
 
 ## [1.6.3] - 2024-02-19
 ### Added

README.md

@@ -44,3 +44,38 @@ git submodule add https://github.com/rokwire/services-flutter-pligin.git <plugin
   rokwire_plugin:
     path: <plugin-name>
 ```
+
+## Tools
+This plugin provides several tools that make it easier to use and manage the functionality it provides
+
+### Generating Static Style Types
+The `tools/gen_styles.dart` tool can be used to generate classes from the `styles.json` asset which 
+expose static references that can be easily accessed programmatically. To use this tool, navigate
+to the root directory of your application and ensure that this plugin is cloned as a submodule in 
+the `plugin` directory. Ensure that `assets/styles.json` is valid and up to date with your desired
+changes. To use the tool, run the following command:
+
+```
+dart plugin/tools/gen_styles.dart
+```
+
+If successful, you will see a new or updates `gen/styles.dart` file available with the generated classes.
+You can then import this file and use the included references throughout the application.
+
+This tool will also attempt to merge any new additions from `plugin/assets/styles.json` into `assets/styles.json`
+Any existing entries in `assets/styles.json` will not be overridden. To run this tool without attempting
+to merge plugin asset changes, or to run this tool within the plugin itself, provide the `-p` flag:
+
+```
+dart plugin/tools/gen_styles.dart -p
+```
+
+Note that this tool also includes a utility which can find and replace all existing references 
+in the codebase with the new static class members. To use this util after generating the classes, 
+provide the `-u` flag:
+
+```
+dart plugin/tools/gen_styles.dart -u
+```
+
+

android/build.gradle

@@ -2,13 +2,18 @@ group 'edu.illinois.rokwire.rokwire_plugin'
 version '1.0'
 
 buildscript {
+    ext {
+        gradle_version = '7.0.0'
+        kotlin_version = '1.8.10'
+    }
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath "com.android.tools.build:gradle:$gradle_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
@@ -20,6 +25,7 @@ rootProject.allprojects {
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 33
@@ -30,7 +36,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 26
     }
 }
 
@@ -45,5 +51,9 @@ dependencies {
     //AltBeacon - Android Beacon Library
     implementation 'org.altbeacon:android-beacon-library:2.19.5-beta7'
 
+    //Passkeys
+    implementation "androidx.credentials:credentials:1.0.0-alpha03"
+    implementation "androidx.credentials:credentials-play-services-auth:1.0.0-alpha03"
+
     //End Common Dependencies
 }

android/src/main/java/edu/illinois/rokwire/rokwire_plugin/GeofenceMonitor.java

@@ -51,6 +51,7 @@
 import java.util.UUID;
 
 import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
@@ -88,8 +89,8 @@ public static GeofenceMonitor getInstance() {
     public void init() {
         Context activityContext = RokwirePlugin.getInstance().getActivity();
         if ((activityContext != null) &&
-            (ContextCompat.checkSelfPermission(activityContext, android.Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) &&
-            (ContextCompat.checkSelfPermission(activityContext, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED)) {
+                (ContextCompat.checkSelfPermission(activityContext, android.Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) &&
+                (ContextCompat.checkSelfPermission(activityContext, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED)) {
             Log.d(TAG, "Location Permissions Granted.");
             initGeofenceClient();
             initBeaconManager();
@@ -352,6 +353,10 @@ private void startMonitorGeofenceRegions(List<Geofence> geofenceList) {
         builder.setInitialTrigger(GeofencingRequest.INITIAL_TRIGGER_ENTER);
         builder.addGeofences(geofenceList);
         GeofencingRequest geofencingRequest = builder.build();
+        Context context = RokwirePlugin.getInstance().getActivity();
+        if (ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+            return;
+        }
         geofencingClient.addGeofences(geofencingRequest, getGeofencePendingIntent()).
                 addOnSuccessListener(addGeofencesSuccessListener).
                 addOnFailureListener(addGeofencesFailureListener);
@@ -381,15 +386,15 @@ private PendingIntent getGeofencePendingIntent() {
 
     private void notifyCurrentGeofencesUpdated() {
         //TBD
-        RokwirePlugin.getInstance().notifyGeoFence​("onCurrentRegionsChanged", getCurrentIds());
+        RokwirePlugin.getInstance().notifyGeoFence("onCurrentRegionsChanged", getCurrentIds());
     }
 
     private void notifyRegionEnter(String regionId) {
-        RokwirePlugin.getInstance().notifyGeoFence​("onEnterRegion", regionId);
+        RokwirePlugin.getInstance().notifyGeoFence("onEnterRegion", regionId);
     }
 
     private void notifyRegionExit(String regionId) {
-        RokwirePlugin.getInstance().notifyGeoFence​("onExitRegion", regionId);
+        RokwirePlugin.getInstance().notifyGeoFence("onExitRegion", regionId);
     }
 
     //region Add Geofences Listeners
@@ -539,7 +544,7 @@ private void notifyBeacons(List<HashMap> beaconsList, String regionId) {
         HashMap<String, Object> parameters = new HashMap<>();
         parameters.put("regionId", regionId);
         parameters.put("beacons", beaconsList);
-        RokwirePlugin.getInstance().notifyGeoFence​("onBeaconsInRegionChanged", parameters);
+        RokwirePlugin.getInstance().notifyGeoFence("onBeaconsInRegionChanged", parameters);
     }
 
     @Override

android/src/main/java/edu/illinois/rokwire/rokwire_plugin/RokwirePlugin.java

@@ -14,6 +14,7 @@
 import androidx.annotation.NonNull;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
+import androidx.credentials.exceptions.GetCredentialException;
 
 import java.lang.ref.WeakReference;
 
@@ -25,6 +26,7 @@
 import android.util.Log;
 
 import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -93,7 +95,7 @@ public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
   // ActivityAware
 
   @Override
-  public void onAttachedToActivity​(ActivityPluginBinding binding) {
+  public void onAttachedToActivity(@NonNull ActivityPluginBinding binding) {
     _applyActivityBinding(binding);
   }
 
@@ -103,7 +105,7 @@ public void	onDetachedFromActivity() {
   }
 
   @Override
-  public void	onReattachedToActivityForConfigChanges​(ActivityPluginBinding binding) {
+  public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBinding binding) {
     _applyActivityBinding(binding);
   }
 
@@ -130,45 +132,48 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
       nextMethodComponents = call.method.substring(pos + 1);
     }
 
-    if (firstMethodComponent.equals("getPlatformVersion")) {
-      result.success("Android " + android.os.Build.VERSION.RELEASE);
-    }
-    else if (firstMethodComponent.equals("createAndroidNotificationChannel")) {
-      result.success(createNotificationChannel(call));
-    }
-    else if (firstMethodComponent.equals("showNotification")) {
-      result.success(showNotification(call));
-    }
-    else if (firstMethodComponent.equals("getDeviceId")) {
-      result.success(getDeviceId(call.arguments));
-    }
-    else if (firstMethodComponent.equals("getEncryptionKey")) {
-      result.success(getEncryptionKey(call.arguments));
-    }
-    else if (firstMethodComponent.equals("dismissSafariVC")) {
-      result.success(null); // Safari VV not available in Android
-    }
-    else if (firstMethodComponent.equals("launchApp")) {
-      result.success(launchApp(call.arguments));
-    }
-    else if (firstMethodComponent.equals("launchAppSettings")) {
-      result.success(launchAppSettings(call.arguments));
-    }
-    else if (firstMethodComponent.equals("locationServices")) {
-      LocationServices.getInstance().handleMethodCall(nextMethodComponents, call.arguments, result);
-    }
-    else if (firstMethodComponent.equals("trackingServices")) {
-      result.success("allowed"); // tracking is allowed in Android by default
-    }
-    else if (firstMethodComponent.equals("geoFence")) {
-      GeofenceMonitor.getInstance().handleMethodCall(nextMethodComponents, call.arguments, result);
-    }
-    else {
-      result.notImplemented();
+    switch (firstMethodComponent) {
+      case "getPlatformVersion":
+        result.success("Android " + Build.VERSION.RELEASE);
+        break;
+      case "createAndroidNotificationChannel":
+        result.success(createNotificationChannel(call));
+        break;
+      case "showNotification":
+        result.success(showNotification(call));
+        break;
+      case "getDeviceId":
+        result.success(getDeviceId(call.arguments));
+        break;
+      case "getEncryptionKey":
+        result.success(getEncryptionKey(call.arguments));
+        break;
+      case "dismissSafariVC":
+        result.success(null); // Safari VV not available in Android
+        break;
+      case "launchApp":
+        result.success(launchApp(call.arguments));
+        break;
+      case "launchAppSettings":
+        result.success(launchAppSettings(call.arguments));
+        break;
+      case "locationServices":
+        assert nextMethodComponents != null;
+        LocationServices.getInstance().handleMethodCall(nextMethodComponents, call.arguments, result);
+        break;
+      case "trackingServices":
+        result.success("allowed"); // tracking is allowed in Android by default
+        break;
+      case "geoFence":
+        GeofenceMonitor.getInstance().handleMethodCall(nextMethodComponents, call.arguments, result);
+        break;
+      default:
+        result.notImplemented();
+        break;
     }
   }
 
-  public void notifyGeoFence​(String event, Object arguments) {
+  public void notifyGeoFence(String event, Object arguments) {
     Activity activity = getActivity();
     if ((activity != null) && (_channel != null)) {
       activity.runOnUiThread(() -> _channel.invokeMethod(String.format("geoFence.%s", event), arguments));
@@ -185,7 +190,7 @@ public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
   // PluginRegistry.RequestPermissionsResultListener
 
   @Override
-  public boolean onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+  public boolean onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
     if (requestCode == LocationServices.LOCATION_PERMISSION_REQUEST_CODE) {
       return LocationServices.getInstance().onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
@@ -212,7 +217,7 @@ private String getDeviceId(Object params) {
     {
       UUID uuid;
       final String androidId = Settings.Secure.getString(getActivity().getContentResolver(), Settings.Secure.ANDROID_ID);
-      uuid = UUID.nameUUIDFromBytes(androidId.getBytes("utf8"));
+      uuid = UUID.nameUUIDFromBytes(androidId.getBytes(StandardCharsets.UTF_8));
       deviceId = uuid.toString();
     }
     catch (Exception e)
@@ -226,12 +231,11 @@ private boolean createNotificationChannel(MethodCall call) {
     // Create the NotificationChannel, but only on API 26+ because
     // the NotificationChannel class is new and not in the support library
     Context appContext = (_flutterBinding != null) ? _flutterBinding.getApplicationContext() : null;
-    if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) && (appContext != null)) {
-
+    if (appContext != null) {
       try {
-        String id = call.hasArgument​("id") ? call.argument("id") : "edu.illinois.rokwire.firebase_messaging.notification_channel";
-        String name = call.hasArgument​("name") ? call.argument("name") : "Rokwire";
-        int importance = call.hasArgument​("importance") ? call.argument("importance") : android.app.NotificationManager.IMPORTANCE_DEFAULT;
+        String id = call.hasArgument("id") ? call.argument("id") : "edu.illinois.rokwire.firebase_messaging.notification_channel";
+        String name = call.hasArgument("name") ? call.argument("name") : "Rokwire";
+        int importance = call.hasArgument("importance") ? call.argument("importance") : android.app.NotificationManager.IMPORTANCE_DEFAULT;
 
         NotificationChannel channel = new NotificationChannel(id, name, importance);
         String description = call.argument("description");
@@ -340,16 +344,14 @@ private Object getEncryptionKey(Object params) {
     }
     String base64KeyValue = Utils.AppSecureSharedPrefs.getString(getActivity(), identifier, null);
     byte[] encryptionKey = Utils.Base64.decode(base64KeyValue);
-    if ((encryptionKey != null) && (encryptionKey.length == keySize)) {
-      return base64KeyValue;
-    } else {
+    if ((encryptionKey == null) || (encryptionKey.length != keySize)) {
       byte[] keyBytes = new byte[keySize];
       SecureRandom secRandom = new SecureRandom();
       secRandom.nextBytes(keyBytes);
       base64KeyValue = Utils.Base64.encode(keyBytes);
       Utils.AppSecureSharedPrefs.saveString(getActivity(), identifier, base64KeyValue);
-      return base64KeyValue;
     }
+    return base64KeyValue;
   }
 
   // Helpers