merges master and fix conflicts

config/deploy/shared/secrets.yml.erb

@@ -2,4 +2,10 @@
   recaptcha_public_key: <%= ENV["MADRID_RECAPTCHA_PUBLIC_KEY"] %>
   recaptcha_private_key: <%= ENV["MADRID_RECAPTCHA_PRIVATE_KEY"] %>
   secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
-  server_name: <%= fetch(:server_name) %>
+  twitter_key: <%= ENV["TWITTER_KEY"] %>
+  twitter_secret: <%= ENV["TWITTER_SECRET"] %>
+  facebook_key: <%= ENV["FACEBOOK_KEY"] %>
+  facebook_secret: <%= ENV["FACEBOOK_SECRET"] %>
+  google_oauth2_key: <%= ENV["GOOGLE_KEY"] %>
+  google_oauth2_secret: <%= ENV["GOOGLE_SECRET"] %>
+  server_name: <%= fetch(:server_name) %>

config/environments/production.rb

@@ -42,7 +42,7 @@ Rails.application.configure do
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
+  config.force_ssl = true
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.

config/environments/staging.rb

@@ -42,7 +42,7 @@ Rails.application.configure do
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
+  config.force_ssl = true
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.

config/initializers/devise.rb

@@ -239,6 +239,9 @@ Devise.setup do |config|
   # Add a new OmniAuth provider. Check the wiki for more information on setting
   # up on your models and hooks.
   # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
+  config.omniauth :twitter, Rails.application.secrets.twitter_key, Rails.application.secrets.twitter_secret
+  config.omniauth :facebook, Rails.application.secrets.facebook_key, Rails.application.secrets.facebook_secret
+  config.omniauth :google_oauth2, Rails.application.secrets.google_oauth2_key, Rails.application.secrets.google_oauth2_secret
 
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or

config/locales/devise.es.yml

@@ -55,4 +55,4 @@ es:
       not_locked: "no estaba bloqueado."
       not_saved:
         one: "1 error impidió que este %{resource} fuera guardado:"
-        other: "%{count} errores impidieron que este %{resource} fuera guardado:"
+        other: "%{count} errores impidieron que este %{resource} fuera guardado:"

config/locales/devise_views.en.yml

@@ -66,6 +66,13 @@ en:
           phone_number_label: "Phone number"
           password_confirmation_label: "Confirm password"
           submit: "Sign up"
+        success:
+          title: "Registration of organization / collective"
+          thank_you: "Thank you for registering your organization or collective in the website. Now is <b>pending verification</b>."
+          instructions_1_html: "We will <b>contact you soon</b> in order to verify that you represent your collective."
+          instructions_2_html: "Meanwhile, <b>review your email</b>. We have sent you a <b>confirmation link to activate your account</b>."
+          instructions_3_html: "When you confirm your account will then be able to participate as a non-verified organization."
+          back_to_index: "Ok, go back to index"
     sessions:
       new:
         title: "Log in"

config/locales/devise_views.es.yml

@@ -66,6 +66,13 @@ es:
           phone_number_label: "Teléfono"
           password_confirmation_label: "Confirmar contraseña"
           submit: "Registrarse"
+        success:
+          title: "Registro de organización / colectivo"
+          thank_you: "Gracias por registrar tu colectivo en la web. Ahora está <b>pendiente de verificación</b>."
+          instructions_1_html: "En breve <b>nos pondremos en contacto contigo</b> para verificar que realmente representas a este colectivo."
+          instructions_2_html: "Mientras <b>revisa tu correo electrónico</b>, te hemos enviado un <b>enlace para confirmar tu cuenta</b>."
+          instructions_3_html: "Una vez confirmado, podrás empezar a participar como colectivo no verificado."
+          back_to_index: "Entendido, volver a la página principal"
     sessions:
       new:
         title: "Entrar"

config/locales/en.yml

@@ -148,3 +148,12 @@ en:
       all: "You are not authorized to %{action} %{subject}."
   welcome:
     last_debates: Last debates
+  omniauth:
+    finish_signup:
+      title: Add Email
+    twitter:
+      sign_in: Sign in with Twitter
+    facebook:
+      sign_in: Sign in with Facebook
+    google_oauth2:
+      sign_in: Sign in with Google

config/locales/es.yml

@@ -148,3 +148,12 @@ es:
       all: "No tienes permiso para realizar la acción '%{action}' sobre %{subject}."
   welcome:
     last_debates: Últimos debates
+  omniauth:
+    finish_signup:
+      title: Añade tu email
+    twitter:
+      sign_in: Entra con Twitter
+    facebook:
+      sign_in: Entra con Facebook
+    google_oauth2:
+      sign_in: Entra con Google

config/routes.rb

@@ -1,10 +1,23 @@
 Rails.application.routes.draw do
-  devise_for :users, controllers: { registrations: 'users/registrations' }
+  devise_for :users, controllers: {
+                       registrations: 'users/registrations',
+                       omniauth_callbacks: 'users/omniauth_callbacks'
+                     }
   devise_for :organizations, class_name: 'User',
              controllers: {
                registrations: 'organizations/registrations',
-               sessions: 'devise/sessions'
-             }
+               sessions: 'devise/sessions',
+             },
+             skip: [:omniauth_callbacks]
+
+  devise_scope :organization do
+    get "organizations/sign_up/success", to: "organizations/registrations#success"
+  end
+
+  devise_scope :user do
+    get :finish_signup, to: 'users/registrations#finish_signup'
+    patch :do_finish_signup, to: 'users/registrations#do_finish_signup'
+  end
 
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".

config/secrets.yml.example

@@ -14,12 +14,30 @@ default: &default
 
 development:
   secret_key_base: 56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4
+  twitter_key: AAAA
+  twitter_secret: BBBB
+  facebook_key: AAAA
+  facebook_secret: BBBB
+  google_oauth2_key: AAAA
+  google_oauth2_secret: BBBB
   <<: *default
 
 test:
   secret_key_base: 4d5adf961ddd27aef19622d6c0b3234d555f9ee003f022b1f829c92bbe33aaee907be7feb67bd54c14a1a32512fa968565ad405971fbc41bd0797af73c26a796
+  twitter_key: AAAA
+  twitter_secret: BBBB
+  facebook_key: AAAA
+  facebook_secret: BBBB
+  google_oauth2_key: AAAA
+  google_oauth2_secret: BBBB
   <<: *default
 
 production:
   secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
-  <<: *default
+  twitter_key: <%= ENV["TWITTER_KEY"] %>
+  twitter_secret: <%= ENV["TWITTER_SECRET"] %>
+  facebook_key: <%= ENV["FACEBOOK_KEY"] %>
+  facebook_secret: <%= ENV["FACEBOOK_SECRET"] %>
+  google_oauth2_key: <%= ENV["GOOGLE_KEY"] %>
+  google_oauth2_secret: <%= ENV["GOOGLE_SECRET"] %>
+  <<: *default