update user agent

Author: abbybernstein

Agents/UserAgent/docker-compose.yml

@@ -2,5 +2,5 @@ version: "3.8"
 
 services:
   user-agent:
-    image: ghcr.io/cambridge-cares/user-agent:1.0.0
+    image: ghcr.io/cambridge-cares/user-agent:2.0.0
     build: .

Agents/UserAgent/stack-manager-config/inputs/config/services/user-agent-debug.json

@@ -4,7 +4,7 @@
     "Name": "user-agent",
     "TaskTemplate": {
       "ContainerSpec": {
-        "Image": "user-agent:1.0.0",
+        "Image": "user-agent:2.0.0",
         "Mounts": [
           {
             "Type": "bind",

Agents/UserAgent/stack-manager-config/inputs/config/services/user-agent.json

@@ -4,7 +4,7 @@
     "Name": "user-agent",
     "TaskTemplate": {
       "ContainerSpec": {
-        "Image": "ghcr.io/cambridge-cares/user-agent:1.0.0",
+        "Image": "ghcr.io/cambridge-cares/user-agent:2.0.0",
         "Mounts": [
           {
             "Type": "bind",

Apps/TimelineApp/core/sensor/src/main/java/uk/ac/cam/cares/jps/sensor/source/network/UserPhoneNetworkSource.java

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 
+import com.android.volley.AuthFailureError;
 import com.android.volley.Request;
 import com.android.volley.RequestQueue;
 import com.android.volley.Response;
@@ -11,6 +12,9 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import okhttp3.HttpUrl;
 
 /**
@@ -37,19 +41,28 @@ public void registerAppToUser(String userId, String deviceId, Response.Listener<
 
         try {
             JSONObject body = new JSONObject();
-            body.put("userId", userId);
+            //body.put("userId", userId);
             body.put("phoneId", deviceId);
 
             String url = HttpUrl.get(context.getString(uk.ac.cam.cares.jps.utils.R.string.host_with_port)).newBuilder()
                     .addPathSegments(context.getString(uk.ac.cam.cares.jps.utils.R.string.useragent_registerphone))
                     .build().toString();
 
             JsonObjectRequest request = new JsonObjectRequest(Request.Method.POST, url, body, jsonObject -> {
+                
                 LOGGER.info(String.format("Phone id %s is register to user %s", deviceId, userId));
                 onSuccessListener.onResponse(true);
             }, volleyError -> {
                 LOGGER.error(volleyError.getMessage());
-            });
+            }) {
+
+                @Override
+                public Map<String, String> getHeaders() throws AuthFailureError {
+                    Map<String, String> headers = new HashMap<>();
+                    headers.put("Authorization", "Bearer " + userId); // Ensure this is the correct user
+                    return headers;
+                }
+            };
 
             requestQueue.add(request);
         } catch (JSONException e) {

Deploy/stacks/timeline/prod/stack-manager/inputs/config/services/user-agent.json

@@ -4,7 +4,7 @@
         "Name": "user-agent",
         "TaskTemplate": {
             "ContainerSpec": {
-                "Image": "ghcr.io/cambridge-cares/user-agent:1.0.0",
+                "Image": "ghcr.io/cambridge-cares/user-agent:2.0.0",
                 "Mounts": [
                     {
                         "Type": "bind",

Deploy/stacks/timeline/test/stack-manager/inputs/config/services/user-agent.json

@@ -4,7 +4,7 @@
     "Name": "user-agent",
     "TaskTemplate": {
       "ContainerSpec": {
-        "Image": "ghcr.io/cambridge-cares/user-agent:1.0.0",
+        "Image": "ghcr.io/cambridge-cares/user-agent:2.0.0",
         "Mounts": [
           {
             "Type": "bind",