kleinkram 0.48.1__py3-none-any.whl → 0.49.0__py3-none-any.whl

kleinkram/auth.py

@@ -13,7 +13,7 @@ from kleinkram.config import get_config
 from kleinkram.config import save_config
 
 CLI_CALLBACK_ENDPOINT = "/cli/callback"
-OAUTH_SLUG = "/auth/google?state=cli"
+OAUTH_SLUG = "/auth/"
 
 
 def _has_browser() -> bool:
@@ -80,7 +80,9 @@ def _browser_auth(*, url: str) -> None:
     print(f"Authentication complete. Tokens saved to {CONFIG_PATH}.")
 
 
-def login_flow(*, key: Optional[str] = None, headless: bool = False) -> None:
+def login_flow(
+    *, oAuthProvider: str, key: Optional[str] = None, headless: bool = False
+) -> None:
     config = get_config()
     # use cli key login
     if key is not None:
@@ -88,7 +90,7 @@ def login_flow(*, key: Optional[str] = None, headless: bool = False) -> None:
         save_config(config)
         return
 
-    oauth_url = f"{config.endpoint.api}{OAUTH_SLUG}"
+    oauth_url = f"{config.endpoint.api}{OAUTH_SLUG}{oAuthProvider}?state=cli"
     if not headless and _has_browser():
         _browser_auth(url=oauth_url)
     else:

kleinkram/cli/app.py

@@ -127,10 +127,24 @@ def base_handler(exc: Exception) -> int:
 
 @app.command(rich_help_panel=CommandTypes.AUTH)
 def login(
+    oAuthProvider: str = typer.Option(
+        "google",
+        "--oauth-provider",
+        "-p",
+        help="OAuth provider to use for login. Supported providers: google, github.",
+        show_default=True,
+    ),
     key: Optional[str] = typer.Option(None, help="CLI key"),
     headless: bool = typer.Option(False),
 ) -> None:
-    login_flow(key=key, headless=headless)
+
+    # validate oAuthProvider
+    if oAuthProvider not in ["google", "github"]:
+        raise typer.BadParameter(
+            f"Unsupported OAuth provider '{oAuthProvider}'. Supported providers: google, github."
+        )
+
+    login_flow(oAuthProvider=oAuthProvider, key=key, headless=headless)
 
 
 @app.command(rich_help_panel=CommandTypes.AUTH)

{kleinkram-0.48.1.dist-info → kleinkram-0.49.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kleinkram
-Version: 0.48.1
+Version: 0.49.0
 Summary: give me your bags
 Author: Cyrill Püntener, Dominique Garmier, Johann Schwabe
 Author-email: pucyril@ethz.ch, dgarmier@ethz.ch, jschwab@ethz.ch

{kleinkram-0.48.1.dist-info → kleinkram-0.49.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 kleinkram/__init__.py,sha256=xIJqTJw2kbCGryGlCeAdpmtR1FTxmrW1MklUNQEaj74,1061
 kleinkram/__main__.py,sha256=B9RiZxfO4jpCmWPUHyKJ7_EoZlEG4sPpH-nz7T_YhhQ,125
 kleinkram/_version.py,sha256=QYJyRTcqFcJj4qWYpqs7WcoOP6jxDMqyvxLY-cD6KcE,129
-kleinkram/auth.py,sha256=XD_rHOyJmYYfO7QJf3TLYH5qXA22gXGWi7PT3jujlVs,2968
+kleinkram/auth.py,sha256=PdSYZZO8AauNLZbn9PBgPM3o-O_nwoOKTj94EGnPRE8,3003
 kleinkram/config.py,sha256=nx6uSM5nLP4SKe8b9VAx4KDtCCwtyshXmzbEJcUwpsY,7411
 kleinkram/core.py,sha256=COJcUx8tP6EQIyg4OiVprJfQUCMbiq2QGB9xZ2CPUCo,9621
 kleinkram/errors.py,sha256=qa98YvhDbLqX60P8bcMcFmHy4HxgYNlSROXud8Kj-P4,965
@@ -28,7 +28,7 @@ kleinkram/cli/_mission.py,sha256=zDFnOozOFckpuREFgIPt1IzG5q3b1bsNxYlWQoHoz5A,530
 kleinkram/cli/_project.py,sha256=N0C96NC_onCEwTteYp2wgkkwkdJt-1q43LFdqNXfjC8,3398
 kleinkram/cli/_upload.py,sha256=gOhbjbmqhmwW7p6bWlSvI53vLHvBFO9QqD1kdU92I2k,2813
 kleinkram/cli/_verify.py,sha256=n9QThY0JnqaIqw6udYXdRQGcpUl2lIbFXGQIgpTnDPE,2112
-kleinkram/cli/app.py,sha256=m2qq4z95QllvXnxh3koPp0kq06I5R9etsJV8qSV8TMk,7037
+kleinkram/cli/app.py,sha256=8GSawKoX9PuyeOOf2Hq7dEfuqPHZkgGL0xvaFpxl4go,7508
 kleinkram/cli/error_handling.py,sha256=wK3tzeKVSrZm-xmiyzGLnGT2E4TRpyxhaak6GWGP7P8,1921
 testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 testing/backend_fixtures.py,sha256=t5QWwyezHUhxxAlbUuE_eFmpyRaGbnWNNcGPwrO17JM,1571
@@ -43,8 +43,8 @@ tests/test_printing.py,sha256=kPzpIQOtQJ9yQ32mM8cMGDVOGsbrZZLQhfsXN1Pe68Q,2231
 tests/test_query.py,sha256=fExmCKXLA7-9j2S2sF_sbvRX_2s6Cp3a7OTcqE25q9g,3864
 tests/test_utils.py,sha256=eUBYrn3xrcgcaxm1X4fqZaX4tRvkbI6rh6BUbNbu9T0,4784
 tests/test_wrappers.py,sha256=TbcTyO2L7fslbzgfDdcVZkencxNQ8cGPZm_iB6c9d6Q,2673
-kleinkram-0.48.1.dist-info/METADATA,sha256=Jd0LlnLCBHtwi8WdCRNXALcNoDXFP2oZPPRDRehYQpM,2828
-kleinkram-0.48.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kleinkram-0.48.1.dist-info/entry_points.txt,sha256=SaB2l5aqhSr8gmaMw2kvQU90a8Bnl7PedU8cWYxkfYo,46
-kleinkram-0.48.1.dist-info/top_level.txt,sha256=N3-sJagEHu1Tk1X6Dx1X1q0pLDNbDZpLzRxVftvepds,24
-kleinkram-0.48.1.dist-info/RECORD,,
+kleinkram-0.49.0.dist-info/METADATA,sha256=syrGgyWNJkxISFlQicFErPveh3ZOiCn5OJy7TOI1QKk,2828
+kleinkram-0.49.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kleinkram-0.49.0.dist-info/entry_points.txt,sha256=SaB2l5aqhSr8gmaMw2kvQU90a8Bnl7PedU8cWYxkfYo,46
+kleinkram-0.49.0.dist-info/top_level.txt,sha256=N3-sJagEHu1Tk1X6Dx1X1q0pLDNbDZpLzRxVftvepds,24
+kleinkram-0.49.0.dist-info/RECORD,,