mirror of
https://github.com/we-promise/sure.git
synced 2026-04-07 22:34:47 +00:00
* Fix OIDC household invitation (issue #900) - Auto-add existing user when inviting by email (no invite email sent) - Accept page: choose 'Create account' or 'Sign in' (supports OIDC) - Store invitation token in session on sign-in; accept after login (password, OIDC, OIDC link, OIDC JIT, MFA) - Invitation#accept_for!(user): add user to household and mark accepted - Defensive guards: nil/blank user, token normalization, accept_for! return check * Address PR review: rename accept_for! to accept_for, i18n OIDC notice, test fixes, stub Rails.application.config * Fix flaky system test: assert only configure step, not flash message Co-authored-by: Cursor <cursoragent@cursor.com> --------- Signed-off-by: Juan José Mata <juanjo.mata@gmail.com> Co-authored-by: mkdev11 <jaysmth689+github@users.noreply.github.com> Co-authored-by: Juan José Mata <juanjo.mata@gmail.com> Co-authored-by: Cursor <cursoragent@cursor.com>
165 lines
5.4 KiB
Ruby
165 lines
5.4 KiB
Ruby
class OidcAccountsController < ApplicationController
|
|
skip_authentication only: [ :link, :create_link, :new_user, :create_user ]
|
|
layout "auth"
|
|
|
|
def link
|
|
# Check if there's pending OIDC auth in session
|
|
@pending_auth = session[:pending_oidc_auth]
|
|
|
|
if @pending_auth.nil?
|
|
redirect_to new_session_path, alert: "No pending OIDC authentication found"
|
|
return
|
|
end
|
|
|
|
@email = @pending_auth["email"]
|
|
@user_exists = User.exists?(email: @email) if @email.present?
|
|
|
|
# Determine whether we should offer JIT account creation for this
|
|
# pending auth, based on JIT mode and allowed domains.
|
|
@allow_account_creation = !AuthConfig.jit_link_only? && AuthConfig.allowed_oidc_domain?(@email)
|
|
end
|
|
|
|
def create_link
|
|
@pending_auth = session[:pending_oidc_auth]
|
|
|
|
if @pending_auth.nil?
|
|
redirect_to new_session_path, alert: "No pending OIDC authentication found"
|
|
return
|
|
end
|
|
|
|
# Verify user's password to confirm identity
|
|
user = User.authenticate_by(email: params[:email], password: params[:password])
|
|
|
|
if user
|
|
# Create the OIDC identity link
|
|
oidc_identity = OidcIdentity.create_from_omniauth(
|
|
build_auth_hash(@pending_auth),
|
|
user
|
|
)
|
|
|
|
# Log account linking
|
|
SsoAuditLog.log_link!(
|
|
user: user,
|
|
provider: @pending_auth["provider"],
|
|
request: request
|
|
)
|
|
|
|
# Clear pending auth from session
|
|
session.delete(:pending_oidc_auth)
|
|
|
|
if user.otp_required?
|
|
session[:mfa_user_id] = user.id
|
|
redirect_to verify_mfa_path
|
|
else
|
|
@session = create_session_for(user)
|
|
notice = if accept_pending_invitation_for(user)
|
|
t("invitations.accept_choice.joined_household")
|
|
else
|
|
t("sessions.openid_connect.account_linked", provider: @pending_auth["provider"])
|
|
end
|
|
redirect_to root_path, notice: notice
|
|
end
|
|
else
|
|
@email = params[:email]
|
|
@user_exists = User.exists?(email: @email) if @email.present?
|
|
flash.now[:alert] = "Invalid email or password"
|
|
render :link, status: :unprocessable_entity
|
|
end
|
|
end
|
|
|
|
def new_user
|
|
# Check if there's pending OIDC auth in session
|
|
@pending_auth = session[:pending_oidc_auth]
|
|
|
|
if @pending_auth.nil?
|
|
redirect_to new_session_path, alert: "No pending OIDC authentication found"
|
|
return
|
|
end
|
|
|
|
# Pre-fill user details from OIDC provider
|
|
@user = User.new(
|
|
email: @pending_auth["email"],
|
|
first_name: @pending_auth["first_name"],
|
|
last_name: @pending_auth["last_name"]
|
|
)
|
|
end
|
|
|
|
def create_user
|
|
@pending_auth = session[:pending_oidc_auth]
|
|
|
|
if @pending_auth.nil?
|
|
redirect_to new_session_path, alert: "No pending OIDC authentication found"
|
|
return
|
|
end
|
|
|
|
email = @pending_auth["email"]
|
|
|
|
# Respect global JIT configuration: in link_only mode or when the email
|
|
# domain is not allowed, block JIT account creation and send the user
|
|
# back to the login page with a clear message.
|
|
unless !AuthConfig.jit_link_only? && AuthConfig.allowed_oidc_domain?(email)
|
|
redirect_to new_session_path, alert: "SSO account creation is disabled. Please contact an administrator."
|
|
return
|
|
end
|
|
|
|
# Create SSO-only user without local password.
|
|
# Security: JIT users should NOT have password_digest set to prevent
|
|
# chained authentication attacks where SSO users gain local login access
|
|
# via password reset.
|
|
# Allow user to edit first_name and last_name from the form, but email comes from OIDC
|
|
user_params = params.fetch(:user, {}).permit(:first_name, :last_name)
|
|
@user = User.new(
|
|
email: email,
|
|
first_name: user_params[:first_name].presence || @pending_auth["first_name"],
|
|
last_name: user_params[:last_name].presence || @pending_auth["last_name"],
|
|
skip_password_validation: true
|
|
)
|
|
|
|
# Create new family for this user
|
|
@user.family = Family.new
|
|
|
|
# Use provider-configured default role, or fall back to admin for family creators
|
|
# First user of an instance always becomes super_admin regardless of provider config
|
|
provider_config = Rails.configuration.x.auth.sso_providers&.find { |p| p[:name] == @pending_auth["provider"] }
|
|
provider_default_role = provider_config&.dig(:settings, :default_role)
|
|
@user.role = User.role_for_new_family_creator(fallback_role: provider_default_role || :admin)
|
|
|
|
if @user.save
|
|
# Create the OIDC (or other SSO) identity
|
|
identity = OidcIdentity.create_from_omniauth(
|
|
build_auth_hash(@pending_auth),
|
|
@user
|
|
)
|
|
|
|
# Only log JIT account creation if identity was successfully created
|
|
if identity.persisted?
|
|
SsoAuditLog.log_jit_account_created!(
|
|
user: @user,
|
|
provider: @pending_auth["provider"],
|
|
request: request
|
|
)
|
|
end
|
|
|
|
# Clear pending auth from session
|
|
session.delete(:pending_oidc_auth)
|
|
|
|
@session = create_session_for(@user)
|
|
notice = accept_pending_invitation_for(@user) ? t("invitations.accept_choice.joined_household") : "Welcome! Your account has been created."
|
|
redirect_to root_path, notice: notice
|
|
else
|
|
render :new_user, status: :unprocessable_entity
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
# Convert pending auth hash to OmniAuth-like structure
|
|
def build_auth_hash(pending_auth)
|
|
OpenStruct.new(
|
|
provider: pending_auth["provider"],
|
|
uid: pending_auth["uid"],
|
|
info: OpenStruct.new(pending_auth.slice("email", "name", "first_name", "last_name"))
|
|
)
|
|
end
|
|
end
|