fix update and reset teams handlers

Infomaniak · Mar 13, 2024 · 27b2d69 · 27b2d69
1 parent b0d9db9
commit 27b2d69
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/src/main/app/initialize.ts b/src/main/app/initialize.ts
@@ -308,6 +308,15 @@ function updateTeamsHandler(_: any, servers: ConfigServer[]) {
     const [defaultServer] = buildConfig.defaultServers!;
     const [firstServer] = servers;
 
+    if (!servers.length) {
+        ServerManager.removePredefinedServersHandler(true);
+        ServerManager.removePredefinedServersHandler(false);
+
+        ServerManager.emit(SERVERS_UPDATE);
+
+        return;
+    }
+
     // Check if it's first call to fetch kchat info with kchat.infomaniak.com
     if (defaultServer?.url && firstServer.url === defaultServer.url) {
         initIKserver();

diff --git a/src/main/menus/app.ts b/src/main/menus/app.ts
@@ -181,12 +181,6 @@ export function createTemplate(config: Config, updateManager: UpdateManager) {
             TokenManager.reset();
             ViewManager.reload();
         },
-    }, {
-        label: localizeMessage('main.menus.app.view.updateTeams', 'Update organisations'),
-        accelerator: 'Shift+CmdOrCtrl+T',
-        click() {
-            ViewManager.resetTeams();
-        },
     }, {
         role: 'togglefullscreen',
         label: localizeMessage('main.menus.app.view.fullscreen', 'Toggle Full Screen'),

diff --git a/src/main/preload/internalAPI.js b/src/main/preload/internalAPI.js
@@ -90,7 +90,10 @@ import {
     SERVERS_UPDATE,
     VALIDATE_SERVER_URL,
     GET_APP_INFO,
+    RESET_AUTH,
+    UPDATE_TEAMS,
 } from 'common/communication';
+import {IKOrigin} from 'common/config/ikConfig';
 
 console.log('Preload initialized');
 
@@ -176,6 +179,17 @@ contextBridge.exposeInMainWorld('desktop', {
     onFocusThreeDotMenu: (listener) => ipcRenderer.on(FOCUS_THREE_DOT_MENU, () => listener()),
     updateURLViewWidth: (width) => ipcRenderer.send(UPDATE_URL_VIEW_WIDTH, width),
 
+    resetAuth: async () => {
+        await ipcRenderer.invoke(RESET_AUTH);
+        ipcRenderer.send(UPDATE_TEAMS, [{
+            name: '.',
+            url: IKOrigin,
+            order: 0,
+            tabs: [{name: 'TAB_MESSAGING', order: 0, isOpen: true}],
+        }]);
+        ipcRenderer.send(MODAL_CANCEL, {});
+    },
+
     downloadsDropdown: {
         toggleDownloadsDropdownMenu: (payload) => ipcRenderer.send(TOGGLE_DOWNLOADS_DROPDOWN_MENU, payload),
         requestInfo: () => ipcRenderer.send(REQUEST_DOWNLOADS_DROPDOWN_INFO),

diff --git a/src/renderer/modals/welcomeScreen/welcomeScreen.tsx b/src/renderer/modals/welcomeScreen/welcomeScreen.tsx
@@ -46,7 +46,7 @@ const WelcomeScreenModalWrapper = () => {
     }, []);
 
     const onGetStarted = () => {
-        setGetStarted(true);
+        window.desktop.resetAuth();
     };
 
     return (