Merge pull request #564 from OpenDTU-App/218-implement-security-settings

Author: CommanderRedYT

src/api/ApiHandler.tsx

@@ -20,6 +20,7 @@ import {
   setNTPSettings,
   setNtpStatus,
   setPowerStatus,
+  setSecuritySettings,
   setSystemStatus,
   setTriedToConnect,
 } from '@/slices/opendtu';
@@ -196,6 +197,10 @@ export const ApiProvider: FC<PropsWithChildren> = ({ children }) => {
         dispatch(setMqttSettings({ data, index }));
       });
 
+      api.registerOnSecuritySettingsHandler((data, index) => {
+        dispatch(setSecuritySettings({ data, index }));
+      });
+
       log.debug('Connecting API Handler');
 
       api.connect();

src/api/opendtuapi.ts

@@ -15,6 +15,7 @@ import type {
   NetworkSettings,
   NTPSettings,
   NTPTime,
+  SecuritySettings,
   TimezoneData,
 } from '@/types/opendtu/settings';
 import type { InverterItem } from '@/types/opendtu/state';
@@ -126,6 +127,9 @@ class OpenDtuApi {
   private onMqttSettingsHandler:
     | ((data: MqttSettings, index: Index) => void)
     | null = null;
+  private onSecuritySettingsHandler:
+    | ((data: SecuritySettings, index: Index) => void)
+    | null = null;
 
   private ws: WebSocket | null = null;
   // communication
@@ -179,21 +183,23 @@ class OpenDtuApi {
   public startFetchHttpStateInterval(): void {
     log.debug('OpenDtuApi.startFetchHttpStateInterval()');
 
-    if (this.fetchHttpStateInterval) {
+    if (this.fetchHttpStateInterval !== null) {
       log.debug('OpenDtuApi.startFetchHttpStateInterval() already running');
       clearInterval(this.fetchHttpStateInterval);
     }
 
-    this.fetchHttpStateInterval = setInterval(() => {
-      this.updateHttpState();
+    if (this.userString !== null) {
+      this.fetchHttpStateInterval = setInterval(() => {
+        this.updateHttpState();
 
-      log.debug(
-        'interval -> OpenDtuApi.updateHttpState()',
-        new Date(),
-        this.index,
-        this.isConnected(),
-      );
-    }, 5000); // 10 seconds
+        log.debug(
+          'interval -> OpenDtuApi.updateHttpState()',
+          new Date(),
+          this.index,
+          this.isConnected(),
+        );
+      }, 5000); // 10 seconds
+    }
 
     this.updateHttpState();
   }
@@ -383,6 +389,18 @@ class OpenDtuApi {
     this.onMqttSettingsHandler = null;
   }
 
+  public registerOnSecuritySettingsHandler(
+    handler: (data: SecuritySettings, index: Index) => void,
+  ): void {
+    log.debug('OpenDtuApi.registerOnSecuritySettingsHandler()');
+    this.onSecuritySettingsHandler = handler;
+  }
+
+  public unregisterOnSecuritySettingsHandler(): void {
+    log.debug('OpenDtuApi.unregisterOnSecuritySettingsHandler()');
+    this.onSecuritySettingsHandler = null;
+  }
+
   public async getSystemStatusFromUrl(
     url: URL,
   ): Promise<GetSystemStatusReturn> {
@@ -1583,6 +1601,73 @@ class OpenDtuApi {
     return res.status === 200 && parsed.type === 'success';
   }
 
+  public async getSecurityConfig(): Promise<DtuSettings | null> {
+    if (!this.baseUrl) {
+      log.error('getSecurityConfig', 'no base url');
+      return null;
+    }
+
+    const res = await this.makeAuthenticatedRequest(
+      '/api/security/config',
+      'GET',
+    );
+
+    if (!res) {
+      log.error('getSecurityConfig', 'no response');
+      return null;
+    }
+
+    if (res.status === 200) {
+      const json = await res.json();
+
+      if (this.onSecuritySettingsHandler && this.index !== null) {
+        this.onSecuritySettingsHandler(json, this.index);
+      }
+
+      log.debug('getSecurityConfig', 'success');
+
+      return json;
+    }
+
+    log.error('getSecurityConfig', 'invalid status', res.status);
+
+    return null;
+  }
+
+  public async setSecurityConfig(
+    config: SecuritySettings,
+  ): Promise<boolean | null> {
+    if (!this.baseUrl) {
+      log.error('setSecurityConfig', 'no base url');
+      return null;
+    }
+
+    const formData = new FormData();
+    formData.append('data', JSON.stringify(config));
+
+    const res = await this.makeAuthenticatedRequest(
+      '/api/security/config',
+      'POST',
+      {
+        body: formData,
+      },
+    );
+
+    if (!res) {
+      log.error('setSecurityConfig', 'no response');
+      return null;
+    }
+
+    const parsed = await res.json();
+
+    log.debug('setSecurityConfig', 'success', {
+      status: res.status,
+      parsed,
+    });
+
+    return res.status === 200 && parsed.type === 'success';
+  }
+
   public async makeAuthenticatedRequest(
     route: string,
     method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'HEAD' | 'OPTIONS' | 'PATCH',

src/slices/opendtu.ts

@@ -21,6 +21,7 @@ import type {
   SetNTPSettingsAction,
   SetNtpStatusAction,
   SetPowerStatusAction,
+  SetSecuritySettingsAction,
   SetSetupBaseUrlAction,
   SetSetupUserStringAction,
   SetSystemStatusAction,
@@ -394,6 +395,21 @@ const opendtuSlice = createSlice({
           .settings as OpenDTUSettings
       ).mqtt = action.payload.data;
     },
+    setSecuritySettings: (state, action: SetSecuritySettingsAction) => {
+      if (!state.dtuStates[action.payload.index]) {
+        state.dtuStates[action.payload.index] = {};
+      }
+
+      if (!state.dtuStates[action.payload.index]?.settings) {
+        (state.dtuStates[action.payload.index] as OpenDTUDeviceState).settings =
+          {};
+      }
+
+      (
+        (state.dtuStates[action.payload.index] as OpenDTUDeviceState)
+          .settings as OpenDTUSettings
+      ).security = action.payload.data;
+    },
   },
 });
 
@@ -422,6 +438,7 @@ export const {
   setNTPSettings,
   setDtuSettings,
   setMqttSettings,
+  setSecuritySettings,
 } = opendtuSlice.actions;
 
 export const { reducer: OpenDTUReducer } = opendtuSlice;

src/translations

@@ -102,3 +102,8 @@ export interface MqttSettings {
   mqtt_hass_topic: string;
   mqtt_hass_individualpanels: boolean;
 }
+
+export interface SecuritySettings {
+  password: string;
+  allow_readonly: boolean;
+}

src/types/opendtu/settings.ts

@@ -7,6 +7,7 @@ import type {
   MqttSettings,
   NetworkSettings,
   NTPSettings,
+  SecuritySettings,
 } from '@/types/opendtu/settings';
 import type {
   InverterSerial,
@@ -27,6 +28,7 @@ export interface OpenDTUSettings {
   ntp?: NTPSettings;
   dtu?: DtuSettings;
   mqtt?: MqttSettings;
+  security?: SecuritySettings;
 }
 
 export enum DeviceState {
@@ -153,6 +155,11 @@ export type SetMqttSettingsAction = PayloadAction<{
   data: MqttSettings;
 }>;
 
+export type SetSecuritySettingsAction = PayloadAction<{
+  index: Index;
+  data: SecuritySettings;
+}>;
+
 export interface OpenDTUSetup {
   baseUrl: string | null;
   userString: string | null;

src/types/opendtu/state.ts

@@ -47,7 +47,7 @@ const config: configLoggerType<
   string
 > = {
   transport: [consoleTransport, customTransport],
-  severity: __DEV__ ? 'info' : 'warn',
+  severity: __DEV__ ? 'debug' : 'warn',
   transportOptions: {
     colors: {
       debug: 'gray',

src/utils/log.ts

@@ -28,6 +28,7 @@ import DtuSettingsScreen from '@/views/navigation/screens/SettingsGroup/DtuSetti
 import MqttSettingsScreen from '@/views/navigation/screens/SettingsGroup/MqttSettingsScreen';
 import NetworkSettingsScreen from '@/views/navigation/screens/SettingsGroup/NetworkSettingsScreen';
 import NTPSettingsScreen from '@/views/navigation/screens/SettingsGroup/NTPSettingsScreen';
+import SecuritySettingsScreen from '@/views/navigation/screens/SettingsGroup/SecuritySettingsScreen';
 import SetupAddOpenDTUScreen from '@/views/navigation/screens/SetupGroup/SetupAddOpenDTUScreen';
 import SetupAuthenticateOpenDTUInstanceScreen from '@/views/navigation/screens/SetupGroup/SetupAuthenticateOpenDTUInstanceScreen';
 import SetupOpenDTUCompleteScreen from '@/views/navigation/screens/SetupGroup/SetupOpenDTUCompleteScreen';
@@ -137,6 +138,10 @@ const NavigationStack: FC = () => {
       <Stack.Screen name="NTPSettingsScreen" component={NTPSettingsScreen} />
       <Stack.Screen name="DtuSettingsScreen" component={DtuSettingsScreen} />
       <Stack.Screen name="MqttSettingsScreen" component={MqttSettingsScreen} />
+      <Stack.Screen
+        name="SecuritySettingsScreen"
+        component={SecuritySettingsScreen}
+      />
       <Stack.Screen name="AppLogScreen" component={AppLogScreen} />
     </Stack.Navigator>
   );