vdk-control-cli: Adopt new vdk-control-api-auth library (#840)

With the release of the vdk-control-api-auth library, we now have a stand-alone authentication package that is to be used by all Versatile Data Kit components that need to authenticate against a third-party service. This change adopts the new authentication package in vdk-control-cli, and is now used when issuing `vdk login` commands. Additionally, authentication logic in vdk-control-cli which is overlapping with such logic in vdk-control-api-auth is removed. Testing Done: Installed the new changes locally and ran `vdk login` to verify that the browser redirecs work as expected. Also, ran a docker container with the latest changes to verify that authentication is possible even when there is no access to a browser. Signed-off-by: Andon Andonov <[email protected]>
vmware · May 20, 2022 · b2f2c9f · b2f2c9f
1 parent 139707b
commit b2f2c9f
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 409 deletions.
diff --git a/projects/vdk-control-cli/requirements.txt b/projects/vdk-control-cli/requirements.txt
@@ -24,5 +24,6 @@ tabulate
 # and use requests_oauthlib only, but for now it seems like there are some custom logic with the first
 # OAuth2 provider which needs to be handled that way
 urllib3>=1.26.5
+vdk-control-api-auth
 
 vdk-control-service-api==1.0.6
diff --git a/projects/vdk-control-cli/setup.cfg b/projects/vdk-control-cli/setup.cfg
@@ -54,6 +54,7 @@ install_requires =
     tabulate
     requests_oauthlib>=1.0
     urllib3>=1.26.5
+    vdk-control-api-auth
 
 # Require a specific Python version
 python_requires = >=3.7, <3.11

diff --git a/projects/vdk-control-cli/src/vdk/internal/control/auth/apikey_auth.py b/projects/vdk-control-cli/src/vdk/internal/control/auth/apikey_auth.py
diff --git a/projects/vdk-control-cli/src/vdk/internal/control/auth/auth_pkce.py b/projects/vdk-control-cli/src/vdk/internal/control/auth/auth_pkce.py
diff --git a/projects/vdk-control-cli/src/vdk/internal/control/auth/redirect_auth.py b/projects/vdk-control-cli/src/vdk/internal/control/auth/redirect_auth.py