Commit 4b76251

committed

Revert old logout code

This reverts commit 947dd85, reversing changes made to 24dc208.

1 parent cdad8a7 commit 4b76251Copy full SHA for 4b76251

File tree

2 files changed

-30

lines changed

lib/vscode/src/vs
- server/common
  - cookie.ts
- workbench/browser/parts/titlebar
  - menubarControl.ts

2 files changed

-30

lines changed

`‎lib/vscode/src/vs/server/common/cookie.ts‎`

Lines changed: 0 additions & 3 deletions

This file was deleted.

`‎lib/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.ts‎`

Lines changed: 2 additions & 27 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import { registerThemingParticipant, IThemeService } from 'vs/platform/theme/com`
`9`	`9`	`import { MenuBarVisibility, getTitleBarStyle, IWindowOpenable, getMenuBarVisibility } from 'vs/platform/windows/common/windows';`
`10`	`10`	`import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';`
`11`	`11`	`import { IAction, Action, SubmenuAction, Separator } from 'vs/base/common/actions';`
`12`		`-import { addDisposableListener, Dimension, EventType,getCookieValue } from 'vs/base/browser/dom';`
	`12`	`+import { addDisposableListener, Dimension, EventType } from 'vs/base/browser/dom';`
`13`	`13`	`import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';`
`14`	`14`	`import { isMacintosh, isWeb, isIOS, isNative } from 'vs/base/common/platform';`
`15`	`15`	`import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';`
`@@ -38,8 +38,6 @@ import { KeyCode } from 'vs/base/common/keyCodes';`
`38`	`38`	`import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';`
`39`	`39`	`import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';`
`40`	`40`	`import { ICommandService } from 'vs/platform/commands/common/commands';`
`41`		`-import { ILogService } from 'vs/platform/log/common/log';`
`42`		`-import { Cookie } from 'vs/server/common/cookie';`
`43`	`41`
`44`	`42`	`export type IOpenRecentAction = IAction & { uri: URI, remoteAuthority?: string };`
`45`	`43`
`@@ -318,8 +316,7 @@ export class CustomMenubarControl extends MenubarControl {`
`318`	`316`	`@IThemeService private readonly themeService: IThemeService,`
`319`	`317`	`@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,`
`320`	`318`	`@IHostService protected readonly hostService: IHostService,`
`321`		`- @ICommandService commandService: ICommandService,`
`322`		`- @ILogService private readonly logService: ILogService`
	`319`	`+ @ICommandService commandService: ICommandService`
`323`	`320`	`) {`
`324`	`321`	`super(menuService, workspacesService, contextKeyService, keybindingService, configurationService, labelService, updateService, storageService, notificationService, preferencesService, environmentService, accessibilityService, hostService, commandService);`
`325`	`322`
`@@ -721,28 +718,6 @@ export class CustomMenubarControl extends MenubarControl {`
`721`	`718`	`webNavigationActions.pop();`
`722`	`719`	`}`
`723`	`720`
`724`		`- webNavigationActions.push(new Action('logout', localize('logout', "Log out"), undefined, true,`
`725`		`- async (event?: MouseEvent) => {`
`726`		`- const COOKIE_KEY = Cookie.Key;`
`727`		`- const loginCookie = getCookieValue(COOKIE_KEY);`
`728`		`-`
`729`		`- this.logService.info('Logging out of code-server');`
`730`		`-`
`731`		`- if(loginCookie) {`
`732`		- this.logService.info(`Removing cookie under ${COOKIE_KEY}`);
`733`		`-`
`734`		`- if (document && document.cookie) {`
`735`		`- // We delete the cookie by setting the expiration to a date/time in the past`
`736`		`- document.cookie = COOKIE_KEY +'=; Path=/; Expires=1970年1月01日 00:00:01 GMT;';`
`737`		`- window.location.href = '/login';`
`738`		`- } else {`
`739`		`- this.logService.warn('Could not delete cookie because document and/or document.cookie is undefined');`
`740`		`- }`
`741`		`- } else {`
`742`		`- this.logService.warn('Could not log out because we could not find cookie');`
`743`		`- }`
`744`		`- }));`
`745`		`-`
`746`	`721`	`return webNavigationActions;`
`747`	`722`	`}`
`748`	`723`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 4b76251

File tree

2 files changed

2 files changed

`‎lib/vscode/src/vs/server/common/cookie.ts‎`

`‎lib/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.ts‎`

0 commit comments