@lvce-editor/activity-bar-worker 5.7.0 → 6.1.0

package/dist/activityBarWorkerMain.js

@@ -1118,7 +1118,6 @@ const create$2 = rpcId => {
 };
 
 const {
-  invoke: invoke$1,
   set: set$2
 } = create$2(6010);
 
@@ -1320,7 +1319,7 @@ const {
 // TODO parentUid might ot be needed
 const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) => {
   const state = {
-    accountEnabled: false,
+    accountEnabled: true,
     activityBarItems: [],
     currentViewletId: '',
     filteredItems: [],
@@ -1454,20 +1453,23 @@ const getKeyBindings = () => {
   }];
 };
 
-const getMenuEntriesAccount = state => {
+const getMenuEntriesAccountLoggedIn = state => {
   const {
     userLoginState
   } = state;
-  const signInLabel = userLoginState === 'logging in' ? 'Signing In...' : 'Sign In';
   const signOutLabel = userLoginState === 'logging out' ? 'Signing Out...' : 'Sign Out';
-  if (userLoginState === 'logged in' || userLoginState === 'logging out') {
-    return [{
-      command: 'ActivityBar.handleClickSignOut',
-      flags: None,
-      id: 'signOut',
-      label: signOutLabel
-    }];
-  }
+  return [{
+    command: 'ActivityBar.handleClickSignOut',
+    flags: None,
+    id: 'signOut',
+    label: signOutLabel
+  }];
+};
+const getMenuEntriesAccountLoggedOut = state => {
+  const {
+    userLoginState
+  } = state;
+  const signInLabel = userLoginState === 'logging in' ? 'Signing In...' : 'Sign In';
   return [{
     command: 'ActivityBar.handleClickSignIn',
     flags: None,
@@ -1475,6 +1477,16 @@ const getMenuEntriesAccount = state => {
     label: signInLabel
   }];
 };
+const getMenuEntriesAccount = state => {
+  // TODO maybe query it now from layout?
+  const {
+    userLoginState
+  } = state;
+  if (userLoginState === 'logged in' || userLoginState === 'logging out') {
+    return getMenuEntriesAccountLoggedIn(state);
+  }
+  return getMenuEntriesAccountLoggedOut(state);
+};
 
 const Tab = 1;
 const Button = 1 << 1;
@@ -1970,18 +1982,12 @@ const handleClick = async (state, button, eventX, eventY) => {
 };
 
 const handleClickSignIn = async state => {
-  const {
-    platform
-  } = state;
-  const backendUrl = await invoke('Layout.getBackendUrl');
-  await invoke$1('Auth.login', {
-    backendUrl,
-    platform
-  });
+  await invoke('Layout.signIn');
   return state;
 };
 
 const handleClickSignOut = async state => {
+  await invoke('Layout.signOut');
   return state;
 };
 
@@ -2221,16 +2227,48 @@ const getActiveView = async () => {
   }
 };
 
+const getUserInfo = async () => {
+  try {
+    return await invoke('Layout.getUserInfo');
+  } catch {
+    return undefined;
+  }
+};
+
+const getUserState = userInfo => {
+  if (!userInfo || typeof userInfo !== 'object') {
+    return undefined;
+  }
+  if (!('userState' in userInfo)) {
+    return undefined;
+  }
+  return userInfo.userState;
+};
+
+const toUserLoginState = userState => {
+  switch (userState) {
+    case 'loggedIn':
+      return 'logged in';
+    case 'loggingIn':
+      return 'logging in';
+    case 'loggingOut':
+      return 'logging out';
+    default:
+      return 'logged out';
+  }
+};
+
 const loadContent = async state => {
   const {
     accountEnabled,
     height,
     itemHeight
   } = state;
-  const [accountEnabledNew, activeView, sideBarVisible, sidebarLocation] = await Promise.all([getAccountEnabled(accountEnabled), getActiveView(), getSideBarVisible(), getSideBarPosition()]);
+  const [accountEnabledNew, activeView, sideBarVisible, sidebarLocation, userInfo] = await Promise.all([getAccountEnabled(accountEnabled), getActiveView(), getSideBarVisible(), getSideBarPosition(), getUserInfo()]);
   const newState = {
     ...state,
-    accountEnabled: accountEnabledNew
+    accountEnabled: accountEnabledNew,
+    userLoginState: toUserLoginState(getUserState(userInfo))
   };
   const items = getActivityBarItems(newState);
   const index = items.findIndex(item => item.id === activeView);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/activity-bar-worker",
-  "version": "5.7.0",
+  "version": "6.1.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",