Keep full screen mode after redirecting to locked/dashboard

front/src/actions/main.js

@@ -84,7 +84,7 @@ function createActions(store) {
         const gatewayErrorMessage = get(e, 'response.data.error_message');
         const errorMessageOtherFormat = get(e, 'response.data.message');
         if (status === 401 && errorMessageOtherFormat === 'TABLET_IS_LOCKED') {
-          route('/locked');
+          route(`/locked${window.location.search}`);
         } else if (status === 401) {
           state.session.reset();
           actions.redirectToLogin();

front/src/routes/dashboard/index.js

@@ -155,19 +155,23 @@ class Dashboard extends Component {
     this.props.setFullScreen(isFullScreen);
   };
 
+  redirectToLocked = () => {
+    route(`/locked${window.location.search}`);
+  };
+
   alarmArmed = async () => {
     // Check server side if we are in tablet mode
     try {
       const currentSession = await this.props.httpClient.get('/api/v1/session/tablet_mode');
       if (currentSession.tablet_mode) {
-        route('/locked');
+        this.redirectToLocked();
       }
     } catch (e) {
       console.error(e);
       const status = get(e, 'response.status');
       const errorMessageOtherFormat = get(e, 'response.data.message');
       if (status === 401 && errorMessageOtherFormat === 'TABLET_IS_LOCKED') {
-        route('/locked');
+        this.redirectToLocked();
       }
     }
   };

front/src/routes/locked/index.js

@@ -73,15 +73,19 @@ class Locked extends Component {
       return { ...prevState, currentCode: prevState.currentCode + letter };
     });
   };
+  redirectToDashboard = () => {
+    route(`/dashboard${window.location.search}`);
+  };
   init = async () => {
     try {
       // We make a dumb request just to verify if our token is valid
       await this.props.httpClient.post('/api/v1/access_token', {
         refresh_token: this.props.session.getRefreshToken(),
         scope: ['dashboard:write']
       });
+
       // if this resolves, we redirect to dashboard
-      route('/dashboard');
+      this.redirectToDashboard();
     } catch (e) {
       this.props.httpClient.setApiScopes(['alarm:write']);
       await this.props.httpClient.refreshAccessToken();
@@ -101,7 +105,7 @@ class Locked extends Component {
       if (event.house === houseSelector) {
         this.props.httpClient.resetApiScopes();
         await this.props.httpClient.refreshAccessToken();
-        route('/dashboard');
+        this.redirectToDashboard();
       }
     } catch (e) {
       console.error(e);