ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-04 17:23:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 79a1f5a5ca0c6c53db617aa1fa5a2396d2caebe2

Browse Source
This commit is contained in:
ADS Merger
2020-05-31 19:47:51 +00:00
parent 84492049e8
commit 28be33cfea
913 changed files with 28242 additions and 15549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/vs/platform/authentication/common/authentication.ts
View File

@@ -17,11 +17,12 @@ export interface IUserDataSyncAuthToken {
export interface IAuthenticationTokenService {
_serviceBrand: undefined;
readonly token: IUserDataSyncAuthToken | undefined;
readonly onDidChangeToken: Event<IUserDataSyncAuthToken | undefined>;
readonly onTokenFailed: Event<void>;
getToken(): Promise<IUserDataSyncAuthToken | undefined>;
setToken(userDataSyncAuthToken: IUserDataSyncAuthToken | undefined): Promise<void>;
readonly onTokenFailed: Event<void>;
sendTokenFailed(): void;
}
@@ -29,21 +30,14 @@ export class AuthenticationTokenService extends Disposable implements IAuthentic
_serviceBrand: any;
private _token: IUserDataSyncAuthToken | undefined;
get token(): IUserDataSyncAuthToken | undefined { return this._token; }
private _onDidChangeToken = this._register(new Emitter<IUserDataSyncAuthToken | undefined>());
readonly onDidChangeToken = this._onDidChangeToken.event;
private _onTokenFailed: Emitter<void> = this._register(new Emitter<void>());
readonly onTokenFailed: Event<void> = this._onTokenFailed.event;
private _token: IUserDataSyncAuthToken | undefined;
constructor() {
super();
}
async getToken(): Promise<IUserDataSyncAuthToken | undefined> {
return this._token;
}
async setToken(token: IUserDataSyncAuthToken | undefined): Promise<void> {
if (token && this._token ? token.token !== this._token.token || token.authenticationProviderId !== this._token.authenticationProviderId : token !== this._token) {

2
src/vs/platform/authentication/common/authenticationIpc.ts → src/vs/platform/authentication/electron-browser/authenticationIpc.ts
View File

@@ -7,7 +7,6 @@ import { IServerChannel } from 'vs/base/parts/ipc/common/ipc';
import { Event } from 'vs/base/common/event';
import { IAuthenticationTokenService } from 'vs/platform/authentication/common/authentication';
export class AuthenticationTokenServiceChannel implements IServerChannel {
constructor(private readonly service: IAuthenticationTokenService) { }
@@ -22,7 +21,6 @@ export class AuthenticationTokenServiceChannel implements IServerChannel {
call(context: any, command: string, args?: any): Promise<any> {
switch (command) {
case 'setToken': return this.service.setToken(args);
case 'getToken': return this.service.getToken();
}
throw new Error('Invalid call');
}