-
Notifications
You must be signed in to change notification settings - Fork 6
Introduce msal #191
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Introduce msal #191
Conversation
e41253e to
4a83f10
Compare
## Context This fixes #184 which stated that the token wasn't being refreshed after an hour. This was because we weren't refreshing it on use. In typescript, we refresh the token on every [app.process](https://github.com/microsoft/teams.ts/blob/1f2d735ce02d0add1dc308f9e9df28f0c3fb6985/packages/apps/src/app.process.ts#L31). But this actually still leaves _proactive scenarios_ to used an cached, potentially expired, tokens. To remediate this, the token that gets passed to the API is a factory which refreshes the token if the cached token is expired. For the record C# sets the token value to be [refreshable](https://github.com/microsoft/teams.net/blob/19e4df96dac1524ae99d6c06bd4891fa5535ca67/Libraries/Microsoft.Teams.Apps/App.cs#L67C1-L67C46) (just as this PR is attempting to do). ## Changes This PR includes several changes 1. No more graph token manager. Instead we now have a TokenManager which manages all tokens. Soon, this might change to msal doing the changes 2. The app no longer refreshes token on start. But it does it the first time the token is being used. Because of this, the id field is now from the credentials, and the "name" field had to be removed. I don't think this should cause a big deal because name is honestly, not a very well used (or documented) field. **This is a breaking change though**. 3. The token that's being passed around now is an async function that either gets the token from the cache, or refreshes it if it's expired. ## Testing 1. Unit tests 2. Sanity tests to make sure we can send messages etc normally. 3. Tested to make sure app token refreshes automatically after an hour 4. Tested user graph tokens 5. Tested app graph tokens #### PR Dependency Tree * **PR #187** 👈 * **PR #191** * **PR #192** * **PR #193** This tree was auto-generated by [Charcoal](https://github.com/danerwilliams/charcoal)
b4b57a3 to
1a84d4d
Compare
1a84d4d to
d086aea
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This PR migrates the TokenManager from using a custom BotTokenClient to using the Microsoft Authentication Library (MSAL) for acquiring authentication tokens. The changes remove the dependency on http_client and implement direct MSAL integration with token caching by tenant ID.
Key Changes:
- Replaced custom HTTP-based token acquisition with MSAL's
ConfidentialClientApplication - Removed token caching logic in favor of letting MSAL handle it internally
- Added MSAL dependency (
>=1.33.0) to the project and configured type stubs
Reviewed Changes
Copilot reviewed 6 out of 7 changed files in this pull request and generated 6 comments.
Show a summary per file
| File | Description |
|---|---|
packages/apps/pyproject.toml |
Added msal>=1.33.0 dependency |
uv.lock |
Updated lockfile to include MSAL dependency |
stubs/msal/__init__.pyi |
Added type stubs for MSAL's ConfidentialClientApplication |
pyrightconfig.json |
Configured stub path for type checking |
packages/apps/src/microsoft/teams/apps/token_manager.py |
Refactored token acquisition to use MSAL instead of BotTokenClient |
packages/apps/src/microsoft/teams/apps/app.py |
Removed http_client parameter from TokenManager initialization |
packages/apps/tests/test_token_manager.py |
Updated tests to mock MSAL instead of BotTokenClient |
Comments suppressed due to low confidence (2)
packages/apps/src/microsoft/teams/apps/token_manager.py:51
- The docstring references a
forceparameter that no longer exists in the function signature (removed in line 45). This documentation should be removed.
force: Force refresh even if token is not expired
packages/apps/src/microsoft/teams/apps/token_manager.py:82
- Variable tenant_id_param is not used.
tenant_id_param = tenant_id or credentials.tenant_id or "botframework.com"
9c39533 to
d086aea
Compare
|
@copilot can you review this PR again |
|
@heyitsaamir I've opened a new pull request, #204, to work on those changes. Once the pull request is ready, I'll request review from you. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
Copilot reviewed 6 out of 7 changed files in this pull request and generated 1 comment.
Comments suppressed due to low confidence (2)
packages/apps/src/microsoft/teams/apps/token_manager.py:51
- The docstring still references a
forceparameter that no longer exists in the function signature. This line should be removed from the documentation.
force: Force refresh even if token is not expired
packages/apps/src/microsoft/teams/apps/token_manager.py:82
- Variable tenant_id_param is not used.
tenant_id_param = tenant_id or credentials.tenant_id or "botframework.com"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
Copilot reviewed 6 out of 7 changed files in this pull request and generated 2 comments.
Comments suppressed due to low confidence (2)
packages/apps/src/microsoft/teams/apps/token_manager.py:51
- The docstring references a
forceparameter that no longer exists in the function signature. This outdated documentation should be removed.
tenant_id: If provided, gets a tenant-specific token. Otherwise uses app's default.
force: Force refresh even if token is not expired
packages/apps/src/microsoft/teams/apps/token_manager.py:82
- Variable tenant_id_param is not used.
tenant_id_param = tenant_id or credentials.tenant_id or "botframework.com"
Co-authored-by: Copilot <[email protected]>
| """ | ||
| if not self._credentials: | ||
| self._logger.debug("No credentials provided for graph token refresh") | ||
| return await self._get_token("https://graph.microsoft.com/.default", tenant_id) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: should we have these urls in a list of consts to avoid magic strings?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yup we should. That might make @lilyydu's life easier
|
|
||
| return JsonWebToken(access_token) | ||
|
|
||
| def _get_msal_client_for_tenant(self, tenant_id: str) -> ConfidentialClientApplication: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do you know if this / MSAL supports regional bots
In this PR, we introduce MSAL as a dependency to take care of authentication for us. We replace the use of bot token client with this library. It still uses secrets by default, but uses MSAL to do it.
Tested the general flows (regular + graph)
PR Dependency Tree
This tree was auto-generated by Charcoal