disable device step if device management is disabled

Author: wojcik91

web/src/pages/enrollment/components/EnrollmentSideBar/EnrollmentSideBar.tsx

@@ -17,6 +17,11 @@ export const EnrollmentSideBar = () => {
   const vpnOptional = useEnrollmentStore(
     (state) => state.enrollmentSettings?.vpn_setup_optional,
   );
+  const deviceManagementDisabled = useEnrollmentStore((state) =>
+    Boolean(
+      state.enrollmentSettings?.admin_device_management && !state.userInfo?.is_admin,
+    ),
+  );
   const [currentStep, stepsMax] = useEnrollmentStore((state) => [
     state.step,
     state.stepsMax,
@@ -48,12 +53,17 @@ export const EnrollmentSideBar = () => {
       stepsLL.welcome(),
       stepsLL.verification(),
       stepsLL.password(),
-      ...(!enrollmentSettings?.only_client_activation
-        ? [vpnStep, stepsLL.finish()]
-        : [stepsLL.finish()]),
+      ...(enrollmentSettings?.only_client_activation || deviceManagementDisabled
+        ? [stepsLL.finish()]
+        : [vpnStep, stepsLL.finish()]),
     ];
     return steps;
-  }, [LL.pages.enrollment.sideBar.steps, vpnOptional, enrollmentSettings]);
+  }, [
+    LL.pages.enrollment.sideBar.steps,
+    vpnOptional,
+    enrollmentSettings,
+    deviceManagementDisabled,
+  ]);
 
   return (
     <div id="enrollment-side-bar">

web/src/pages/enrollment/steps/DeviceStep/DeviceStep.tsx

@@ -24,6 +24,11 @@ export const DeviceStep = () => {
   const setStore = useEnrollmentStore((state) => state.setState);
   const deviceState = useEnrollmentStore((state) => state.deviceState);
   const settings = useEnrollmentStore((state) => state.enrollmentSettings);
+  const deviceManagementDisabled = useEnrollmentStore((state) =>
+    Boolean(
+      state.enrollmentSettings?.admin_device_management && !state.userInfo?.is_admin,
+    ),
+  );
   const [userPhone, userPassword] = useEnrollmentStore(
     (state) => [state.userInfo?.phone_number, state.userPassword],
     shallow,
@@ -56,7 +61,8 @@ export const DeviceStep = () => {
         if (
           (deviceState && deviceState.device && deviceState.configs) ||
           settings?.vpn_setup_optional ||
-          settings?.only_client_activation
+          settings?.only_client_activation ||
+          deviceManagementDisabled
         ) {
           setStore({
             loading: true,
@@ -81,11 +87,12 @@ export const DeviceStep = () => {
     userPassword,
     mutate,
     settings?.only_client_activation,
+    deviceManagementDisabled,
   ]);
 
-  // If only client activation is enabled, skip manual wireguard setup
+  // If only client activation is enabled or device management by normal users is disabled, skip manual wireguard setup
   useEffectOnce(() => {
-    if (settings?.only_client_activation) {
+    if (settings?.only_client_activation || deviceManagementDisabled) {
       nextSubject.next();
     }
   });