paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 49 Packages Projects Releases Wiki Activity

integration: fix AzureIntegration resolveUrl path handling

Browse Source 
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
This commit is contained in:
Patrik Oldsberg
2021-09-10 13:14:22 +02:00
parent 1befb5ad57
commit 2e9d71281e
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/integration/src/azure/AzureIntegration.ts
+19 -21
View File
@@ -14,9 +14,9 @@
* limitations under the License.
*/
import parseGitUrl from 'git-url-parse';
import { basicIntegrations, isValidUrl } from '../helpers';
import { ScmIntegration, ScmIntegrationsFactory } from '../types';
import { AzureUrl } from './AzureUrl';
import { AzureIntegrationConfig, readAzureIntegrationConfigs } from './config';
export class AzureIntegration implements ScmIntegration {
@@ -61,29 +61,27 @@ export class AzureIntegration implements ScmIntegration {
return url;
}
const parsed = parseGitUrl(base);
const { organization, owner, name, filepath } = parsed;
try {
const azureUrl = AzureUrl.fromRepoUrl(base);
const newUrl = new URL(base);
// If not an actual file path within a repo, treat the URL as raw
if (!organization || !owner || !name) {
// We lean on the URL path resolution logic to resolve the path param
const mockBaseUrl = new URL(`https://a.com${azureUrl.getPath() ?? ''}`);
const updatedPath = new URL(url, mockBaseUrl).pathname;
newUrl.searchParams.set('path', updatedPath);
if (options.lineNumber) {
newUrl.searchParams.set('line', String(options.lineNumber));
newUrl.searchParams.set('lineEnd', String(options.lineNumber + 1));
newUrl.searchParams.set('lineStartColumn', '1');
newUrl.searchParams.set('lineEndColumn', '1');
}
return newUrl.toString();
} catch {
// If not an actual file path within a repo, treat the URL as raw
return new URL(url, base).toString();
}
const path = filepath?.replace(/^\//, '') || '';
const mockBaseUrl = new URL(`https://a.com/${path}`);
const updatedPath = new URL(url, mockBaseUrl).pathname;
const newUrl = new URL(base);
newUrl.searchParams.set('path', updatedPath);
if (options.lineNumber) {
newUrl.searchParams.set('line', String(options.lineNumber));
newUrl.searchParams.set('lineEnd', String(options.lineNumber + 1));
newUrl.searchParams.set('lineStartColumn', '1');
newUrl.searchParams.set('lineEndColumn', '1');
}
return newUrl.toString();
}
resolveEditUrl(url: string): string {