Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Remove GoogleStrategy authentication (#13594)
Damian Legawiecfcd336917117
diff --git a/backend/engines/api/app/controllers/spree/api/v3/store/auth_controller.rb b/backend/engines/api/app/controllers/spree/api/v3/store/auth_controller.rbindex 1420c5087e..a9d1d655b2 100644--- a/backend/engines/api/app/controllers/spree/api/v3/store/auth_controller.rb+++ b/backend/engines/api/app/controllers/spree/api/v3/store/auth_controller.rb@@ -8,9 +8,8 @@ module Spree# POST /api/v3/store/auth/login# Supports multiple authentication providers via :provider param- # Examples:+ # Example:# { "provider": "email", "email": "...", "password": "..." }- # { "provider": "google", "id_token": "..." }def createstrategy = authentication_strategyreturn unless strategy # Error already rendered by determine_strategy@@ -59,7 +58,6 @@ module Spree# POST /api/v3/store/auth/oauth/callback# OAuth callback endpoint for server-side OAuth flows- # Example: { "provider": "google", "code": "authorization_code" }def oauth_callback# This endpoint is designed for OAuth flows where the server# exchanges the authorization code for an access token@@ -114,7 +112,7 @@ module Spreeprovider_key = provider.to_sym# Retrieve pre-loaded strategy class from configuration- strategy_class = Rails.application.config.spree.authentication_strategies[provider_key]+ strategy_class = Rails.application.config.spree.store_authentication_strategies[provider_key]unless strategy_classrender_error(diff --git a/backend/engines/core/app/models/spree/authentication/strategies/google_strategy.rb b/backend/engines/core/app/models/spree/authentication/strategies/google_strategy.rbdeleted file mode 100644index af82d15557..0000000000--- a/backend/engines/core/app/models/spree/authentication/strategies/google_strategy.rb+++ /dev/null@@ -1,67 +0,0 @@-module Spree- module Authentication- module Strategies- class GoogleStrategy < BaseStrategy- def authenticate- id_token = params[:id_token]- return failure('Google ID token is required') if id_token.blank?-- # Verify Google ID token- payload = verify_google_token(id_token)- return failure('Invalid Google token') unless payload-- # Extract user info from Google payload- info = {- email: payload['email'],- first_name: payload['given_name'],- last_name: payload['family_name']- }-- # Find or create user with identity- user = find_or_create_user_from_oauth(- provider: provider,- uid: payload['sub'],- info: info,- tokens: {- access_token: id_token,- expires_at: Time.at(payload['exp'])- }- )-- success(user)- rescue => e- Rails.logger.error "GoogleStrategy authentication failed: #{e.message}"- failure('Google authentication failed')- end-- def provider- 'google'- end-- private-- def verify_google_token(token)- # This requires google-id-token gem or similar- # For production, use: Google::Auth::IDTokens.verify_oidc(token, aud: google_client_id)- # For now, return a basic implementation that developers can override-- if defined?(Google::Auth::IDTokens)- Google::Auth::IDTokens.verify_oidc(token, aud: google_client_id)- else- # Fallback for development - decode without verification- # WARNING: This should never be used in production!- Rails.logger.warn 'Google token verification skipped - install google-id-token gem for production'- JWT.decode(token, nil, false).first- end- rescue => e- Rails.logger.error "Google token verification failed: #{e.message}"- nil- end-- def google_client_id- ENV['GOOGLE_CLIENT_ID'] || Rails.application.credentials.dig(:google, :client_id)- end- end- end- end-enddiff --git a/backend/engines/core/app/models/spree/user_identity.rb b/backend/engines/core/app/models/spree/user_identity.rbindex b679446590..25ab7e5584 100644--- a/backend/engines/core/app/models/spree/user_identity.rb+++ b/backend/engines/core/app/models/spree/user_identity.rb@@ -7,10 +7,12 @@ module Spreevalidates :provider, presence: truevalidates :uid, presence: true, uniqueness: { scope: [:provider, :user_type] }- # Providers- PROVIDERS = %w[email google facebook github apple].freeze-- validates :provider, inclusion: { in: PROVIDERS }+ validates :provider, inclusion: {+ in: ->(_record) {+ config = Rails.application.config.spree+ (config.store_authentication_strategies.keys + config.admin_authentication_strategies.keys).uniq.map(&:to_s)+ }+ }# Store provider-specific data# info: JSON field with provider-specific data (name, avatar, etc)diff --git a/backend/engines/core/lib/spree/core/engine.rb b/backend/engines/core/lib/spree/core/engine.rbindex 2584cbe4bb..0d8432aea6 100644--- a/backend/engines/core/lib/spree/core/engine.rb+++ b/backend/engines/core/lib/spree/core/engine.rb@@ -30,7 +30,8 @@ module Spree:analytics_event_handlers,:integrations,:subscribers,- :authentication_strategies)+ :store_authentication_strategies,+ :admin_authentication_strategies)SpreeCalculators = Struct.new(:shipping_methods, :tax_rates, :promotion_actions_create_adjustments, :promotion_actions_create_item_adjustments)PromoEnvironment = Struct.new(:rules, :actions)PricingEnvironment = Struct.new(:rules)@@ -308,9 +309,11 @@ module Spree]# Pre-load authentication strategy classes to avoid reflection at request time- Rails.application.config.spree.authentication_strategies = {- email: Spree::Authentication::Strategies::EmailPasswordStrategy,- google: Spree::Authentication::Strategies::GoogleStrategy+ Rails.application.config.spree.store_authentication_strategies = {+ email: Spree::Authentication::Strategies::EmailPasswordStrategy+ }+ Rails.application.config.spree.admin_authentication_strategies = {+ email: Spree::Authentication::Strategies::EmailPasswordStrategy}enddiff --git a/backend/engines/core/lib/spree/testing_support/factories/user_identity_factory.rb b/backend/engines/core/lib/spree/testing_support/factories/user_identity_factory.rbindex fd1aa575b0..54df0881c3 100644--- a/backend/engines/core/lib/spree/testing_support/factories/user_identity_factory.rb+++ b/backend/engines/core/lib/spree/testing_support/factories/user_identity_factory.rb@@ -8,47 +8,6 @@ FactoryBot.define dorefresh_token { nil }expires_at { nil }- trait :google do- provider { 'google' }- sequence(:uid) { |n| "google_#{n}" }- access_token { 'google_access_token' }- refresh_token { 'google_refresh_token' }- expires_at { 1.hour.from_now }- info do- {- email: user.email,- first_name: user.first_name,- last_name: user.last_name- }- end- end-- trait :facebook do- provider { 'facebook' }- sequence(:uid) { |n| "facebook_#{n}" }- access_token { 'facebook_access_token' }- info do- {- email: user.email,- first_name: user.first_name,- last_name: user.last_name- }- end- end-- trait :github do- provider { 'github' }- sequence(:uid) { |n| "github_#{n}" }- access_token { 'github_access_token' }- info do- {- email: user.email,- first_name: user.first_name,- last_name: user.last_name- }- end- end-trait :expired doexpires_at { 1.hour.ago }enddiff --git a/backend/engines/core/spec/models/spree/authentication/strategies/base_strategy_spec.rb b/backend/engines/core/spec/models/spree/authentication/strategies/base_strategy_spec.rbindex d7a9bff800..47e8e498bc 100644--- a/backend/engines/core/spec/models/spree/authentication/strategies/base_strategy_spec.rb+++ b/backend/engines/core/spec/models/spree/authentication/strategies/base_strategy_spec.rb@@ -84,7 +84,7 @@ describe Spree::Authentication::Strategies::BaseStrategy doenddescribe '#find_or_create_user_from_oauth' do- let(:provider) { 'google' }+ let(:provider) { 'email' }let(:uid) { '123456' }let(:info) { { email: '[email protected]', first_name: 'OAuth', last_name: 'User' } }let(:tokens) { { access_token: 'token123' } }diff --git a/backend/engines/core/spec/models/spree/authentication/strategies/google_strategy_spec.rb b/backend/engines/core/spec/models/spree/authentication/strategies/google_strategy_spec.rbdeleted file mode 100644index c499e34396..0000000000--- a/backend/engines/core/spec/models/spree/authentication/strategies/google_strategy_spec.rb+++ /dev/null@@ -1,230 +0,0 @@-require 'spec_helper'--describe Spree::Authentication::Strategies::GoogleStrategy do- let(:id_token) { 'valid_google_id_token' }- let(:params) { { id_token: id_token } }- let(:request_env) { {} }-- subject(:strategy) do- described_class.new(params: params, request_env: request_env)- end-- let(:google_payload) do- {- 'sub' => '123456789',- 'email' => '[email protected]',- 'given_name' => 'John',- 'family_name' => 'Doe',- 'exp' => 1.hour.from_now.to_i- }- end-- describe '#provider' do- it 'returns google' do- expect(strategy.provider).to eq('google')- end- end-- describe '#authenticate' do- context 'with valid Google token' do- before do- allow(strategy).to receive(:verify_google_token).with(id_token).and_return(google_payload)- end-- context 'when user does not exist' do- it 'returns successful result with new user' do- expect do- result = strategy.authenticate- expect(result).to be_success- expect(result.value).to be_a(Spree.user_class)- end.to change(Spree.user_class, :count).by(1)- .and change(Spree::UserIdentity, :count).by(1)- end-- it 'creates user with correct attributes' do- result = strategy.authenticate- user = result.value-- expect(user.email).to eq('[email protected]')- expect(user.first_name).to eq('John')- expect(user.last_name).to eq('Doe')- end-- it 'creates identity with correct attributes' do- result = strategy.authenticate- user = result.value- identity = user.identities.first-- expect(identity.provider).to eq('google')- expect(identity.uid).to eq('123456789')- expect(identity.access_token).to eq(id_token)- expect(identity.expires_at).to be_within(1.second).of(Time.at(google_payload['exp']))- end- end-- context 'when user already exists with identity' do- let!(:user) { create(:user, email: '[email protected]') }- let!(:identity) do- create(:user_identity, :google,- user: user,- uid: '123456789',- access_token: 'old_token')- end-- it 'returns successful result with existing user' do- expect do- result = strategy.authenticate- expect(result).to be_success- expect(result.value).to eq(user)- end.not_to change(Spree.user_class, :count)- end-- it 'updates identity tokens' do- strategy.authenticate-- identity.reload- expect(identity.access_token).to eq(id_token)- expect(identity.expires_at).to be_within(1.second).of(Time.at(google_payload['exp']))- end- end- end-- context 'with invalid Google token' do- before do- allow(strategy).to receive(:verify_google_token).with(id_token).and_return(nil)- end-- it 'returns failure result' do- result = strategy.authenticate-- expect(result).not_to be_success- expect(result.error).to eq('Invalid Google token')- end- end-- context 'when id_token is blank' do- let(:params) { { id_token: '' } }-- it 'returns failure result' do- result = strategy.authenticate-- expect(result).not_to be_success- expect(result.error).to eq('Google ID token is required')- end- end-- context 'when id_token is missing' do- let(:params) { {} }-- it 'returns failure result' do- result = strategy.authenticate-- expect(result).not_to be_success- expect(result.error).to eq('Google ID token is required')- end- end-- context 'when an error occurs during authentication' do- before do- allow(strategy).to receive(:verify_google_token).and_raise(StandardError, 'Token verification error')- end-- it 'logs the error and returns failure' do- expect(Rails.logger).to receive(:error).with(/GoogleStrategy authentication failed/)-- result = strategy.authenticate-- expect(result).not_to be_success- expect(result.error).to eq('Google authentication failed')- end- end- end-- describe '#verify_google_token' do- let(:client_id) { 'test_client_id' }-- before do- allow(ENV).to receive(:[]).and_call_original- allow(ENV).to receive(:[]).with('GOOGLE_CLIENT_ID').and_return(client_id)- end-- context 'when Google::Auth::IDTokens is defined' do- before do- stub_const('Google::Auth::IDTokens', double)- end-- it 'verifies token with Google library' do- expect(Google::Auth::IDTokens).to receive(:verify_oidc).with(id_token, aud: client_id).and_return(google_payload)-- result = strategy.send(:verify_google_token, id_token)- expect(result).to eq(google_payload)- end-- context 'when verification fails' do- before do- allow(Google::Auth::IDTokens).to receive(:verify_oidc).and_raise(StandardError, 'Invalid token')- end-- it 'logs error and returns nil' do- expect(Rails.logger).to receive(:error).with(/Google token verification failed/)-- result = strategy.send(:verify_google_token, id_token)- expect(result).to be_nil- end- end- end-- context 'when Google::Auth::IDTokens is not defined' do- it 'decodes token without verification and logs warning' do- expect(Rails.logger).to receive(:warn).with(/Google token verification skipped/)- allow(JWT).to receive(:decode).with(id_token, nil, false).and_return([google_payload])-- result = strategy.send(:verify_google_token, id_token)- expect(result).to eq(google_payload)- end- end- end-- describe '#google_client_id' do- context 'when set in environment' do- before do- allow(ENV).to receive(:[]).and_call_original- allow(ENV).to receive(:[]).with('GOOGLE_CLIENT_ID').and_return('env_client_id')- end-- it 'returns environment variable value' do- expect(strategy.send(:google_client_id)).to eq('env_client_id')- end- end-- context 'when set in credentials' do- before do- allow(ENV).to receive(:[]).with('GOOGLE_CLIENT_ID').and_return(nil)- allow(Rails.application.credentials).to receive(:dig).with(:google, :client_id).and_return('credentials_client_id')- end-- it 'returns credentials value' do- expect(strategy.send(:google_client_id)).to eq('credentials_client_id')- end- end- end-- describe 'with custom user class' do- let(:admin_user_class) { Spree.admin_user_class }-- subject(:strategy) do- described_class.new(params: params, request_env: request_env, user_class: admin_user_class)- end-- before do- allow(strategy).to receive(:verify_google_token).with(id_token).and_return(google_payload)- end-- it 'creates user with admin user class' do- result = strategy.authenticate-- expect(result).to be_success- expect(result.value).to be_a(admin_user_class)- end- end-enddiff --git a/backend/engines/core/spec/models/spree/user_identity_spec.rb b/backend/engines/core/spec/models/spree/user_identity_spec.rbindex cb80e7d5d4..0d1b26408f 100644--- a/backend/engines/core/spec/models/spree/user_identity_spec.rb+++ b/backend/engines/core/spec/models/spree/user_identity_spec.rb@@ -10,36 +10,44 @@ describe Spree::UserIdentity, type: :model doit { is_expected.to validate_presence_of(:provider) }it { is_expected.to validate_presence_of(:uid) }- it { is_expected.to validate_inclusion_of(:provider).in_array(Spree::UserIdentity::PROVIDERS) }++ it 'validates provider is a registered authentication strategy' do+ identity = build(:user_identity, provider: 'unsupported')+ expect(identity).not_to be_valid+ expect(identity.errors[:provider]).to include('is not included in the list')+ enddescribe 'uniqueness validation' dolet(:user) { create(:user) }let!(:existing_identity) do- create(:user_identity, user: user, provider: 'google', uid: '12345')+ create(:user_identity, user: user, provider: 'email', uid: '12345')endit 'validates uniqueness of uid scoped to provider and user_type' do- duplicate = build(:user_identity, user: user, provider: 'google', uid: '12345')+ duplicate = build(:user_identity, user: user, provider: 'email', uid: '12345')expect(duplicate).not_to be_validexpect(duplicate.errors[:uid]).to include('has already been taken')endit 'allows same uid for different providers' do- different_provider = build(:user_identity, user: user, provider: 'facebook', uid: '12345')+ Rails.application.config.spree.store_authentication_strategies[:other] = Class.new+ different_provider = build(:user_identity, user: user, provider: 'other', uid: '12345')expect(different_provider).to be_valid+ ensure+ Rails.application.config.spree.store_authentication_strategies.delete(:other)endit 'allows same uid for different user types' dostub_const('Spree::AdminUser', Class.new(Spree.user_class))- different_user_type = build(:user_identity, user_type: 'Spree::AdminUser', user_id: user.id, provider: 'google', uid: '12345')+ different_user_type = build(:user_identity, user_type: 'Spree::AdminUser', user_id: user.id, provider: 'email', uid: '12345')expect(different_user_type).to be_validendendenddescribe '.find_or_create_from_oauth' do- let(:provider) { 'google' }+ let(:provider) { 'email' }let(:uid) { '123456789' }let(:info) do{@@ -91,7 +99,7 @@ describe Spree::UserIdentity, type: :model do)identity = user.identities.first- expect(identity.provider).to eq('google')+ expect(identity.provider).to eq('email')expect(identity.uid).to eq('123456789')expect(identity.access_token).to eq('access_token_123')expect(identity.refresh_token).to eq('refresh_token_456')@@ -106,7 +114,7 @@ describe Spree::UserIdentity, type: :model dotokens: tokens)- expect(user.email).to eq('[email protected]')+ expect(user.email).to eq('[email protected]')endit 'uses custom user class when provided' do@@ -188,7 +196,7 @@ describe Spree::UserIdentity, type: :model dodescribe '.create_user_from_oauth' doit 'creates user with random password' douser = described_class.create_user_from_oauth(- provider: 'google',+ provider: 'email',uid: '123',info: { email: '[email protected]', first_name: 'Test', last_name: 'User' },tokens: {}@@ -202,8 +210,8 @@ describe Spree::UserIdentity, type: :model dodescribe '.generate_temp_email' doit 'generates email with provider and uid' do- email = described_class.generate_temp_email('google', '123456')- expect(email).to eq('[email protected]')+ email = described_class.generate_temp_email('email', '123456')+ expect(email).to eq('[email protected]')endend