fix: issue 3772 #3773

guillaumeblaquiere · 2025-12-01T22:43:56Z

Link to Issue or Description of Change

1. Link to an existing issue (if applicable):

Closes: Credential Manager mix user credential #3772

Problem:
The credential was asked only for the first user connected to the app. Then the credential_manager always served the previous exchange

Solution:
I removed the exchange check and use. I do not find other alternative. I didn't understand the usefulness of this check and use.

Testing Plan

No test broken

Manual End-to-End (E2E) Tests:

This removal solve the issue with multiple user in the same instance. Each of them must authenticated themselve

…text taken into account.

gemini-code-assist · 2025-12-01T22:44:08Z

Summary of Changes

Hello @guillaumeblaquiere, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a critical bug in the authentication flow where the credential_manager was reusing previously exchanged credentials, thereby allowing only the first user to authenticate successfully. The change ensures that each user is prompted for their own authentication by removing the problematic caching logic, leading to a more robust and correct multi-user experience.

Highlights

Authentication Fix: Resolves an issue where the credential manager would incorrectly serve cached credentials, preventing multiple users from authenticating individually within the same application instance.
Code Simplification: Removes a specific code block responsible for checking and returning a cached exchanged_auth_credential, which was identified as the root cause of the multi-user authentication problem.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

adk-bot · 2025-12-01T22:44:49Z

Response from ADK Triaging Agent

Hello @guillaumeblaquiere, thank you for creating this PR!

This PR is a bug fix, could you please provide logs or screenshot after the fix is applied?

This information will help reviewers to review your PR more efficiently. Thanks!

gemini-code-assist

Code Review

This pull request addresses a critical security issue where one user's credentials could be inadvertently used for another. The fix, which removes reading from the in-memory cached exchanged_auth_credential, is correct. This change effectively mitigates the problem by forcing a lookup from the user-specific credential service. The removed caching logic was likely intended for a single-user context but is unsafe in a multi-user environment where CredentialManager instances might be shared. I have one comment regarding follow-up changes to documentation and tests that are affected by this removal.

guillaumeblaquiere · 2025-12-04T20:16:24Z

@ryanaiagent @surajksharma07 I removed the useless (and in error) test because it tested the deleted line.

ryanaiagent · 2026-01-20T04:11:05Z

Hi @guillaumeblaquiere , we appreciate your patience and support. Can you please fix the failing unit tests.

guillaumeblaquiere · 2026-01-24T22:01:19Z

@ryanaiagent unit test fixed

ryanaiagent · 2026-01-26T19:26:47Z

/gemini review

gemini-code-assist

Code Review

The pull request addresses an issue with credential management for multiple users by removing an exchange check. It also includes an update to the pyproject.toml file to configure pythonpath for pytest, which is a good practice for module resolution. Additionally, several test mocks in test_remote_a2a_agent.py have been updated, primarily switching from create_autospec to MagicMock for A2AClient instances and directly accessing an agent's internal converter attribute.

gemini-code-assist · 2026-01-26T19:28:15Z

tests/unittests/agents/test_remote_a2a_agent.py

 import tempfile
 from unittest.mock import AsyncMock
 from unittest.mock import create_autospec
+from unittest.mock import MagicMock


While MagicMock is functional, create_autospec provides stronger type checking and ensures that the mock adheres more closely to the A2AClient interface. This can help catch potential API mismatches or typos during testing, leading to more robust tests. Consider using create_autospec for better test safety.

Suggested change

from unittest.mock import MagicMock

from unittest.mock import create_autospec

Test failed if I use create_autospec

gemini-code-assist · 2026-01-26T19:28:15Z

tests/unittests/agents/test_remote_a2a_agent.py


          # Mock A2A client
-          mock_a2a_client = create_autospec(spec=A2AClient, instance=True)
+          mock_a2a_client = MagicMock(spec=A2AClient)


Changing from create_autospec(spec=A2AClient, instance=True) to MagicMock(spec=A2AClient) reduces the strictness of the mock. create_autospec is generally preferred for unit tests as it ensures the mock's interface matches the real object, which can prevent subtle bugs. I recommend reverting to create_autospec for improved test robustness.

Suggested change

mock_a2a_client = MagicMock(spec=A2AClient)

mock_a2a_client = create_autospec(spec=A2AClient, instance=True)

Test failed if I use create_autospec

gemini-code-assist · 2026-01-26T19:28:15Z

tests/unittests/agents/test_remote_a2a_agent.py


          # Mock A2A client
-          mock_a2a_client = create_autospec(spec=A2AClient, instance=True)
+          mock_a2a_client = MagicMock(spec=A2AClient)


Changing from create_autospec(spec=A2AClient, instance=True) to MagicMock(spec=A2AClient) reduces the strictness of the mock. create_autospec is generally preferred for unit tests as it ensures the mock's interface matches the real object, which can prevent subtle bugs. I recommend reverting to create_autospec for improved test robustness.

Suggested change

mock_a2a_client = MagicMock(spec=A2AClient)

mock_a2a_client = create_autospec(spec=A2AClient, instance=True)

Test failed if I use create_autospec

gemini-code-assist · 2026-01-26T19:28:15Z

tests/unittests/agents/test_remote_a2a_agent.py


          # Mock A2A client
-          mock_a2a_client = create_autospec(spec=A2AClient, instance=True)
+          mock_a2a_client = MagicMock(spec=A2AClient)


Changing from create_autospec(spec=A2AClient, instance=True) to MagicMock(spec=A2AClient) reduces the strictness of the mock. create_autospec is generally preferred for unit tests as it ensures the mock's interface matches the real object, which can prevent subtle bugs. I recommend reverting to create_autospec for improved test robustness.

Suggested change

mock_a2a_client = MagicMock(spec=A2AClient)

mock_a2a_client = create_autospec(spec=A2AClient, instance=True)

Test failed if I use create_autospec

fix: issue 3772. Remove not understood check without any callback_con…

86c8f0c

…text taken into account.

adk-bot added the core [Component] This issue is related to the core interface and implementation label Dec 1, 2025

gemini-code-assist bot reviewed Dec 1, 2025

View reviewed changes

Merge branch 'main' into fix-3772

ffc7b8e

surajksharma07 mentioned this pull request Dec 2, 2025

Credential Manager mix user credential #3772

Closed

guillaumeblaquiere added 4 commits December 2, 2025 20:53

Merge branch 'main' into fix-3772

4bddf57

Merge branch 'main' into fix-3772

f6c6689

Merge branch 'main' into fix-3772

6286b86

Merge branch 'main' into fix-3772

452611c

ryanaiagent self-assigned this Dec 4, 2025

fix: irrelevant test because the exchanged cache has been removed

cd9795d

guillaumeblaquiere added 7 commits December 12, 2025 13:08

Merge branch 'main' into fix-3772

5fd7d38

Merge branch 'main' into fix-3772

0fde4ac

Merge branch 'main' into fix-3772

d89a0cb

Merge branch 'main' into fix-3772

ef1dcab

Merge branch 'main' into fix-3772

5382a9a

Merge branch 'main' into fix-3772

2ed38f5

Merge branch 'main' into fix-3772

faa12be

ryanaiagent added the request clarification [Status] The maintainer need clarification or more information from the author label Jan 20, 2026

chore: fix unit test

a82d190

gemini-code-assist bot reviewed Jan 26, 2026

View reviewed changes

	from unittest.mock import MagicMock
	from unittest.mock import create_autospec

	mock_a2a_client = MagicMock(spec=A2AClient)
	mock_a2a_client = create_autospec(spec=A2AClient, instance=True)

fix: issue 3772 #3773

Are you sure you want to change the base?

fix: issue 3772 #3773

Conversation

guillaumeblaquiere commented Dec 1, 2025

Link to Issue or Description of Change

Testing Plan

Uh oh!

gemini-code-assist bot commented Dec 1, 2025

Summary of Changes

Highlights

Footnotes

Uh oh!

adk-bot commented Dec 1, 2025

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

guillaumeblaquiere commented Dec 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ryanaiagent commented Jan 20, 2026

Uh oh!

guillaumeblaquiere commented Jan 24, 2026

Uh oh!

ryanaiagent commented Jan 26, 2026

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist bot Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

guillaumeblaquiere Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

guillaumeblaquiere Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

guillaumeblaquiere Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

guillaumeblaquiere Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

guillaumeblaquiere commented Dec 4, 2025 •

edited

Loading