[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

[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
Daniel · Rafael Manzo
1 parent 854989ec
Showing 6 changed files with 37 additions and 6 deletions Show diff stats
Gemfile
Gemfile.lock
app/models/user.rb
config/routes.rb
db/migrate/20150423204406_add_uid_and_provider_to_user.rb
db/schema.rb
@@ -66,6 +66,9 @@ gem &#39;http_accept_language&#39;
 # Routes for JS files
 gem 'js-routes', '~> 1.1.0'
  
+# External logins with OmniAuth
+gem 'omniauth'
+
 group :test do
   # Easier test writing
   gem "shoulda-matchers", '~> 2.8.0'
@@ -138,6 +138,7 @@ GEM
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     google-analytics-rails (0.0.6)
+    hashie (3.4.1)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     http_accept_language (2.0.5)
@@ -206,6 +207,9 @@ GEM
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     ntlm-http (0.1.1)
+    omniauth (1.2.2)
+      hashie (>= 1.2, < 4)
+      rack (~> 1.0)
     orm_adapter (0.5.0)
     pg (0.18.2)
     poltergeist (1.6.0)
@@ -358,6 +362,7 @@ DEPENDENCIES
   kalibro_client (~> 1.3.0)
   konacha
   mocha
+  omniauth
   pg (~> 0.18.1)
   poltergeist (~> 1.6.0)
   rails (= 4.2.4)
@@ -2,11 +2,14 @@ class User &lt; ActiveRecord::Base
   # Include default devise modules. Others available are:
   # :token_authenticatable, :confirmable,
   # :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable
+  devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable,
+         :omniauthable, omniauth_providers: []
  
   validates :name, presence: true
-  validates :email, presence: true
-  validates :email, uniqueness: true
+  validates :email, presence: true, uniqueness: true
+  validates :provider, presence: true, unless: Proc.new { |user| user.uid.nil? || user.uid.blank? }
+  validates :uid, presence: true, uniqueness: { scope: :provider },
+            unless: Proc.new { |user| user.provider.nil? || user.provider.blank? }
  
   has_many :project_attributes, class_name: 'ProjectAttributes'
   has_many :reading_group_attributes, class_name: 'ReadingGroupAttributes'
@@ -17,4 +20,10 @@ class User &lt; ActiveRecord::Base
   def projects
     project_attributes.map { |project_attr| project_attr.project }
   end
+
+  protected
+
+  def password_required?
+    provider.nil?
+  end
 end
 Rails.application.routes.draw do
   scope "(:locale)", locale: /en|pt/ do
-    devise_for :users
+    # We need to manually define OmniAuth routes since the automatic generation does not support the dynamic scope
+    devise_for :users, skip: :omniauth_callbacks
     get 'users/:user_id/projects' => 'users#projects', as: :user_projects
  
     resources :projects do
@@ -46,6 +47,9 @@ Rails.application.routes.draw do
     root "home#index"
   end
  
+
+  # See comment above for devise_for
+  devise_for :users, only: :omniauth_callbacks
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".
  
@@ -0,0 +1,7 @@
+class AddUidAndProviderToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :uid, :string
+    add_column :users, :provider, :string
+    add_index :users, [:uid, :provider], unique: true
+  end
+end
@@ -61,9 +61,12 @@ ActiveRecord::Schema.define(version: 20150616164352) do
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip",     limit: 255
     t.string   "last_sign_in_ip",        limit: 255
+    t.string   "uid"
+    t.string   "provider"
   end
  
-  add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+  add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
+  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
+  add_index "users", ["uid", "provider"], name: "index_users_on_uid_and_provider", unique: true, using: :btree
  
 end
...	...	@@ -66,6 +66,9 @@ gem 'http_accept_language'
66	66	# Routes for JS files
67	67	gem 'js-routes', '~> 1.1.0'
68	68
	69	+# External logins with OmniAuth
	70	+gem 'omniauth'
	71	+
69	72	group :test do
70	73	# Easier test writing
71	74	gem "shoulda-matchers", '~> 2.8.0'
...	...
...	...	@@ -138,6 +138,7 @@ GEM
138	138	globalid (0.3.6)
139	139	activesupport (>= 4.1.0)
140	140	google-analytics-rails (0.0.6)
	141	+ hashie (3.4.1)
141	142	http-cookie (1.0.2)
142	143	domain_name (~> 0.5)
143	144	http_accept_language (2.0.5)
...	...	@@ -206,6 +207,9 @@ GEM
206	207	nokogiri (1.6.6.2)
207	208	mini_portile (~> 0.6.0)
208	209	ntlm-http (0.1.1)
	210	+ omniauth (1.2.2)
	211	+ hashie (>= 1.2, < 4)
	212	+ rack (~> 1.0)
209	213	orm_adapter (0.5.0)
210	214	pg (0.18.2)
211	215	poltergeist (1.6.0)
...	...	@@ -358,6 +362,7 @@ DEPENDENCIES
358	362	kalibro_client (~> 1.3.0)
359	363	konacha
360	364	mocha
	365	+ omniauth
361	366	pg (~> 0.18.1)
362	367	poltergeist (~> 1.6.0)
363	368	rails (= 4.2.4)
...	...
...	...	@@ -2,11 +2,14 @@ class User < 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 < 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
...	...
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
...	...
...	...	@@ -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
...	...
...	...	@@ -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
...	...