roadlib / roadtx small fixes and version update

roadlib/roadtools/roadlib/auth.py

@@ -183,7 +183,7 @@ class Authentication():
             raise AuthenticationException(res.text)
         responsedata = res.json()
         print(responsedata['message'])
-        print(f"Code expires in {responsedata['expires_in']} seconds")
+        # print(f"Code expires in {responsedata['expires_in']} seconds")
         interval = float(responsedata['interval'])
         device_code = responsedata['device_code']
 
@@ -196,7 +196,6 @@ class Authentication():
             time.sleep(interval)
             res = self.requests_post(f"{authority_uri}/oauth2/token", data=polldata)
             tokenreply = res.json()
-            print(tokenreply)
             if res.status_code != 200:
                 # Keep polling
                 if tokenreply['error'] == 'authorization_pending':

roadlib/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_namespace_packages
 setup(name='roadlib',
-      version='0.26.0',
+      version='0.27.0',
       description='ROADtools common components library',
       author='Dirk-jan Mollema',
       author_email='dirkjan@outsidersecurity.nl',

roadtx/roadtools/roadtx/main.py

@@ -271,9 +271,9 @@ def main():
                                 '--kid',
                                 action='store',
                                 help='Key ID configured (default: SHA1 thumbprint of certificate, if provided)')
-    fedauth_parser.add_argument('--cert-pem', action='store', metavar='file', help='Certificate file with Application certificate')
-    fedauth_parser.add_argument('--key-pem', action='store', metavar='file', help='Private key file for Application')
-    fedauth_parser.add_argument('--cert-pfx', action='store', metavar='file', help='Application cert and key as PFX file')
+    fedauth_parser.add_argument('--cert-pem', action='store', metavar='file', help='Certificate file with IdP certificate')
+    fedauth_parser.add_argument('--key-pem', action='store', metavar='file', help='Private key file for IdP')
+    fedauth_parser.add_argument('--cert-pfx', action='store', metavar='file', help='IdP cert and key as PFX file')
     fedauth_parser.add_argument('--pfx-pass', action='store', metavar='password', help='PFX file password')
     fedauth_parser.add_argument('--pfx-base64', action='store', metavar='BASE64', help='PFX file as base64 string')
     fedauth_parser.add_argument('--cae',

roadtx/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup
 setup(name='roadtx',
-      version='1.8.4',
+      version='1.9.0',
       description='ROADtools Token eXchange',
       author='Dirk-jan Mollema',
       author_email='dirkjan@outsidersecurity.nl',
@@ -18,7 +18,7 @@ setup(name='roadtx',
       packages=['roadtools.roadtx'],
       package_data={'roadtools.roadtx': ['firstpartyscopes.json']},
       install_requires=[
-          'roadlib>=0.24',
+          'roadlib>=0.27',
           'requests',
           'selenium',
           'selenium-wire',