Skip to content
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

Jump to bottom

SSO + Teams cherry pick from 4.9 #2589

Merged
merged 2 commits into from
Jul 28, 2020
Merged

SSO + Teams cherry pick from 4.9 #2589

merged 2 commits into from
Jul 28, 2020

Conversation

carlosscastro
Copy link
Member

No description provided.

@carlosscastro
Teams + SSO: Update OAuthcard channel support and return 412 instead…
fcd5db1 
… of 409 on sso fail (#2407)

* Teams + SSO: Update OAuthcard channel support and return 412 instead of 409 on sso fail

* SSO: Update OAuthPrompt test to match new status code
@carlosscastro
SSO + Teams: Maintain sign-in link for Teams OAuth (#2520)
9991bf3
@carlosscastro carlosscastro requested a review from stevengum July 27, 2020 19:19
@coveralls
Copy link

coveralls commented Jul 27, 2020 •
edited
Loading

Pull Request Test Coverage Report for Build 150530

  • 4 of 5 (80.0%) changed or added relevant lines in 2 files are covered.
  • 9 unchanged lines in 2 files lost coverage.
  • Overall coverage decreased (-0.07%) to 81.564%
Changes Missing Coverage Covered Lines Changed/Added Lines %
libraries/botbuilder-dialogs/src/prompts/oauthPrompt.ts 3 4 75.0%
Files with Coverage Reduction New Missed Lines %
libraries/botframework-streaming/src/webSocket/webSocketTransport.ts 2 80.65%
libraries/botframework-streaming/src/webSocket/webSocketServer.ts 7 66.67%
Totals Coverage Status
Change from base Build 150489: -0.07%
Covered Lines: 13449
Relevant Lines: 15722
💛 - Coveralls

@stevengum stevengum merged commit 1908c68 into master Jul 28, 2020
@stevengum stevengum deleted the ccastro/sso-teams-cherry-pick branch July 28, 2020 06:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stevengum stevengum stevengum approved these changes

@EricDahlvang EricDahlvang Awaiting requested review from EricDahlvang

@johnataylor johnataylor Awaiting requested review from johnataylor

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@carlosscastro @coveralls @stevengum