mirror of
https://github.com/Freika/dawarich.git
synced 2026-01-10 01:01:39 -05:00
* Implement OmniAuth GitHub authentication * Fix omniauth GitHub scope to include user email access * Remove margin-bottom * Implement Google OAuth2 authentication * Implement OIDC authentication for Dawarich using omniauth_openid_connect gem. * Add patreon account linking and patron checking service * Update docker-compose.yml to use boolean values instead of strings * Add support for KML files * Add tests * Update changelog * Remove patreon OAuth integration * Move omniauthable to a concern * Update an icon in integrations * Update changelog * Update app version * Fix family location sharing toggle * Move family location sharing to its own controller * Update changelog * Implement basic tagging functionality for places, allowing users to categorize and label places with custom tags. * Add places management API and tags feature * Add some changes related to places management feature * Fix some tests * Fix sometests * Add places layer * Update places layer to use Leaflet.Control.Layers.Tree for hierarchical layer control * Rework tag form * Add hashtag * Add privacy zones to tags * Add notes to places and manage place tags * Update changelog * Update e2e tests * Extract tag serializer to its own file * Fix some tests * Fix tags request specs * Fix some tests * Fix rest of the tests * Revert some changes * Add missing specs * Revert changes in place export/import code * Fix some specs * Fix PlaceFinder to only consider global places when finding existing places * Fix few more specs * Fix visits creator spec * Fix last tests * Update place creating modal * Add home location based on "Home" tagged place * Save enabled tag layers * Some fixes * Fix bug where enabling place tag layers would trigger saving enabled layers, overwriting with incomplete data * Update migration to use disable_ddl_transaction! and add up/down methods * Fix tag layers restoration and filtering logic * Update OIDC auto-registration and email/password registration settings * Fix potential xss
49 lines
1.3 KiB
Ruby
49 lines
1.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module Omniauthable
|
|
extend ActiveSupport::Concern
|
|
|
|
class_methods do
|
|
def from_omniauth(access_token)
|
|
data = access_token.info
|
|
provider = access_token.provider
|
|
uid = access_token.uid
|
|
|
|
# First, try to find user by provider and uid (for linked accounts)
|
|
user = find_by(provider: provider, uid: uid)
|
|
|
|
return user if user
|
|
|
|
# If not found, try to find by email
|
|
user = find_by(email: data['email']) if data['email'].present?
|
|
|
|
if user
|
|
# Update provider and uid for existing user (first-time linking)
|
|
user.update!(provider: provider, uid: uid)
|
|
|
|
return user
|
|
end
|
|
|
|
# Check if auto-registration is allowed for OIDC
|
|
return nil if provider == 'openid_connect' && !oidc_auto_register_enabled?
|
|
|
|
# Attempt to create user (will fail validation if email is blank)
|
|
create(
|
|
email: data['email'],
|
|
password: Devise.friendly_token[0, 20],
|
|
provider: provider,
|
|
uid: uid
|
|
)
|
|
end
|
|
|
|
private
|
|
|
|
def oidc_auto_register_enabled?
|
|
# Default to true for backward compatibility
|
|
env_value = ENV['OIDC_AUTO_REGISTER']
|
|
return true if env_value.nil?
|
|
|
|
ActiveModel::Type::Boolean.new.cast(env_value)
|
|
end
|
|
end
|
|
end
|