From c0a973a339e04e96f01d9279e88065c2de338017 Mon Sep 17 00:00:00 2001 From: Slawomir Koszewski Date: Sun, 2 Nov 2025 11:18:13 +0100 Subject: [PATCH] Fixes for URL building logic. --- devops.py | 11 +++++++---- harvester.py | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/devops.py b/devops.py index 9362bf7..c93c363 100644 --- a/devops.py +++ b/devops.py @@ -1,21 +1,24 @@ import requests -from urllib.parse import urljoin +import urllib.request +import urllib.parse +import json DEVOPS_SCOPE = "https://app.vssps.visualstudio.com/.default" DEVOPS_API_VERSION = "7.1" class Client: def __init__(self, org_url: str, token: str, api_version: str = DEVOPS_API_VERSION): - self._org_url = org_url + self._org_url = org_url.rstrip("/") + "/" # Ensure trailing slash self._token = token self._api_version = api_version - def get(self, url: str, params: dict = {}): + def get(self, path: str, params: dict = {}): p = { "api-version": self._api_version, **params } - r = requests.get(url=urljoin(self._org_url, url), params=p, headers={ + url = self._org_url + path.lstrip("/") # Ensure single slash between base and path + r = requests.get(url=url, params=p, headers={ "Authorization": f"Bearer {self._token}" }) return r diff --git a/harvester.py b/harvester.py index cff0627..496ede1 100755 --- a/harvester.py +++ b/harvester.py @@ -6,7 +6,7 @@ from json import dumps def main(): token = DefaultAzureCredential().get_token(DEVOPS_SCOPE).token - client = Client("https://dev.azure.com/mcovsandbox/", token) + client = Client("https://dev.azure.com/mcovsandbox", token) projects = client.get_projects() print(dumps(projects, indent=2))