From 7e5c9bcb7055855986bfe02f94acbfb32cbe5ddd Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Fri, 5 May 2023 10:19:45 -0700 Subject: [PATCH] Small fixes --- frontend/src/components/SettingsForm/index.tsx | 2 +- frontend/src/models/Settings.model.ts | 2 +- frontend/src/services/api/ApiNativeClient/index.ts | 3 ++- frontend/src/services/api/ApiWebClient/index.ts | 2 +- mobile/App.tsx | 3 +-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/SettingsForm/index.tsx b/frontend/src/components/SettingsForm/index.tsx index 310444cd..5bb6dce4 100644 --- a/frontend/src/components/SettingsForm/index.tsx +++ b/frontend/src/components/SettingsForm/index.tsx @@ -159,7 +159,7 @@ const SettingsForm = ({ dense = false, showNetwork = false }: SettingsFormProps) onChange={(e) => { const lightQRs = !e.target.checked; setSettings({ ...settings, lightQRs }); - systemClient.setItem('settings_lightQRs', lightQRs); + systemClient.setItem('settings_light_qr', String(lightQRs)); }} /> } diff --git a/frontend/src/models/Settings.model.ts b/frontend/src/models/Settings.model.ts index 24f6fcc1..a5273c4f 100644 --- a/frontend/src/models/Settings.model.ts +++ b/frontend/src/models/Settings.model.ts @@ -30,7 +30,7 @@ class BaseSettings { ? 'dark' : 'light'; - this.lightQRs = systemClient.getItem('settings_lightQRs') === 'true'; + this.lightQRs = systemClient.getItem('settings_light_qr') === 'true'; const languageCookie = systemClient.getItem('settings_language'); this.language = diff --git a/frontend/src/services/api/ApiNativeClient/index.ts b/frontend/src/services/api/ApiNativeClient/index.ts index adb8ccb6..52310449 100644 --- a/frontend/src/services/api/ApiNativeClient/index.ts +++ b/frontend/src/services/api/ApiNativeClient/index.ts @@ -14,10 +14,11 @@ class ApiNativeClient implements ApiClient { headers = { ...headers, ...{ - Authorization: `Token ${tokenSHA256.substring(0, 40)}`, + Authorization: `Token ${tokenSHA256}`, }, }; } + const encrypted_private_key = systemClient.getCookie('encrypted_private_key'); const public_key = systemClient.getCookie('public_key'); diff --git a/frontend/src/services/api/ApiWebClient/index.ts b/frontend/src/services/api/ApiWebClient/index.ts index cc6055c8..a366204c 100644 --- a/frontend/src/services/api/ApiWebClient/index.ts +++ b/frontend/src/services/api/ApiWebClient/index.ts @@ -10,7 +10,7 @@ class ApiWebClient implements ApiClient { headers = { ...headers, ...{ - Authorization: `Token ${tokenSHA256.substring(0, 40)}`, + Authorization: `Token ${tokenSHA256}`, }, }; } diff --git a/mobile/App.tsx b/mobile/App.tsx index f3f272dc..dac1a058 100644 --- a/mobile/App.tsx +++ b/mobile/App.tsx @@ -43,12 +43,11 @@ const App = () => { }); }; - EncryptedStorage.removeItem('sessionid'); loadCookie('robot_token'); loadCookie('settings_fontsize_basic'); loadCookie('settings_language'); loadCookie('settings_mode'); - loadCookie('settings_lightQRs'); + loadCookie('settings_light_qr'); loadCookie('settings_network'); loadCookie('garage').then(() => injectMessageResolve(responseId)); };