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

Register credential provider after language client onReady (#657)

Browse Source
This commit is contained in:
Karl Burtram
2018-02-09 21:58:47 -08:00
committed by GitHub
parent 98fa028ce5
commit af53a13e6b
1 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
extensions/mssql/client/src/controllers/mainController.ts
View File

@@ -77,10 +77,6 @@ export default class MainController implements vscode.Disposable {
return this.createClient(['MicrosoftSqlToolsCredentials.exe', 'MicrosoftSqlToolsCredentials']); return this.createClient(['MicrosoftSqlToolsCredentials.exe', 'MicrosoftSqlToolsCredentials']);
} }
private createSerializationClient(): Promise<LanguageClient> {
return this.createClient(['MicrosoftSqlToolsSerialization.exe', 'MicrosoftSqlToolsSerialization']);
}
private createResourceProviderClient(): Promise<LanguageClient> { private createResourceProviderClient(): Promise<LanguageClient> {
return this.createClient(['SqlToolsResourceProviderService.exe', 'SqlToolsResourceProviderService']); return this.createClient(['SqlToolsResourceProviderService.exe', 'SqlToolsResourceProviderService']);
} }
@@ -103,19 +99,6 @@ export default class MainController implements vscode.Disposable {
{ serviceInstalled: serverResult.installedBeforeInitializing ? 1 : 0 } { serviceInstalled: serverResult.installedBeforeInitializing ? 1 : 0 }
); );
self.createSerializationClient().then(serializationClient => {
// Serialization
let serializationProvider: data.SerializationProvider = {
handle: 0,
saveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable<data.SaveResultRequestResult> {
return self._serialization.saveAs(saveFormat, savePath, results, appendToFile);
}
};
data.serialization.registerProvider(serializationProvider);
}, error => {
Utils.logDebug('Cannot find Serialization executables. error: ' + error, MainController._extensionConstants.extensionConfigSectionName);
});
self.createResourceProviderClient().then(rpClient => { self.createResourceProviderClient().then(rpClient => {
let resourceProvider = new AzureResourceProvider(self._client, rpClient); let resourceProvider = new AzureResourceProvider(self._client, rpClient);
data.resources.registerResourceProvider({ data.resources.registerResourceProvider({
@@ -131,8 +114,8 @@ export default class MainController implements vscode.Disposable {
}); });
self.createCredentialClient().then(credentialClient => { self.createCredentialClient().then(credentialClient => {
self._credentialStore.languageClient = credentialClient; self._credentialStore.languageClient = credentialClient;
(<LanguageClient>credentialClient).onReady().then(() => {
let credentialProvider: data.CredentialProvider = { let credentialProvider: data.CredentialProvider = {
handle: 0, handle: 0,
saveCredential(credentialId: string, password: string): Thenable<boolean> { saveCredential(credentialId: string, password: string): Thenable<boolean> {
@@ -147,12 +130,11 @@ export default class MainController implements vscode.Disposable {
}; };
data.credentials.registerProvider(credentialProvider); data.credentials.registerProvider(credentialProvider);
Utils.logDebug('credentialProvider registered', MainController._extensionConstants.extensionConfigSectionName); Utils.logDebug('credentialProvider registered', MainController._extensionConstants.extensionConfigSectionName);
});
}, error => { }, error => {
Utils.logDebug('Cannot find credentials executables. error: ' + error, MainController._extensionConstants.extensionConfigSectionName); Utils.logDebug('Cannot find credentials executables. error: ' + error, MainController._extensionConstants.extensionConfigSectionName);
}); });
Utils.logDebug(SharedConstants.extensionActivated, MainController._extensionConstants.extensionConfigSectionName); Utils.logDebug(SharedConstants.extensionActivated, MainController._extensionConstants.extensionConfigSectionName);
self._initialized = true; self._initialized = true;
resolve(true); resolve(true);