Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT'

From ENV-DEV into ENV-DEPLOYMENT

See merge request !1649

src/container/Auth/Login.js

@@ -97,8 +97,8 @@ class Login extends Component {
       if (response.data) {
         if (response.ok) {
             if (response.data.status === 'success') {
-                // console.log(response.data.data
-              if (response.data.data.role_id === 185 || response.data.data.role_id === 1){
+                // console.log(response.data.data)
+              if (response.data.data.role_id === 185 && response.data.maintenance_mode === 'ACTIVE'){
                 this.props.history.push('/maintenance')
               } else {
                 localStorage.setItem(Constant.TOKEN, response.data.data.token)