Swith to POST session request with webClientId and updateType

Author: zmerp

alvr/web_server/src/main.rs

@@ -8,7 +8,7 @@ use logging_backend::*;
 use settings_schema::Switch;
 use std::{
     path::PathBuf,
-    sync::{Arc, Mutex},
+    sync::{Arc, Mutex, atomic::*},
     time::SystemTime,
 };
 use tail::tail_stream;
@@ -225,48 +225,27 @@ async fn run(log_senders: Arc<Mutex<Vec<UnboundedSender<String>>>>) -> StrResult
                 let session_manager = session_manager.clone();
                 move || reply::json(session_manager.lock().unwrap().get())
             })
-            .or(warp::path!(String).and(body::json()).map({
+            .or(warp::path!(String / String).and(body::json()).map({
                 let session_manager = session_manager.clone();
-                move |meta_str: String, value: serde_json::Value| {
-                    let meta_list = meta_str.split('?').collect::<Vec<_>>();
-                    if meta_list.len() == 2 {
-                        let update_author_id = meta_list[0];
-                        if let Ok(update_type) = serde_json::from_str(meta_list[1]) {
-                            let res = session_manager
-                                .lock()
-                                .unwrap()
-                                .get_mut(update_author_id, update_type)
-                                .merge_from_json(value);
-                            if let Err(e) = res {
-                                warn!("{}", e);
-                                // HTTP Code: WARNING
-                                return reply::with_status(
-                                    reply(),
-                                    StatusCode::from_u16(199).unwrap(),
-                                );
-                            } else {
-                                return reply::with_status(reply(), StatusCode::OK);
-                            }
+                move |update_type: String, update_author_id: String, value: serde_json::Value| {
+                    if let Ok(update_type) = serde_json::from_str(&format!("\"{}\"", update_type)) {
+                        let res = session_manager
+                            .lock()
+                            .unwrap()
+                            .get_mut(&update_author_id, update_type)
+                            .merge_from_json(value);
+                        if let Err(e) = res {
+                            warn!("{}", e);
+                            // HTTP Code: WARNING
+                            reply::with_status(reply(), StatusCode::from_u16(199).unwrap())
+                        } else {
+                            reply::with_status(reply(), StatusCode::OK)
                         }
+                    } else {
+                        reply::with_status(reply(), StatusCode::BAD_REQUEST)
                     }
-                    reply::with_status(reply(), StatusCode::BAD_REQUEST)
                 }
-            }))
-            // stopgap. todo: remove
-            .or(warp::post().and(body::json().map(move |value| {
-                let res = session_manager
-                    .lock()
-                    .unwrap()
-                    .get_mut("", SessionUpdateType::Settings)
-                    .merge_from_json(value);
-                if let Err(e) = res {
-                    warn!("{}", e);
-                    // HTTP Code: WARNING
-                    reply::with_status(reply(), StatusCode::from_u16(199).unwrap())
-                } else {
-                    reply::with_status(reply(), StatusCode::OK)
-                }
-            }))),
+            })),
     );
 
     let log_subscription = warp::path("log").and(warp::ws()).map(move |ws: Ws| {

server_release_template/web_gui/js/app/customSettings.js

@@ -81,7 +81,7 @@ define([
                 controllerMode.val(controller.val());
                 alvrSettings.storeParam(controllerMode, true);
 
-                alvrSettings.storeSession();
+                alvrSettings.storeSession("settings");
             });
 
             controller.val(controllerMode.val());
@@ -105,7 +105,7 @@ define([
                     target.val(headsetOptions[headset.val()][key]);
                     alvrSettings.storeParam(target, true);
                 }
-                alvrSettings.storeSession();
+                alvrSettings.storeSession("settings");
             });
 
             if ($(headsetBase + "modelNumber").val() == "Oculus Rift S") {
@@ -269,7 +269,7 @@ define([
                 $("#_root_video_renderResolution_scale-choice-").prop("checked", true);
                 alvrSettings.storeParam($("#_root_video_renderResolution_scale-choice-"), true);
 
-                alvrSettings.storeSession();
+                alvrSettings.storeSession("settings");
             });
 
         }
@@ -311,7 +311,7 @@ define([
 
 
 
-                alvrSettings.storeSession();
+                alvrSettings.storeSession("settings");
 
             });
 

server_release_template/web_gui/js/app/settings.js

@@ -17,24 +17,36 @@ define([
         var index = 0;
         const usedi18n = {};
 
+        function randomAlphanumericID() {
+            const len = 10;
+            const arr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghilmnopqrstuvwxyz0123456789";
+            var ans = '';
+            for (var i = len; i > 0; i--) {
+                ans += arr[Math.floor(Math.random() * arr.length)];
+            }
+            return ans;
+        }
+
+        var webClientId = randomAlphanumericID();
+
         self.disableWizard = function () {
             session.setupWizard = false;
-            self.storeSession();
+            self.storeSession("other");
         }
 
         self.updateClientTrustState = function (sessionListIndex, state) {
             session.lastClients[sessionListIndex].state = state;
-            self.storeSession();
+            self.storeSession("clientList");
         }
 
         self.pushManualClient = function (descriptor) {
             session.lastClients.push(descriptor);
-            self.storeSession();
+            self.storeSession("clientList");
         }
 
         self.removeClient = function (sessionListIndex) {
             session.lastClients.splice(sessionListIndex, 1);
-            self.storeSession();
+            self.storeSession("clientList");
         }
 
         function init() {
@@ -155,18 +167,18 @@ define([
             _.set(session.settingsCache, finalPath, val);
 
             if (!skipstoreSession) {
-                self.storeSession();
+                self.storeSession("settings");
             }
         }
 
-        self.storeSession = function () {
+        self.storeSession = function (updateType) {
             if (updating) {
                 return;
             }
 
             $.ajax({
                 type: "POST",
-                url: "../../session",
+                url: `../../session/${updateType}/${webClientId}`,
                 contentType: "application/json;charset=UTF-8",
                 data: JSON.stringify(session),
                 processData: false,