rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement activate account page

Browse Source 
Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
Émile Ré
2026-02-17 14:30:32 +04:00
parent 47aba96b69
commit 5ab5d2cc4c
13 changed files with 278 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/iam/session_service.go
View File

@@ -573,16 +573,23 @@ func (s SessionService) AssumeOrganizationSession(
return fmt.Errorf("cannot load SAML configuration: %w", err)
}
if err == nil && samlConfig.EnforcementPolicy == coredata.SAMLEnforcementPolicyRequired {
if rootSession.AuthMethod != coredata.AuthMethodSAML {
return NewSAMLAuthenticationRequiredError("policy_requirement")
if err == nil {
switch samlConfig.EnforcementPolicy {
case coredata.SAMLEnforcementPolicyRequired:
if rootSession.AuthMethod != coredata.AuthMethodSAML {
return NewSAMLAuthenticationRequiredError("policy_requirement")
}
case coredata.SAMLEnforcementPolicyOptional:
// SAML is optional: both PASSWORD and SAML root sessions are allowed.
}
} else {
switch rootSession.AuthMethod {
case coredata.AuthMethodPassword:
case coredata.AuthMethodSAML:
// No (or non-required) SAML configuration: require a password-authenticated or magic-link root session
// (eg. when switching into a password-based org from a SAML login)
return NewPasswordAuthenticationRequiredError("password_authentication_required")
}
} else if err == nil && samlConfig.EnforcementPolicy == coredata.SAMLEnforcementPolicyOptional {
// SAML is optional: both PASSWORD and SAML root sessions are allowed.
} else if rootSession.AuthMethod != coredata.AuthMethodPassword {
// No (or non-required) SAML configuration: require a password-authenticated root session
// (eg. when switching into a password-based org from a SAML login).
return NewPasswordRequiredError("password_authentication_required")
}
tenantID := scope.GetTenantID()