mirror of https://git.tuxpa.in/a/code-server.git
Revert old logout code
This reverts commit947dd8561b
, reversing changes made to24dc2080f9
.
This commit is contained in:
parent
eee637a104
commit
08ab0afdb0
|
@ -1,3 +0,0 @@
|
|||
export enum Cookie {
|
||||
Key = 'key',
|
||||
}
|
|
@ -9,7 +9,7 @@ import { registerThemingParticipant, IThemeService } from 'vs/platform/theme/com
|
|||
import { MenuBarVisibility, getTitleBarStyle, IWindowOpenable, getMenuBarVisibility } from 'vs/platform/windows/common/windows';
|
||||
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
|
||||
import { IAction, Action, SubmenuAction, Separator } from 'vs/base/common/actions';
|
||||
import { addDisposableListener, Dimension, EventType, getCookieValue } from 'vs/base/browser/dom';
|
||||
import { addDisposableListener, Dimension, EventType } from 'vs/base/browser/dom';
|
||||
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
|
||||
import { isMacintosh, isWeb, isIOS, isNative } from 'vs/base/common/platform';
|
||||
import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
|
||||
|
@ -38,8 +38,6 @@ import { KeyCode } from 'vs/base/common/keyCodes';
|
|||
import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
|
||||
import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
|
||||
import { ICommandService } from 'vs/platform/commands/common/commands';
|
||||
import { ILogService } from 'vs/platform/log/common/log';
|
||||
import { Cookie } from 'vs/server/common/cookie';
|
||||
|
||||
export type IOpenRecentAction = IAction & { uri: URI, remoteAuthority?: string };
|
||||
|
||||
|
@ -318,8 +316,7 @@ export class CustomMenubarControl extends MenubarControl {
|
|||
@IThemeService private readonly themeService: IThemeService,
|
||||
@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
|
||||
@IHostService protected readonly hostService: IHostService,
|
||||
@ICommandService commandService: ICommandService,
|
||||
@ILogService private readonly logService: ILogService
|
||||
@ICommandService commandService: ICommandService
|
||||
) {
|
||||
super(menuService, workspacesService, contextKeyService, keybindingService, configurationService, labelService, updateService, storageService, notificationService, preferencesService, environmentService, accessibilityService, hostService, commandService);
|
||||
|
||||
|
@ -721,28 +718,6 @@ export class CustomMenubarControl extends MenubarControl {
|
|||
webNavigationActions.pop();
|
||||
}
|
||||
|
||||
webNavigationActions.push(new Action('logout', localize('logout', "Log out"), undefined, true,
|
||||
async (event?: MouseEvent) => {
|
||||
const COOKIE_KEY = Cookie.Key;
|
||||
const loginCookie = getCookieValue(COOKIE_KEY);
|
||||
|
||||
this.logService.info('Logging out of code-server');
|
||||
|
||||
if(loginCookie) {
|
||||
this.logService.info(`Removing cookie under ${COOKIE_KEY}`);
|
||||
|
||||
if (document && document.cookie) {
|
||||
// We delete the cookie by setting the expiration to a date/time in the past
|
||||
document.cookie = COOKIE_KEY +'=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;';
|
||||
window.location.href = '/login';
|
||||
} else {
|
||||
this.logService.warn('Could not delete cookie because document and/or document.cookie is undefined');
|
||||
}
|
||||
} else {
|
||||
this.logService.warn('Could not log out because we could not find cookie');
|
||||
}
|
||||
}));
|
||||
|
||||
return webNavigationActions;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue