Merge pull request #96 from britive/checkin-correct-type

checkin correct version of the profile

Author: twratl

CHANGELOG.md

@@ -11,7 +11,8 @@
 
 #### Bug Fixes
 * Fixes an issue with interactive login when randomly generated tokens include `--` which the WAF sometimes sees as a SQL injection attack
-* Fix an issue with `ssh-add` and temporary keys filling up the `ssh-agent` due to the order of command flags
+* Fixes an issue with `ssh-add` and temporary keys filling up the `ssh-agent` due to the order of command flags
+* Fixes and issue with `checkin` checking in the wrong profile type (programmatic vs console)
 
 #### Dependencies
 * None

src/pybritive/britive_cli.py

@@ -377,7 +377,7 @@ def __get_cloud_credential_printer(self, app_type, console, mode, profile, silen
                 cli=self
             )
 
-    def checkin(self, profile):
+    def checkin(self, profile, console):
         self.login()
         self._set_available_profiles()
         parts = self._split_profile_into_parts(profile)
@@ -388,18 +388,21 @@ def checkin(self, profile):
             application_name=parts['app']
         )
 
+        access_type = 'CONSOLE' if console else 'PROGRAMMATIC'
+
         transaction_id = None
         application_type = None
         for checked_out_profile in self.b.my_access.list_checked_out_profiles():
             same_env = checked_out_profile['environmentId'] == ids['environment_id']
             same_profile = checked_out_profile['papId'] == ids['profile_id']
-            if all([same_env, same_profile]):
+            same_access_type = checked_out_profile['accessType'] == access_type
+            if all([same_env, same_profile, same_access_type]):
                 transaction_id = checked_out_profile['transactionId']
 
                 for available_profile in self.available_profiles:
                     same_env_2 = checked_out_profile['environmentId'] == available_profile['env_id']
                     same_profile_2 = checked_out_profile['papId'] == available_profile['profile_id']
-                    if all([same_env_2, same_profile_2]):
+                    if all([same_env_2, same_profile_2, access_type == 'PROGRAMMATIC']):
                         application_type = available_profile['app_type'].lower()
                         break
                 break

src/pybritive/commands/checkin.py

@@ -6,16 +6,17 @@
 
 @click.command()
 @build_britive
-@britive_options(names='tenant,token,silent,passphrase,federation_provider')
+@britive_options(names='console,tenant,token,silent,passphrase,federation_provider')
 @click_smart_profile_argument
-def checkin(ctx, tenant, token, silent, passphrase, federation_provider, profile):
+def checkin(ctx, console, tenant, token, silent, passphrase, federation_provider, profile):
     """Checkin a profile.
 
     This command takes 1 required argument `PROFILE`. This should be a string representation of the profile
     that should be checked in. Format is `application name/environment name/profile name`.
     """
     ctx.obj.britive.checkin(
-        profile=profile
+        profile=profile,
+        console=console
     )
 
 

src/pybritive/options/console.py

@@ -6,6 +6,6 @@
     default=False,
     is_flag=True,
     show_default=True,
-    help='Checkout the console access for the profile instead of programmatic access.'
+    help='Checkout/checkin the console access for the profile instead of programmatic access.'
 )