feat: implement _isLoggable and corrected categoryLogLevel in UserLog…

…Level class
aws-amplify · Oct 4, 2023 · 0cc7564 · 0cc7564
1 parent 6640039
commit 0cc7564
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/packages/amplify_core/lib/src/config/logging/cloudwatch_logging_config.dart b/packages/amplify_core/lib/src/config/logging/cloudwatch_logging_config.dart
@@ -161,7 +161,7 @@ class UserLogLevel
       _$UserLogLevelFromJson(json);
 
   final LogLevel defaultLogLevel;
-  final Map<String, String> categoryLogLevel;
+  final Map<String, LogLevel> categoryLogLevel;
 
   @override
   List<Object?> get props => [defaultLogLevel, categoryLogLevel];

diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/cloudwatch_logger_plugin.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/cloudwatch_logger_plugin.dart
@@ -304,7 +304,38 @@ class CloudWatchLoggerPlugin extends AWSLoggerPlugin
     if (!_enabled) {
       return false;
     }
+
     final loggingConstraint = _getLoggingConstraint();
+
+    String? userId;
+
+    Amplify.Hub.listen(HubChannel.Auth, (AuthHubEvent event) async {
+      if (event.type == AuthHubEventType.signedOut ||
+          event.type == AuthHubEventType.userDeleted ||
+          event.type == AuthHubEventType.sessionExpired) {
+        userId = null;
+      }
+      if (event.type == AuthHubEventType.signedIn) {
+        userId = event.payload?.userId;
+      }
+    });
+
+    if (loggingConstraint.userLogLevel.containsKey(userId)) {
+      final userLevel = loggingConstraint.userLogLevel[userId]!;
+
+      if (userLevel.categoryLogLevel.containsKey(logEntry.loggerName)) {
+        return logEntry.level >=
+            userLevel.categoryLogLevel[logEntry.loggerName]!;
+      }
+
+      return logEntry.level >= userLevel.defaultLogLevel;
+    }
+
+    if (loggingConstraint.categoryLogLevel.containsKey(logEntry.loggerName)) {
+      return logEntry.level >=
+          loggingConstraint.categoryLogLevel[logEntry.loggerName]!;
+    }
+
     return logEntry.level >= loggingConstraint.defaultLogLevel;
   }