Merge pull request #13 from mario-bermonti:fix-12

Use firebase.uid as participantID

lib/src/auth/auth.dart

@@ -0,0 +1,20 @@
+import 'package:firebase_auth/firebase_auth.dart';
+import 'package:mdigit_span_tasks_ema/src/auth/participant.dart';
+
+/// Manages authorization processes for the app
+class Auth {
+  /// [FirebaseAuth] instance used to access auth functionality.
+  final FirebaseAuth auth;
+
+  Auth({required this.auth});
+
+  ///  Anonymously add or sign in the participant into firebase.
+  Future<Participant> signIn() async {
+    final UserCredential userCredential = await auth.signInAnonymously();
+    final Participant participant = Participant(
+      uid: userCredential.user?.uid,
+      registerDateTime: userCredential.user?.metadata.creationTime,
+    );
+    return participant;
+  }
+}

lib/src/auth/participant.dart

@@ -0,0 +1,19 @@
+/// Represents a single study participant.
+/// Can be used to keep track of participants' important info, including
+/// "identifying" info.
+class Participant {
+  late final String uid;
+  late final DateTime registerDateTime;
+
+  Participant({
+    required String? uid,
+    required DateTime? registerDateTime,
+  }) {
+    if (uid == null || registerDateTime == null) {
+      throw Exception('Error creating participant model');
+    } else {
+      this.uid = uid;
+      this.registerDateTime = registerDateTime;
+    }
+  }
+}

lib/src/services/run_session.dart

@@ -1,12 +1,10 @@
 import 'package:digit_span_tasks/digit_span_tasks.dart';
 import 'package:firebase_auth/firebase_auth.dart';
-import 'package:flutter/material.dart';
+import 'package:mdigit_span_tasks_ema/src/auth/participant.dart';
 import 'package:mdigit_span_tasks_ema/src/data_manager/session_id_creator.dart';
-import 'package:mdigit_span_tasks_ema/src/services/auth.dart';
+import 'package:mdigit_span_tasks_ema/src/auth/auth.dart';
 import 'package:mdigit_span_tasks_ema/src/services/data_processor.dart';
 
-import '../participant_info/participant_info_dialog.dart';
-
 /// Run a data collection session
 /// Running a session includes configuring everything needed and running a
 /// cognitive task specified with [taskRunner].
@@ -16,7 +14,9 @@ void runSession(
       required String sessionID,
     }) taskRunner,
     required String taskName}) async {
-  final String participantID = await showParticipantInfoDialog();
+  final Participant participant =
+      await Auth(auth: FirebaseAuth.instance).signIn();
+  final String participantID = participant.uid;
 
   /// We use the startTime for the practice session to create a single
   /// session id for both practice and experimental data.
@@ -29,8 +29,6 @@ void runSession(
     sessionID: sessionID,
   );
 
-  await Auth(auth: FirebaseAuth.instance).signIn();
-
   await processData(
     participantID: participantID,
     sessionID: sessionID,

test/src/services/auth_test.dart → test/src/auth/auth_test.dart

@@ -1,6 +1,6 @@
 import 'package:firebase_auth_mocks/firebase_auth_mocks.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:mdigit_span_tasks_ema/src/services/auth.dart';
+import 'package:mdigit_span_tasks_ema/src/auth/auth.dart';
 
 void main() {
   test(

test/src/auth/participant_test.dart

@@ -0,0 +1,23 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mdigit_span_tasks_ema/src/auth/participant.dart';
+
+void main() {
+  test(
+    "When passing a null uid, Participant's constructor will throw an exception",
+    () {
+      expect(
+        () => Participant(uid: null, registerDateTime: DateTime.now()),
+        throwsException,
+      );
+    },
+  );
+  test(
+    "When passing a null registerDateTime, Participant's constructor will throw an exception",
+    () {
+      expect(
+        () => Participant(uid: 'uid', registerDateTime: null),
+        throwsException,
+      );
+    },
+  );
+}