+
+ <%= link_to "Sign in with Twitter", "/auth/twitter" %>
+
<%= identity_verification_gateway(t(:identify_with_dnie), ENV["TRACTIS_API_KEY"], :action => 'authenticate') %>
<% if Rails.env != 'production' %>
- <%= form_tag user_session_path do %>
+ <%= form_tag create_fake_user_session_path do %>
<%= t(:try_with_test_id) %>
<%= label_tag t(:fake_name) %>
@@ -15,4 +18,4 @@
<%= submit_tag t(:try_here) %>
<% end %>
<% end %>
-
\ No newline at end of file
+
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
new file mode 100644
index 0000000..69aed22
--- /dev/null
+++ b/config/initializers/omniauth.rb
@@ -0,0 +1,10 @@
+Rails.application.config.middleware.use OmniAuth::Builder do
+ if ENV['TWITTER_CONSUMER_KEY'].blank? or ENV['TWITTER_CONSUMER_SECRET'].blank?
+ warn "*" * 80
+ warn "WARNING: Missing consumer key or secret. First, register an app with Twitter at"
+ warn "https://dev.twitter.com/apps to obtain OAuth credentials. Then, start the server"
+ warn "with the command: TWITTER_CONSUMER_KEY=abc TWITTER_CONSUMER_SECRET=123 rails server"
+ warn "*" * 80
+ end
+ use OmniAuth::Strategies::Twitter, ENV['TWITTER_CONSUMER_KEY'], ENV['TWITTER_CONSUMER_SECRET']
+end
diff --git a/config/locales/es.yml b/config/locales/es.yml
index cd15be9..6e531b1 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -43,7 +43,7 @@
vote_proposal: 'Vota esta propuesta'
explain: "Explica tu opinión (opcional)"
optional_link: "Enlace (opcional)"
- dnie_auth_required: 'Autenticación con DNIe requerida'
+ auth_required: 'Autenticación requerida'
identify_with_dnie: 'Identifícate con tu DNIe'
try_with_test_id: 'o haz tongo creando una identidad falsa...'
fake_name: 'falso nombre'
diff --git a/config/routes.rb b/config/routes.rb
index fbcc1e4..3f24840 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,6 +17,7 @@
resource :user_session do
get 'authenticate'
+ post 'create_fake'
end
resources :users do
@@ -28,6 +29,8 @@
end
end
+ get '/auth/twitter/callback', :to => 'user_sessions#create', :as => 'callback'
+
root :to => "welcome#index"
# The priority is based upon order of creation:
diff --git a/db/migrate/20111023200908_add_provider_and_uid_to_users.rb b/db/migrate/20111023200908_add_provider_and_uid_to_users.rb
new file mode 100644
index 0000000..562321f
--- /dev/null
+++ b/db/migrate/20111023200908_add_provider_and_uid_to_users.rb
@@ -0,0 +1,8 @@
+class AddProviderAndUidToUsers < ActiveRecord::Migration
+ def change
+ change_table :users do |t|
+ t.string :provider
+ t.string :uid
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 84a9a95..a46bef9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20110319234436) do
+ActiveRecord::Schema.define(:version => 20111023200908) do
create_table "categories", :force => true do |t|
t.string "name"
@@ -68,6 +68,8 @@
t.boolean "admin", :default => false
t.string "dni"
t.string "name"
+ t.string "provider"
+ t.string "uid"
end
create_table "votes", :force => true do |t|
diff --git a/spec/acceptance/dni_authentication_spec.rb b/spec/acceptance/dni_authentication_spec.rb
index c97f8af..9c4407d 100644
--- a/spec/acceptance/dni_authentication_spec.rb
+++ b/spec/acceptance/dni_authentication_spec.rb
@@ -26,7 +26,7 @@
register_as("Bad Ass Mother Fucking New User", "12345678V")
page.should have_content I18n.t(:currently_logged_as, :username => "Bad Ass Mother Fucking New User")
- User.find_by_name_and_dni("Bad Ass Mother Fucking New User", "12345678V").should be
+ User.find_by_name_and_uid("Bad Ass Mother Fucking New User", "12345678V").should be
end
scenario "Invalid authentication" do
diff --git a/spec/acceptance/spokesmen_spec.rb b/spec/acceptance/spokesmen_spec.rb
index 2a336e2..395de72 100644
--- a/spec/acceptance/spokesmen_spec.rb
+++ b/spec/acceptance/spokesmen_spec.rb
@@ -77,7 +77,7 @@
click_link "Fan de Punset"
click_button "Elegir a Fan de Punset como mi portavoz"
- page.should have_content("Autenticación con DNIe requerida")
+ page.should have_content("Autenticación requerida")
page.should_not have_content("Has elegido a tu portavoz.")
login_as @user
diff --git a/spec/acceptance/support/helpers.rb b/spec/acceptance/support/helpers.rb
index 42f1e7b..046808b 100644
--- a/spec/acceptance/support/helpers.rb
+++ b/spec/acceptance/support/helpers.rb
@@ -1,7 +1,7 @@
module HelperMethods
def login_as(user)
stub_tractis_request
- get_tractis_callback(user.name, user.dni)
+ get_tractis_callback(user.name, user.uid)
end
def register_as(name, dni)
diff --git a/spec/acceptance/vote_for_proposals_spec.rb b/spec/acceptance/vote_for_proposals_spec.rb
index abe60a5..c62a52f 100644
--- a/spec/acceptance/vote_for_proposals_spec.rb
+++ b/spec/acceptance/vote_for_proposals_spec.rb
@@ -77,7 +77,7 @@
visit proposal_path(proposal)
click_button I18n.t(:yes_option)
- page.should have_content I18n.t(:dnie_auth_required)
+ page.should have_content I18n.t(:auth_required)
page.should_not have_css("button", :text => I18n.t(:i_am_sure))
login_as @user
diff --git a/spec/support/factories.rb b/spec/support/factories.rb
index 964e4aa..5ce81d3 100644
--- a/spec/support/factories.rb
+++ b/spec/support/factories.rb
@@ -15,7 +15,8 @@ def create_vote(attrs = {})
end
def create_user(attrs = {})
- attrs[:dni] ||= "#{rand(9999999)}V"
+ attrs[:provider] ||= "test"
+ attrs[:uid] ||= "#{rand(9999999)}V"
attrs[:name] ||= "Mother Fucking Real User"
User.create!(attrs)
end
@@ -30,4 +31,4 @@ def create_proposer(attrs = {})
end
-RSpec.configuration.include Factories
\ No newline at end of file
+RSpec.configuration.include Factories