Add --silent option

src/sumo/wrapper/_auth_provider.py

@@ -1,5 +1,3 @@
-import platform
-from pathlib import Path
 import msal
 import os
 from datetime import datetime, timedelta
@@ -71,6 +69,18 @@ def get_authorization(self):
     pass
 
 
+class AuthProviderSilent(AuthProvider):
+    def __init__(self, client_id, authority, resource_id):
+        super().__init__(resource_id)
+        cache = get_token_cache(resource_id, ".token")
+        self._app = msal.PublicClientApplication(
+            client_id=client_id, authority=authority, token_cache=cache
+        )
+        self._resource_id = resource_id
+
+        self._scope = scope_for_resource(resource_id)
+
+
 class AuthProviderAccessToken(AuthProvider):
     def __init__(self, access_token):
         self._access_token = access_token
@@ -396,6 +406,11 @@ def get_auth_provider(
     if os.path.exists(get_token_path(resource_id, ".sharedkey")):
         return AuthProviderSumoToken(resource_id)
     # ELSE
+    auth_silent = AuthProviderSilent(client_id, authority, resource_id)
+    token = auth_silent.get_token()
+    if token is not None:
+        return auth_silent
+    # ELSE
     if interactive:
         return AuthProviderInteractive(client_id, authority, resource_id)
     # ELSE
@@ -416,12 +431,3 @@ def get_auth_provider(
         ]
     ):
         return AuthProviderManaged(resource_id)
-    # ELSE
-    lockfile_path = Path.home() / ".config/chromium/SingletonLock"
-    if Path(lockfile_path).is_symlink() and not str(
-        Path(lockfile_path).resolve()
-    ).__contains__(platform.node()):
-        # https://github.com/equinor/sumo-wrapper-python/issues/193
-        return AuthProviderDeviceCode(client_id, authority, resource_id)
-    # ELSE
-    return AuthProviderInteractive(client_id, authority, resource_id)

src/sumo/wrapper/_version.py

@@ -0,0 +1,16 @@
+# file generated by setuptools_scm
+# don't change, don't track in version control
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple, Union
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+else:
+    VERSION_TUPLE = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+
+__version__ = version = '1.0.10.dev1+gb0c8c00.d20240515'
+__version_tuple__ = version_tuple = (1, 0, 10, 'dev1', 'gb0c8c00.d20240515')

src/sumo/wrapper/login.py

@@ -1,5 +1,6 @@
 import logging
-
+import platform
+from pathlib import Path
 from argparse import ArgumentParser
 from sumo.wrapper import SumoClient
 
@@ -33,7 +34,7 @@ def get_parser() -> ArgumentParser:
         "--interactive",
         dest="interactive",
         action="store_true",
-        default=False,
+        default=True,
         help="Login interactively",
     )
 
@@ -55,6 +56,15 @@ def get_parser() -> ArgumentParser:
         help="Print access token",
     )
 
+    parser.add_argument(
+        "-s",
+        "--silent",
+        dest="silent",
+        action="store_true",
+        default=False,
+        help="Attempt acquire token silently",
+    )
+
     return parser
 
 
@@ -64,20 +74,39 @@ def main():
     env = args.env
     logger.debug("env is %s", env)
 
-    print("Login to Sumo environment: " + env)
+    if args.silent:
+        args.interactive = False
+        args.devicecode = False
+        args.print_token = False
+    else:
+        print("Login to Sumo environment: " + env)
+
+    if args.interactive:
+        lockfile_path = Path.home() / ".config/chromium/SingletonLock"
+        if Path(lockfile_path).is_symlink() and not str(
+            Path(lockfile_path).resolve()
+        ).__contains__(platform.node()):
+            # https://github.com/equinor/sumo-wrapper-python/issues/193
+            args.interactive = False
+            args.devicecode = True
 
     sumo = SumoClient(
         args.env, interactive=args.interactive, devicecode=args.devicecode
     )
     token = sumo.authenticate()
 
-    if args.print_token:
-        print(f"TOKEN: {token}")
-
-    if token is not None:
-        print("Successfully logged in to Sumo environment: " + env)
+    if args.silent:
+        if token is None:
+            return 1
+        return 0
     else:
-        print("Failed login to Sumo environment: " + env)
+        if args.print_token:
+            print(f"TOKEN: {token}")
+
+        if token is not None:
+            print("Successfully logged in to Sumo environment: " + env)
+        else:
+            print("Failed login to Sumo environment: " + env)
 
 
 if __name__ == "__main__":

src/sumo/wrapper/sumo_client.py

@@ -84,27 +84,6 @@ def __init__(
             access_token=access_token,
             devicecode=devicecode,
         )
-        if (
-            self.auth.get_token() is None
-            and refresh_token is None
-            and access_token is None
-        ):
-            print("\n \033[31m !!! Falling back to device-code login:\033[0m")
-            self.auth = get_auth_provider(
-                client_id=APP_REGISTRATION[env]["CLIENT_ID"],
-                authority=f"{AUTHORITY_HOST_URI}/{TENANT_ID}",
-                resource_id=APP_REGISTRATION[env]["RESOURCE_ID"],
-                interactive=False,
-                refresh_token=None,
-                access_token=None,
-                devicecode=True,
-            )
-        if self.auth.get_token() is None:
-            print(
-                "\n\n \033[31m "
-                + "NOTE! Login failed/timed out. Giving up."
-                + "\033[0m"
-            )
 
         if env == "localhost":
             self.base_url = "http://localhost:8084/api/v1"
@@ -114,6 +93,8 @@ def __init__(
         return
 
     def authenticate(self):
+        if self.auth is None:
+            return None
         return self.auth.get_token()
 
     @property