Add comprehensive tests for OAuth integration and user creation

- Introduced new spec for Simple OAuth Flow in `oauth_simple_spec.rb` to validate user creation and integration handling.
- Enhanced `person_platform_integration_spec.rb` with tests for attributes extraction, token management, and integration updates.
- Created `devise_user_spec.rb` to test user creation from OAuth and attribute setting from auth hash.
- Added support helpers in `oauth_test_helpers.rb` for generating mock OAuth auth hashes for various providers.
- Implemented shared examples in `oauth_examples.rb` for consistent testing of OAuth authentication flows and token management.

Author: rsmithlal

app/builders/better_together/external_platform_builder.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+# app/builders/better_together/external_platform_builder.rb
+
+module BetterTogether
+  # Builder to create external OAuth provider platforms
+  class ExternalPlatformBuilder < Builder
+    OAUTH_PROVIDERS = [
+      {
+        name: 'GitHub',
+        url: 'https://github.com',
+        identifier: 'github',
+        description: 'GitHub OAuth Provider',
+        time_zone: 'UTC'
+      },
+      {
+        name: 'Google',
+        url: 'https://accounts.google.com',
+        identifier: 'google',
+        description: 'Google OAuth Provider',
+        time_zone: 'UTC'
+      },
+      {
+        name: 'Facebook',
+        url: 'https://www.facebook.com',
+        identifier: 'facebook',
+        description: 'Facebook OAuth Provider',
+        time_zone: 'UTC'
+      },
+      {
+        name: 'LinkedIn',
+        url: 'https://linkedin.com',
+        identifier: 'linkedin',
+        description: 'LinkedIn OAuth Provider',
+        time_zone: 'UTC'
+      }
+    ].freeze
+
+    class << self
+      def seed_data
+        puts "Creating #{OAUTH_PROVIDERS.length} external OAuth provider platforms..."
+
+        OAUTH_PROVIDERS.each do |provider_attrs|
+          create_external_platform(provider_attrs)
+        end
+
+        puts '✓ Successfully processed all OAuth providers'
+      end
+
+      # Clear existing external platforms - Use with caution!
+      def clear_existing
+        count = Platform.external.count
+        Platform.external.delete_all
+        puts "✓ Cleared #{count} existing external platforms"
+      end
+
+      private
+
+      def create_external_platform(provider_attrs)
+        platform = Platform.find_or_initialize_by(
+          identifier: provider_attrs[:identifier],
+          external: true
+        )
+
+        if platform.new_record?
+          platform.assign_attributes(
+            name: provider_attrs[:name],
+            url: provider_attrs[:url],
+            description: provider_attrs[:description],
+            time_zone: provider_attrs[:time_zone],
+            external: true,
+            host: false,
+            privacy: 'public'
+          )
+
+          platform.save!
+          puts "  ✓ Created external platform: #{platform.name}"
+        else
+          puts "  - External platform already exists: #{platform.name}"
+        end
+
+        platform
+      end
+    end
+  end
+end

app/controllers/better_together/users/omniauth_callbacks_controller.rb

@@ -2,7 +2,7 @@
 
 module BetterTogether
   module Users
-    class OmniauthCallbacksController < ::Devise::OmniauthCallbacksController # rubocop:todo Style/Documentation
+    class OmniauthCallbacksController < BetterTogether::OmniauthCallbacksController # rubocop:todo Style/Documentation
       include DeviseLocales
 
       skip_before_action :check_platform_privacy

app/models/better_together/person_platform_integration.rb

@@ -77,21 +77,49 @@ def self.attributes_from_omniauth(auth)
       attributes[:name] = auth.info.name if auth.info.name.present?
       attributes[:image_url] = URI.parse(auth.info.image) if auth.info.image.present?
 
-      attributes[:profile_url] = auth.info.urls.first.last unless person_platform_integration.persisted?
+      # Set profile_url from the auth hash if available
+      if auth.extra&.raw_info&.html_url.present?
+        attributes[:profile_url] = auth.extra.raw_info.html_url
+      elsif auth.info&.urls.present? && auth.info.urls.is_a?(Hash)
+        attributes[:profile_url] = auth.info.urls.values.first
+      end
 
       attributes
     end
 
-    def self.update_or_initialize(person_platform_integration, auth)
+    def self.update_or_initialize(person_platform_integration, auth, platform: nil)
+      attributes = attributes_from_omniauth(auth)
+
+      # Find the external OAuth platform based on the provider
+      external_platform = find_external_platform_for_provider(auth.provider)
+      attributes[:platform] = external_platform if external_platform.present?
+
+      # Allow manual platform override (for backward compatibility)
+      attributes[:platform] = platform if platform.present?
+
       if person_platform_integration.present?
-        person_platform_integration.update(attributes_from_omniauth(auth))
+        person_platform_integration.update(attributes)
       else
-        person_platform_integration = new(
-          attributes_from_omniauth(auth)
-        )
+        person_platform_integration = new(attributes)
       end
 
       person_platform_integration
     end
+
+    private_class_method def self.find_external_platform_for_provider(provider)
+      # Map OAuth provider names to platform identifiers
+      provider_mapping = {
+        'github' => 'github',
+        'google_oauth2' => 'google',
+        'facebook' => 'facebook',
+        'linkedin' => 'linkedin',
+        'twitter' => 'twitter'
+      }
+
+      platform_identifier = provider_mapping[provider.to_s]
+      return nil unless platform_identifier
+
+      Platform.external.find_by(identifier: platform_identifier)
+    end
   end
 end

app/models/better_together/platform.rb

@@ -31,6 +31,11 @@ class Platform < ApplicationRecord
 
     validates :url, presence: true, uniqueness: true
     validates :time_zone, presence: true
+    validates :external, inclusion: { in: [true, false] }
+
+    scope :external, -> { where(external: true) }
+    scope :internal, -> { where(external: false) }
+    scope :oauth_providers, -> { external }
 
     has_one_attached :profile_image
     has_one_attached :cover_image

app/models/concerns/better_together/devise_user.rb

@@ -15,6 +15,7 @@ module DeviseUser
       validates :email, presence: true, uniqueness: { case_sensitive: false }
 
       def self.from_omniauth(person_platform_integration:, auth:, current_user:)
+        # PersonPlatformIntegration will automatically find the correct external OAuth platform
         person_platform_integration = PersonPlatformIntegration.update_or_initialize(person_platform_integration, auth)
 
         return person_platform_integration.user if person_platform_integration.user.present?
@@ -30,7 +31,7 @@ def self.from_omniauth(person_platform_integration:, auth:, current_user:)
 
             person_attributes = {
               name: person_platform_integration.name || user.email.split('@').first || 'Unidentified Person',
-              handle: person_platform_integration.handle || user.email.split('@').first
+              identifier: person_platform_integration.handle || user.email.split('@').first
             }
             user.build_person(person_attributes)
 

config/locales/en.yml

@@ -1545,6 +1545,9 @@ en:
       send_paranoid_instructions: If your account exists, you will receive an email
         with instructions for how to unlock it in a few minutes.
       unlocked: Your account has been unlocked successfully. Please sign in to continue.
+  devise_omniauth_callbacks:
+    failure: There was a problem signing you in through %{kind}. %{reason}
+    success: Successfully authenticated from %{kind} account.
   errors:
     format: "%{attribute} %{message}"
     internal_server_error:

config/locales/es.yml

@@ -1536,6 +1536,9 @@ es:
       send_paranoid_instructions: Si tu cuenta existe, vas a recibir instrucciones
         para desbloquear tu cuenta en unos pocos minutos.
       unlocked: Tu cuenta ha sido desbloqueada. Ya puedes iniciar sesión.
+  devise_omniauth_callbacks:
+    failure: Hubo un problema al iniciar sesión a través de %{kind}. %{reason}
+    success: Autenticado exitosamente desde la cuenta de %{kind}.
   errors:
     format: "%{attribute} %{message}"
     internal_server_error:

config/locales/fr.yml

@@ -1563,6 +1563,9 @@ fr:
         vous recevrez sous quelques minutes un message avec des instructions pour
         déverrouiller votre compte.
       unlocked: Votre compte a bien été déverrouillé. Veuillez vous connecter.
+  devise_omniauth_callbacks:
+    failure: Il y a eu un problème lors de votre connexion via %{kind}. %{reason}
+    success: Authentification réussie depuis le compte %{kind}.
   errors:
     format: "%{attribute} %{message}"
     internal_server_error:

config/routes.rb

@@ -3,25 +3,29 @@
 require 'sidekiq/web'
 
 BetterTogether::Engine.routes.draw do # rubocop:todo Metrics/BlockLength
+  # Enable Omniauth for Devise
+  devise_for :users, class_name: BetterTogether.user_class.to_s,
+                     only: :omniauth_callbacks,
+                     controllers: { omniauth_callbacks: 'better_together/users/omniauth_callbacks' }
+
   scope ':locale', # rubocop:todo Metrics/BlockLength
         locale: /#{I18n.available_locales.join('|')}/ do
     # bt base path
     scope path: BetterTogether.route_scope_path do # rubocop:todo Metrics/BlockLength
       # Aug 2nd 2024: Inherit from blank devise controllers to fix issue generating locale paths for devise
       # https://github.com/heartcombo/devise/issues/4282#issuecomment-259706108
-      # Uncomment omniauth_callbacks and unlocks if/when used
+      # Uncomment unlocks if/when used
       devise_for :users,
                  class_name: BetterTogether.user_class.to_s,
                  controllers: {
                    confirmations: 'better_together/users/confirmations',
-                   omniauth_callbacks: 'better_together/users/omniauth_callbacks',
                    passwords: 'better_together/users/passwords',
                    registrations: 'better_together/users/registrations',
                    sessions: 'better_together/users/sessions'
                    #  unlocks: 'better_together/users/unlocks'
                  },
                  module: 'devise',
-                 skip: %i[unlocks],
+                 skip: %i[unlocks omniauth_callbacks],
                  path: 'users',
                  path_names: {
                    sign_in: 'sign-in',

db/migrate/20250824202048_add_external_to_better_together_platforms.rb

@@ -0,0 +1,6 @@
+class AddExternalToBetterTogetherPlatforms < ActiveRecord::Migration[7.1]
+  def change
+    add_column :better_together_platforms, :external, :boolean, default: false, null: false
+    add_index :better_together_platforms, :external
+  end
+end