From e2fc128c16be710e230364a917ef807b6e6b0ded Mon Sep 17 00:00:00 2001 From: juandefelix Date: Sun, 13 Sep 2015 11:11:11 -0500 Subject: [PATCH 1/4] passing validations by adding terms_of_service to attributes hash --- app/models/user.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 3ddf4df54..35fe011a6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -68,7 +68,8 @@ class User < ActiveRecord::Base user = User.new( username: auth.info.nickname || auth.extra.raw_info.name.parameterize('-') || auth.uid, email: email ? email : "#{OMNIAUTH_EMAIL_PREFIX}-#{auth.uid}-#{auth.provider}.com", - password: Devise.friendly_token[0,20] + password: Devise.friendly_token[0,20], + terms_of_service: '1' ) user.skip_confirmation! user.save! From b64a40fca1fe25727271125b80d43b1c56df0ab5 Mon Sep 17 00:00:00 2001 From: juandefelix Date: Sun, 13 Sep 2015 11:37:30 -0500 Subject: [PATCH 2/4] uncommented test for omniauth sign up --- spec/features/users_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb index 2a3b19b5d..cd766b5af 100644 --- a/spec/features/users_spec.rb +++ b/spec/features/users_spec.rb @@ -45,7 +45,7 @@ feature 'Users' do end end - xcontext 'OAuth authentication' do + context 'OAuth authentication' do context 'Twitter' do background do #request.env["devise.mapping"] = Devise.mappings[:user] From 5f99cf6b142822e1045c0103780828f1f3bce18b Mon Sep 17 00:00:00 2001 From: juandefelix Date: Sun, 13 Sep 2015 11:43:26 -0500 Subject: [PATCH 3/4] commented out test for omiauth sign up --- spec/features/users_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb index cd766b5af..2a3b19b5d 100644 --- a/spec/features/users_spec.rb +++ b/spec/features/users_spec.rb @@ -45,7 +45,7 @@ feature 'Users' do end end - context 'OAuth authentication' do + xcontext 'OAuth authentication' do context 'Twitter' do background do #request.env["devise.mapping"] = Devise.mappings[:user] From b519cb75fabc6e6cdd04e72f341e864400a754db Mon Sep 17 00:00:00 2001 From: juandefelix Date: Sat, 19 Sep 2015 20:36:16 -0500 Subject: [PATCH 4/4] added warning text underneath omniauth sign up links --- app/views/devise/_omniauth_form.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/devise/_omniauth_form.html.erb b/app/views/devise/_omniauth_form.html.erb index 63e73d160..343743ff3 100644 --- a/app/views/devise/_omniauth_form.html.erb +++ b/app/views/devise/_omniauth_form.html.erb @@ -7,5 +7,6 @@ <%= link_to t("omniauth.twitter.sign_up"), user_omniauth_authorize_path(:twitter), class: "button-twitter button radius expand" %> <%= link_to t("omniauth.facebook.sign_up"), user_omniauth_authorize_path(:facebook), class: "button-facebook button radius expand" %> <%= link_to t("omniauth.google_oauth2.sign_up"), user_omniauth_authorize_path(:google_oauth2), class: "button-google button radius expand" %> +

Al hacer login con una red social, usted está aceptando los términos legales.

<% end %> \ No newline at end of file