Skip to content

[PM-25949] ExternalCallback Integration tests for SSO Project #6809

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
ike-kottlowski merged 14 commits into from
Jan 10, 2026
Merged

[PM-25949] ExternalCallback Integration tests for SSO Project #6809

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3c8b77f
fix: add new line and fix misspelling
ike-kottlowski Dec 22, 2025
4cac4bb
feat: add new integration test project
ike-kottlowski Dec 22, 2025
196409d
fix: update csproj
ike-kottlowski Dec 30, 2025
1b40a0c
doc: fix spelling
ike-kottlowski Dec 30, 2025
064f462
test: add factory for SSO application; ExternalCallback integration t…
ike-kottlowski Dec 30, 2025
00a5633
test: modified Integration tests to use seeded data instead of servic…
ike-kottlowski Jan 7, 2026
ac9efa3
test: native client test addition
ike-kottlowski Jan 8, 2026
81ee855
Merge branch 'main' into auth/pm-25949/sso-integration-tests
ike-kottlowski Jan 8, 2026
a7fe0c9
fix: fix sln file
ike-kottlowski Jan 8, 2026
5180a62
Merge branch 'auth/pm-25949/sso-integration-tests' of https://github.…
ike-kottlowski Jan 8, 2026
9abe47a
Merge branch 'main' into auth/pm-25949/sso-integration-tests
ike-kottlowski Jan 8, 2026
d4be385
fix: re-organize projects in solution. SsoFactory now in it's own pro…
ike-kottlowski Jan 9, 2026
77562a6
fix: claude: better naming of class fields.
ike-kottlowski Jan 9, 2026
2cffedf
Merge branch 'main' into auth/pm-25949/sso-integration-tests
ike-kottlowski Jan 9, 2026
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
14 changes: 12 additions & 2 deletions bitwarden-server.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,15 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbSeederUtility", "util\DbSeederUtility\DbSeederUtility.csproj", "{17A89266-260A-4A03-81AE-C0468C6EE06E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RustSdk", "util\RustSdk\RustSdk.csproj", "{D1513D90-E4F5-44A9-9121-5E46E3E4A3F7}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedWeb.Test", "test\SharedWeb.Test\SharedWeb.Test.csproj", "{AD59537D-5259-4B7A-948F-0CF58E80B359}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSO.Test", "bitwarden_license\test\SSO.Test\SSO.Test.csproj", "{7D98784C-C253-43FB-9873-25B65C6250D6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "bitwarden_license", "bitwarden_license", "{4446E438-C55F-4F3F-9D19-B1BB4999F8B7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CA5BCFBF-8F56-4684-9A11-C9190BBF1910}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sso.IntegrationTest", "bitwarden_license\test\Sso.IntegrationTest\Sso.IntegrationTest.csproj", "{6B186C92-45B9-452A-B628-A3B2A8E57614}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -354,6 +359,10 @@ Global
{7D98784C-C253-43FB-9873-25B65C6250D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7D98784C-C253-43FB-9873-25B65C6250D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7D98784C-C253-43FB-9873-25B65C6250D6}.Release|Any CPU.Build.0 = Release|Any CPU
{6B186C92-45B9-452A-B628-A3B2A8E57614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6B186C92-45B9-452A-B628-A3B2A8E57614}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6B186C92-45B9-452A-B628-A3B2A8E57614}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6B186C92-45B9-452A-B628-A3B2A8E57614}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -409,8 +418,9 @@ Global
{9A612EBA-1C0E-42B8-982B-62F0EE81000A} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84E}
{17A89266-260A-4A03-81AE-C0468C6EE06E} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84E}
{D1513D90-E4F5-44A9-9121-5E46E3E4A3F7} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84E}
{AD59537D-5259-4B7A-948F-0CF58E80B359} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84F}
{7D98784C-C253-43FB-9873-25B65C6250D6} = {287CFF34-BBDB-4BC4-AF88-1E19A5A4679B}
{CA5BCFBF-8F56-4684-9A11-C9190BBF1910} = {4446E438-C55F-4F3F-9D19-B1BB4999F8B7}
{6B186C92-45B9-452A-B628-A3B2A8E57614} = {CA5BCFBF-8F56-4684-9A11-C9190BBF1910}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E01CBF68-2E20-425F-9EDB-E0A6510CA92F}
Expand Down
3 changes: 2 additions & 1 deletion bitwarden_license/src/Sso/Controllers/AccountController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,7 @@ SsoConfigurationData config
// FIXME: Update this file to be null safe and then delete the line below
#nullable disable
var provider = result.Properties.Items["scheme"];
//Todo: Validate provider is a valid GUID with TryParse instead. When this is invalid it throws an exception
var orgId = new Guid(provider);
var ssoConfig = await _ssoConfigRepository.GetByOrganizationIdAsync(orgId);
if (ssoConfig == null || !ssoConfig.Enabled)
Expand Down Expand Up @@ -615,7 +616,7 @@ SsoConfigurationData ssoConfigData

// Since we're in the auto-provisioning logic, this means that the user exists, but they have not
// authenticated with the org's SSO provider before now (otherwise we wouldn't be auto-provisioning them).
// We've verified that the user is Accepted or Confnirmed, so we can create an SsoUser link and proceed
// We've verified that the user is Accepted or Confirmed, so we can create an SsoUser link and proceed
// with authentication.
await CreateSsoUserRecordAsync(providerUserId, guaranteedExistingUser.Id, organization.Id, guaranteedOrgUser);

Expand Down
Loading
Loading