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

Use single OIDC session auth method instead of per-provider values

Browse Source 
The OIDC provider is already tracked in iam_oidc_states.provider, so
there is no need for provider-specific session auth methods (GOOGLE,
MICROSOFT). Replace them with a single OIDC auth method.

Signed-off-by: Bryan Frimin <bryan@getprobo.com>
This commit is contained in:
Bryan Frimin
2026-03-23 08:31:10 +01:00
parent 7e757bfa06
commit 1d3cc1c65e
3 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/coredata/migrations/20260319T150000Z.sql
View File

@@ -1,5 +1,4 @@
ALTER TYPE session_auth_method ADD VALUE 'GOOGLE'; ALTER TYPE session_auth_method ADD VALUE 'OIDC';
ALTER TYPE session_auth_method ADD VALUE 'MICROSOFT';
CREATE TYPE iam_oidc_provider AS ENUM ( CREATE TYPE iam_oidc_provider AS ENUM (
'GOOGLE', 'GOOGLE',

3
pkg/coredata/session.go
View File

@@ -57,8 +57,7 @@ const (
AuthMethodMagicLink AuthMethod = "MAGIC_LINK" AuthMethodMagicLink AuthMethod = "MAGIC_LINK"
AuthMethodPassword AuthMethod = "PASSWORD" AuthMethodPassword AuthMethod = "PASSWORD"
AuthMethodSAML AuthMethod = "SAML" AuthMethodSAML AuthMethod = "SAML"
AuthMethodGoogle AuthMethod = "GOOGLE" AuthMethodOIDC AuthMethod = "OIDC"
AuthMethodMicrosoft AuthMethod = "MICROSOFT"
) )
func NewRootSession(identityID gid.GID, method AuthMethod, duration time.Duration) *Session { func NewRootSession(identityID gid.GID, method AuthMethod, duration time.Duration) *Session {

12
pkg/server/api/connect/v1/oidc_handler.go
View File

@@ -110,19 +110,11 @@ func (h *OIDCHandler) CallbackHandler(w http.ResponseWriter, r *http.Request) {
return return
} }
var authMethod coredata.AuthMethod
switch provider {
case coredata.OIDCProviderGoogle:
authMethod = coredata.AuthMethodGoogle
case coredata.OIDCProviderMicrosoft:
authMethod = coredata.AuthMethodMicrosoft
}
rootSession := authn.SessionFromContext(ctx) rootSession := authn.SessionFromContext(ctx)
switch { switch {
case rootSession == nil: case rootSession == nil:
rootSession, err = h.iam.AuthService.OpenSessionWithOIDC(ctx, identity.ID, authMethod) rootSession, err = h.iam.AuthService.OpenSessionWithOIDC(ctx, identity.ID, coredata.AuthMethodOIDC)
if err != nil { if err != nil {
h.logger.ErrorCtx(ctx, "cannot open root session", log.Error(err)) h.logger.ErrorCtx(ctx, "cannot open root session", log.Error(err))
httpserver.RenderError(w, http.StatusInternalServerError, errors.New("internal server error")) httpserver.RenderError(w, http.StatusInternalServerError, errors.New("internal server error"))
@@ -136,7 +128,7 @@ func (h *OIDCHandler) CallbackHandler(w http.ResponseWriter, r *http.Request) {
return return
} }
rootSession, err = h.iam.AuthService.OpenSessionWithOIDC(ctx, identity.ID, authMethod) rootSession, err = h.iam.AuthService.OpenSessionWithOIDC(ctx, identity.ID, coredata.AuthMethodOIDC)
if err != nil { if err != nil {
h.logger.ErrorCtx(ctx, "cannot open root session", log.Error(err)) h.logger.ErrorCtx(ctx, "cannot open root session", log.Error(err))
httpserver.RenderError(w, http.StatusInternalServerError, errors.New("internal server error")) httpserver.RenderError(w, http.StatusInternalServerError, errors.New("internal server error"))