Download as
Browse Code »

Commit 683f5a8871f8880c15b6631e3aba0fbe21ac5d99

Authored by Daniel
Committed by Diego Camarinha
1 parent cc382578

[Colab] Initial implementation of OmniAuth-able model 

- Add provider and uid fields to user with proper validation
- Manual routes for OmniAuth have to be used because the route generator
  does not play well with the dynamic scope we used for the locale
Showing 6 changed files with 37 additions and 6 deletions   Show diff stats
Gemfile
  Diff comments   View file @683f5a8
... ... @@ -67,6 +67,9 @@ gem 'http_accept_language'
67 67 # Routes for JS files
68 68 gem 'js-routes', '~> 1.1.0'
69 69  
  70 +# External logins with OmniAuth
  71 +gem 'omniauth'
  72 +
70 73 group :test do
71 74 # Easier test writing
72 75 gem "shoulda-matchers", '~> 2.8.0'
... ...
Gemfile.lock
  Diff comments   View file @683f5a8
... ... @@ -128,6 +128,7 @@ GEM
128 128 globalid (0.3.6)
129 129 activesupport (>= 4.1.0)
130 130 google-analytics-rails (0.0.6)
  131 + hashie (3.4.1)
131 132 http-cookie (1.0.2)
132 133 domain_name (~> 0.5)
133 134 http_accept_language (2.0.5)
... ... @@ -196,6 +197,9 @@ GEM
196 197 nokogiri (1.6.6.2)
197 198 mini_portile (~> 0.6.0)
198 199 ntlm-http (0.1.1)
  200 + omniauth (1.2.2)
  201 + hashie (>= 1.2, < 4)
  202 + rack (~> 1.0)
199 203 orm_adapter (0.5.0)
200 204 pg (0.18.2)
201 205 poltergeist (1.6.0)
... ... @@ -352,6 +356,7 @@ DEPENDENCIES
352 356 konacha
353 357 less-rails (~> 2.7.0)
354 358 mocha
  359 + omniauth
355 360 pg (~> 0.18.1)
356 361 poltergeist (~> 1.6.0)
357 362 rails (= 4.2.4)
... ...
app/models/user.rb
  Diff comments   View file @683f5a8
... ... @@ -2,11 +2,14 @@ class User &lt; ActiveRecord::Base
2 2 # Include default devise modules. Others available are:
3 3 # :token_authenticatable, :confirmable,
4 4 # :lockable, :timeoutable and :omniauthable
5   - devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable
  5 + devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable,
  6 + :omniauthable, omniauth_providers: []
6 7  
7 8 validates :name, presence: true
8   - validates :email, presence: true
9   - validates :email, uniqueness: true
  9 + validates :email, presence: true, uniqueness: true
  10 + validates :provider, presence: true, unless: Proc.new { |user| user.uid.nil? || user.uid.blank? }
  11 + validates :uid, presence: true, uniqueness: { scope: :provider },
  12 + unless: Proc.new { |user| user.provider.nil? || user.provider.blank? }
10 13  
11 14 has_many :project_attributes, class_name: 'ProjectAttributes'
12 15 has_many :reading_group_attributes, class_name: 'ReadingGroupAttributes'
... ... @@ -17,4 +20,10 @@ class User &lt; ActiveRecord::Base
17 20 def projects
18 21 project_attributes.map { |project_attr| project_attr.project }
19 22 end
  23 +
  24 + protected
  25 +
  26 + def password_required?
  27 + provider.nil?
  28 + end
20 29 end
... ...
config/routes.rb
  Diff comments   View file @683f5a8
1 1 Rails.application.routes.draw do
2 2 scope "(:locale)", locale: /en|pt/ do
3   - devise_for :users
  3 + # We need to manually define OmniAuth routes since the automatic generation does not support the dynamic scope
  4 + devise_for :users, skip: :omniauth_callbacks
4 5 get 'users/:user_id/projects' => 'users#projects', as: :user_projects
5 6  
6 7 resources :projects do
... ... @@ -46,6 +47,9 @@ Rails.application.routes.draw do
46 47 root "home#index"
47 48 end
48 49  
  50 +
  51 + # See comment above for devise_for
  52 + devise_for :users, only: :omniauth_callbacks
49 53 # The priority is based upon order of creation: first created -> highest priority.
50 54 # See how all your routes lay out with "rake routes".
51 55  
... ...
db/migrate/20150423204406_add_uid_and_provider_to_user.rb 0 → 100644
  Diff comments   View file @683f5a8
... ... @@ -0,0 +1,7 @@
  1 +class AddUidAndProviderToUser < ActiveRecord::Migration
  2 + def change
  3 + add_column :users, :uid, :string
  4 + add_column :users, :provider, :string
  5 + add_index :users, [:uid, :provider], unique: true
  6 + end
  7 +end
... ...
db/schema.rb
  Diff comments   View file @683f5a8
... ... @@ -61,9 +61,12 @@ ActiveRecord::Schema.define(version: 20150616164352) do
61 61 t.datetime "last_sign_in_at"
62 62 t.string "current_sign_in_ip", limit: 255
63 63 t.string "last_sign_in_ip", limit: 255
  64 + t.string "uid"
  65 + t.string "provider"
64 66 end
65 67  
66   - add_index "users", ["email"], name: "index_users_on_email", unique: true
67   - add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
  68 + add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
  69 + add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
  70 + add_index "users", ["uid", "provider"], name: "index_users_on_uid_and_provider", unique: true, using: :btree
68 71  
69 72 end
... ...