hcs-core 0.1.286__tar.gz → 0.1.287__tar.gz

{hcs_core-0.1.286 → hcs_core-0.1.287}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.286
+Version: 0.1.287
 Summary: Horizon Cloud Service CLI module.
 Project-URL: Homepage, https://github.com/euc-eng/hcs-cli
 Project-URL: Bug Tracker, https://github.com/euc-eng/hcs-cli/issues
@@ -40,6 +40,7 @@ Provides-Extra: dev
 Requires-Dist: bandit; extra == 'dev'
 Requires-Dist: black; extra == 'dev'
 Requires-Dist: build; extra == 'dev'
+Requires-Dist: flake8; extra == 'dev'
 Requires-Dist: mypy; extra == 'dev'
 Requires-Dist: pylint; extra == 'dev'
 Requires-Dist: pytest; extra == 'dev'

hcs_core-0.1.287/hcs_core/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.287"

{hcs_core-0.1.286 → hcs_core-0.1.287}/hcs_core/ctxp/profile.py

@@ -98,7 +98,6 @@ def current(reload: bool = False, exit_on_failure: bool = True, exclude_secret:
 
 def save():
     """Save the current profile"""
-    global _data
     if _data is None:
         return
     write(name(), _data)

{hcs_core-0.1.286 → hcs_core-0.1.287}/hcs_core/ctxp/task_schd.py

@@ -111,7 +111,6 @@ def statistics(reset_cycle: bool = False):
 
 def _daemon_worker():
     log.info("task scheduler daemon thread start")
-    global _g_flag_stop_daemon
     while not _g_flag_stop_daemon.is_set():
         if _g_flag_running:
             schedule.run_pending()
@@ -149,7 +148,6 @@ def resume():
 
 
 def stop_daemon():
-    global _g_flag_stop_daemon
     global _g_worker_thread
     if _g_worker_thread:
         _g_flag_stop_daemon.set()

{hcs_core-0.1.286 → hcs_core-0.1.287}/hcs_core/sglib/auth.py

@@ -125,12 +125,17 @@ def _get_new_oauth_token(old_oauth_token, effective_profile):
 def refresh_oauth_token(old_oauth_token: dict, csp_url: str):
     with OAuth2Client(token=old_oauth_token) as client:
         log.debug("Refresh auth token...")
-        new_token = client.refresh_token(csp_url + "/csp/gateway/am/api/auth/token")
+        token_url = csp_url + "/csp/gateway/am/api/auth/token"
+        from .login_support import identify_client_id
+
+        csp_specific_req_not_oauth_standard = (identify_client_id(csp_url), "")
+        new_token = client.refresh_token(token_url, auth=csp_specific_req_not_oauth_standard)
         log.debug(f"New auth token: {new_token}")
         if not new_token:
             raise Exception("CSP auth refresh failed.")
         if "cspErrorCode" in new_token:
             raise Exception(f"CSP auth failed: {new_token.get('message')}")
+
     return new_token
 
 

{hcs_core-0.1.286 → hcs_core-0.1.287}/hcs_core/sglib/login_support.py

@@ -19,17 +19,13 @@ limitations under the License.
 import logging
 import secrets
 import threading
-import time
 import webbrowser
 from http.server import BaseHTTPRequestHandler, HTTPServer
-from typing import Callable
 from urllib.parse import parse_qs, urlparse
 
 from authlib.integrations.httpx_client import OAuth2Client
 from authlib.oauth2.rfc7636 import create_s256_code_challenge
 
-from hcs_core.util.scheduler import ThreadPoolScheduler
-
 log = logging.getLogger(__name__)
 
 _server_address = ("127.0.0.1", 10762)

{hcs_core-0.1.286 → hcs_core-0.1.287}/pyproject.toml

@@ -58,6 +58,7 @@ dev = [
     "pylint",
     "pytest",
     "ruff",
+    "flake8",
 ]
 
 [project.urls]

hcs_core-0.1.286/hcs_core/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.286"