Skip to content

[Cherry-pick] Setting flow state to COMPLETE when retrieving cached token (#112) #113

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.

Sign up for GitHub

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

Merged
axelsrz merged 2 commits into from
Sep 9, 2025
Merged

[Cherry-pick] Setting flow state to COMPLETE when retrieving cached token (#112) #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68699f0
Setting flow state to COMPLETE when retrieving cached token (#112)
rodrigobr-msft Sep 9, 2025
28ec804
adding pipeline trigger to pr against release branch (#114)
axelsrz Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .azdo/ci-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
pr:
- main
- dev
- release/*

pool:
vmImage: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ name: "CodeQL Advanced"

on:
push:
branches: [ "main" ]
branches: [ "main", "release/*" ]
pull_request:
branches: [ "main" ]
branches: [ "main", "release/*" ]
schedule:
- cron: '22 7 * * 4'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ permissions:

on:
push:
branches: [ "main" ]
branches: [ "main", "release/*" ]
pull_request:
branches: [ "main" ]
branches: [ "main", "release/*" ]

jobs:
build:
Expand Down
1 change: 1 addition & 0 deletions libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/oauth/oauth_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ async def get_user_token(self, magic_code: str = None) -> TokenResponse:
self._flow_state.expiration = (
datetime.now().timestamp() + self._default_flow_duration
)
self._flow_state.tag = FlowStateTag.COMPLETE

return token_response

Expand Down
2 changes: 2 additions & 0 deletions libraries/microsoft-agents-hosting-core/tests/test_oauth_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ async def test_get_user_token_success(self, sample_flow_state, user_token_client
flow = OAuthFlow(sample_flow_state, user_token_client)
expected_final_flow_state = sample_flow_state
expected_final_flow_state.user_token = RES_TOKEN
expected_final_flow_state.tag = FlowStateTag.COMPLETE

# test
token_response = await flow.get_user_token()
Expand Down Expand Up @@ -201,6 +202,7 @@ async def test_begin_flow_easy_case(
activity = mocker.Mock(spec=Activity)
expected_flow_state = sample_flow_state
expected_flow_state.user_token = RES_TOKEN
expected_flow_state.tag = FlowStateTag.COMPLETE

# test
response = await flow.begin_flow(activity)
Expand Down