ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move files locations (#9015)

Browse Source 
* Move files locations

* Extension path
This commit is contained in:
Amir Omidi
2020-01-31 14:54:32 -08:00
committed by GitHub
parent 5b2c14f11a
commit c6689700f6
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
extensions/azurecore/src/account-provider/media/landing.css → extensions/azurecore/media/landing.css
View File

0
extensions/azurecore/src/account-provider/media/landing.html → extensions/azurecore/media/landing.html
View File

9
extensions/azurecore/src/account-provider/azureAccountProvider2.ts
View File

@@ -41,7 +41,7 @@ export class AzureAccountProvider implements azdata.AccountProvider {
private isInitialized: boolean = false; private isInitialized: boolean = false;
constructor(private metadata: AzureAccountProviderMetadata, private _tokenCache: TokenCache) { constructor(private metadata: AzureAccountProviderMetadata, private _tokenCache: TokenCache, private _context: vscode.ExtensionContext) {
this.commonAuthorityUrl = url.resolve(this.metadata.settings.host, AzureAccountProvider.AadCommonTenant); this.commonAuthorityUrl = url.resolve(this.metadata.settings.host, AzureAccountProvider.AadCommonTenant);
} }
@@ -189,6 +189,8 @@ export class AzureAccountProvider implements azdata.AccountProvider {
nonce: string, nonce: string,
authUrl: string) { authUrl: string) {
const mediaPath = path.join(this._context.extensionPath, 'media');
// Utility function // Utility function
const sendFile = async (res: http.ServerResponse, filePath: string, contentType: string): Promise<void> => { const sendFile = async (res: http.ServerResponse, filePath: string, contentType: string): Promise<void> => {
let fileContents; let fileContents;
@@ -240,12 +242,13 @@ export class AzureAccountProvider implements azdata.AccountProvider {
return; return;
} }
sendFile(res, path.join(__dirname, 'media/landing.html'), 'text/html; charset=utf-8').catch(console.error);
sendFile(res, path.join(mediaPath, 'landing.html'), 'text/html; charset=utf-8').catch(console.error);
this.handleAuthentication(code).catch((e) => console.error(e)); this.handleAuthentication(code).catch((e) => console.error(e));
}; };
const css = (req: http.IncomingMessage, res: http.ServerResponse, reqUrl: url.UrlWithParsedQuery) => { const css = (req: http.IncomingMessage, res: http.ServerResponse, reqUrl: url.UrlWithParsedQuery) => {
sendFile(res, path.join(__dirname, 'media/landing.css'), 'text/css; charset=utf-8').catch(console.error); sendFile(res, path.join(mediaPath, 'landing.css'), 'text/css; charset=utf-8').catch(console.error);
}; };
pathMappings.set('/signin', initialSignIn); pathMappings.set('/signin', initialSignIn);

2
extensions/azurecore/src/account-provider/azureAccountProviderService.ts
View File

@@ -138,7 +138,7 @@ export class AzureAccountProviderService implements vscode.Disposable {
let tokenCacheKey = `azureTokenCache-${provider.metadata.id}`; let tokenCacheKey = `azureTokenCache-${provider.metadata.id}`;
let tokenCachePath = path.join(this._userStoragePath, tokenCacheKey); let tokenCachePath = path.join(this._userStoragePath, tokenCacheKey);
let tokenCache = new CredentialServiceTokenCache(self._credentialProvider, tokenCacheKey, tokenCachePath); let tokenCache = new CredentialServiceTokenCache(self._credentialProvider, tokenCacheKey, tokenCachePath);
let accountProvider = new AzureAccountProvider(provider.metadata as AzureAccountProviderMetadata, tokenCache); let accountProvider = new AzureAccountProvider(provider.metadata as AzureAccountProviderMetadata, tokenCache, this._context);
self._accountProviders[provider.metadata.id] = accountProvider; self._accountProviders[provider.metadata.id] = accountProvider;
self._accountDisposals[provider.metadata.id] = azdata.accounts.registerAccountProvider(provider.metadata, accountProvider); self._accountDisposals[provider.metadata.id] = azdata.accounts.registerAccountProvider(provider.metadata, accountProvider);
resolve(); resolve();