fix: Fix get_active_profile to always return a profile

#13
Branch: Profiles-13

Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>

Author: gabe-l-hart

cforge/commands/settings/whoami.py

@@ -18,13 +18,14 @@ def whoami() -> None:
     Displays where the authentication token is coming from (if any) and
     information about the active profile if one is set.
     """
+
     console = get_console()
     settings = get_settings()
     env_token = settings.mcpgateway_bearer_token
     stored_token = load_token()
     active_profile = get_active_profile()
 
-    # Display active profile information if available
+    # Display active profile information
     console.print("[bold cyan]Active Profile:[/bold cyan]")
     console.print(f"  [cyan]Name:[/cyan] {active_profile.name}")
     console.print(f"  [cyan]ID:[/cyan] {active_profile.id}")

cforge/profile_utils.py

@@ -210,24 +210,26 @@ def get_profile(profile_id: str) -> Optional[AuthProfile]:
         return store.profiles.get(profile_id)
 
 
-def get_active_profile() -> Optional[AuthProfile]:
+def get_active_profile() -> AuthProfile:
     """Get the currently active profile, including the virtual default profile.
 
     Returns:
-        AuthProfile if an active profile is set, or the virtual default profile
-        if no Desktop default exists
+        AuthProfile if an active profile is set, or default (virtual or desktop)
     """
     if (store := load_profile_store()) and store.active_profile_id:
-        return store.profiles.get(store.active_profile_id)
+        profile = store.profiles.get(store.active_profile_id)
+        if not profile:
+            raise ValueError("BAD STATE: Profile store active profile id not found in profiles")
+        return profile
 
     # Check if Desktop app has created a default profile
     expected_default_url = get_default_api_url()
 
     if store:
         for profile in store.profiles.values():
             if profile.api_url == expected_default_url and profile.metadata and profile.metadata.is_internal:
-                # Desktop default exists, return None (no active profile)
-                return None
+                # If Desktop default exists, use that
+                return profile
 
     # Return virtual default profile if no Desktop default exists
     return AuthProfile(

tests/commands/settings/test_profiles.py

@@ -552,7 +552,7 @@ def test_profiles_create_success(self, mock_console, mock_settings) -> None:
                         "created_at": datetime.now(),
                     }
 
-                    profiles_create()
+                    profiles_create(None)
 
         # Verify success message
         print_calls = [str(call) for call in mock_console.print.call_args_list]
@@ -578,7 +578,7 @@ def test_profiles_create_and_enable(self, mock_console, mock_settings) -> None:
                                 "created_at": datetime.now(),
                             }
 
-                            profiles_create()
+                            profiles_create(None)
 
         # Verify success and enable messages
         print_calls = [str(call) for call in mock_console.print.call_args_list]
@@ -591,7 +591,7 @@ def test_profiles_create_error(self, mock_console, mock_settings) -> None:
         with patch("cforge.commands.settings.profiles.get_console", return_value=mock_console):
             with patch("cforge.commands.settings.profiles.prompt_for_schema", side_effect=Exception("Test error")):
                 with pytest.raises(typer.Exit) as exc_info:
-                    profiles_create()
+                    profiles_create(None)
 
         assert exc_info.value.exit_code == 1
         assert any("Error creating profile" in str(call) for call in mock_console.print.call_args_list)
@@ -612,7 +612,7 @@ def test_profiles_create_enable_fails(self, mock_console, mock_settings) -> None
                             "created_at": datetime.now(),
                         }
 
-                        profiles_create()
+                        profiles_create(None)
 
         # Verify failure message
         print_calls = [str(call) for call in mock_console.print.call_args_list]
@@ -650,7 +650,7 @@ def test_profiles_create_with_existing_store(self, mock_console, mock_settings)
                         "created_at": datetime.now(),
                     }
 
-                    profiles_create()
+                    profiles_create(None)
 
         # Verify both profiles exist in the store
         updated_store = load_profile_store()

tests/commands/settings/test_whoami.py

@@ -25,22 +25,11 @@ def test_whoami_with_env_token(self, mock_settings, mock_console) -> None:
         with patch("cforge.commands.settings.whoami.get_console", return_value=mock_console):
             with patch("cforge.commands.settings.whoami.get_settings", return_value=mock_settings):
                 with patch("cforge.commands.settings.whoami.load_token", return_value=None):
-                    with patch("cforge.commands.settings.whoami.get_active_profile", return_value=None):
-                        whoami()
-
-        # Verify console output
-        assert mock_console.print.call_count == 2
-
-        # Check first call - authentication status
-        first_call = mock_console.print.call_args_list[0][0][0]
-        assert "Authenticated via MCPGATEWAY_BEARER_TOKEN" in first_call
-        assert "[green]" in first_call
+                    whoami()
 
-        # Check second call - token preview
-        second_call = mock_console.print.call_args_list[1][0][0]
-        assert "Token:" in second_call
-        assert "env_token_" in second_call
-        assert "..." in second_call
+        call_messages = [call[0][0] for call in mock_console.print.call_args_list if call and call[0]]
+        assert any("Authenticated via MCPGATEWAY_BEARER_TOKEN" in call for call in call_messages)
+        assert any("env_token_" in call for call in call_messages)
 
     def test_whoami_with_stored_token(self, mock_settings, mock_console) -> None:
         """Test whoami when authenticated via stored token file."""
@@ -50,22 +39,11 @@ def test_whoami_with_stored_token(self, mock_settings, mock_console) -> None:
         with patch("cforge.commands.settings.whoami.get_console", return_value=mock_console):
             with patch("cforge.commands.settings.whoami.get_settings", return_value=mock_settings):
                 with patch("cforge.commands.settings.whoami.load_token", return_value=stored_token):
-                    with patch("cforge.commands.settings.whoami.get_active_profile", return_value=None):
-                        whoami()
-
-        # Verify console output
-        assert mock_console.print.call_count == 2
-
-        # Check first call - authentication status with file path
-        first_call = mock_console.print.call_args_list[0][0][0]
-        assert "Authenticated via stored token" in first_call
-        assert "[green]" in first_call
+                    whoami()
 
-        # Check second call - token preview
-        second_call = mock_console.print.call_args_list[1][0][0]
-        assert "Token:" in second_call
-        assert "stored_tok" in second_call
-        assert "..." in second_call
+        call_messages = [call[0][0] for call in mock_console.print.call_args_list if call and call[0]]
+        assert any("Authenticated via stored token" in call for call in call_messages)
+        assert any("stored_tok" in call for call in call_messages)
 
     def test_whoami_not_authenticated(self, mock_settings, mock_console) -> None:
         """Test whoami when not authenticated."""
@@ -75,17 +53,11 @@ def test_whoami_not_authenticated(self, mock_settings, mock_console) -> None:
         with patch("cforge.commands.settings.whoami.get_console", return_value=mock_console):
             with patch("cforge.commands.settings.whoami.get_settings", return_value=mock_settings):
                 with patch("cforge.commands.settings.whoami.load_token", return_value=None):
-                    with patch("cforge.commands.settings.whoami.get_active_profile", return_value=None):
-                        whoami()
-
-        # Verify console output
-        mock_console.print.assert_called_once()
+                    whoami()
 
-        # Check output message
-        call_args = mock_console.print.call_args[0][0]
-        assert "Not authenticated" in call_args
-        assert "cforge login" in call_args
-        assert "[yellow]" in call_args
+        call_messages = [call[0][0] for call in mock_console.print.call_args_list if call and call[0]]
+        assert any("Not authenticated" in call for call in call_messages)
+        assert any("cforge login" in call for call in call_messages)
 
     def test_whoami_env_token_takes_precedence(self, mock_settings, mock_console) -> None:
         """Test that env token takes precedence over stored token."""
@@ -96,13 +68,11 @@ def test_whoami_env_token_takes_precedence(self, mock_settings, mock_console) ->
         with patch("cforge.commands.settings.whoami.get_console", return_value=mock_console):
             with patch("cforge.commands.settings.whoami.get_settings", return_value=mock_settings):
                 with patch("cforge.commands.settings.whoami.load_token", return_value=stored_token):
-                    with patch("cforge.commands.settings.whoami.get_active_profile", return_value=None):
-                        whoami()
+                    whoami()
 
-        # Should show env token, not stored token
-        first_call = mock_console.print.call_args_list[0][0][0]
-        assert "MCPGATEWAY_BEARER_TOKEN" in first_call
-        assert "stored token" not in first_call
+        call_messages = [call[0][0] for call in mock_console.print.call_args_list if call and call[0]]
+        assert any("MCPGATEWAY_BEARER_TOKEN" in call for call in call_messages)
+        assert not any("stored token" in call for call in call_messages)
 
 
 class TestWhoamiWithProfiles:

tests/test_profile_utils.py

@@ -699,7 +699,7 @@ def test_get_all_profiles_without_desktop_default(self, mock_settings) -> None:
         assert any(p.id == DEFAULT_PROFILE_ID for p in profiles)
 
     def test_get_active_profile_with_desktop_default_inactive(self, mock_settings) -> None:
-        """Test that None is returned when Desktop default exists but is not active."""
+        """Test that the desktop default is returned when Desktop default exists but is not active."""
         # Create a Desktop-created default profile that is NOT active
         desktop_default = AuthProfile(
             id="random-desktop-id",
@@ -724,7 +724,7 @@ def test_get_active_profile_with_desktop_default_inactive(self, mock_settings) -
         result = get_active_profile()
 
         # Should return None because Desktop default exists (even if not active)
-        assert result is None
+        assert result == desktop_default
 
     def test_get_active_profile_without_desktop_default(self, mock_settings) -> None:
         """Test that virtual default is returned when no Desktop default exists."""