From c2e89f8781d1b1bd8fa1556078d0d98758756be4 Mon Sep 17 00:00:00 2001
From: Vokhmin Alexey V <avokhmin@gmail.com>
Date: Tue, 26 Mar 2013 03:13:15 +0400
Subject: [PATCH 01/11] #30: use omniauth for registration through Facebook,
 GitHub, Google

---
 Gemfile                                       | 11 ++-
 Gemfile.lock                                  | 64 +++++++++------
 .../users/omniauth_callbacks_controller.rb    | 79 ++++++++++++++-----
 .../users/register_requests_controller.rb     |  6 +-
 app/models/user.rb                            |  1 +
 app/views/devise/registrations/new.html.haml  | 10 ++-
 config/application.yml.sample                 | 10 +++
 config/initializers/devise.rb                 | 11 ++-
 config/initializers/omniauth.rb               |  9 +++
 lib/ext/preregistration.rb                    |  8 +-
 10 files changed, 154 insertions(+), 55 deletions(-)
 create mode 100644 config/initializers/omniauth.rb

diff --git a/Gemfile b/Gemfile
index fb9224fac..4b7317e2b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,10 +5,15 @@ gem 'redhillonrails_core', :git => 'git://github.com/warpc/redhillonrails_core.g
 
 gem 'pg', '~> 0.14.0'
 
-gem 'devise', '~> 2.1.2'
-gem 'omniauth', '~> 1.1.0'
-gem 'omniauth-openid', '~> 1.0.1'
+gem 'devise', '~> 2.2.3'
+gem 'omniauth'
+# gem 'oa-oauth', :require => 'omniauth/oauth'
+gem 'omniauth-facebook'
+gem 'omniauth-google-oauth2'
+gem 'omniauth-github'
+# gem 'omniauth-openid', '~> 1.0.1'
 gem 'cancan', '1.6.7' # 1.6.8 fail specs with strange error
+# gem 'uuidtools'
 
 gem 'ancestry', '~> 1.3.0'
 gem 'paperclip', '~> 3.3.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index c73f08a63..422b28923 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -52,7 +52,7 @@ GEM
     activesupport (3.2.13)
       i18n (= 0.6.1)
       multi_json (~> 1.0)
-    airbrake (3.1.8)
+    airbrake (3.1.9)
       activesupport
       builder
       json
@@ -68,8 +68,8 @@ GEM
       daemons (~> 1.1.4)
       i18n (>= 0.5.0)
       state_machine (~> 1.1.0)
-    bourne (1.2.1)
-      mocha (= 0.12.7)
+    bourne (1.4.0)
+      mocha (~> 0.13.2)
     builder (3.0.4)
     cancan (1.6.7)
     cape (1.7.0)
@@ -80,7 +80,7 @@ GEM
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
     capistrano_colors (0.5.5)
-    charlock_holmes (0.6.9.1)
+    charlock_holmes (0.6.9.2)
     chronic (0.6.7)
     chunky_png (1.2.7)
     cocaine (0.4.2)
@@ -90,7 +90,7 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.1)
+    coffee-script-source (1.6.2)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
@@ -99,7 +99,7 @@ GEM
       compass (>= 0.12.2, < 0.14)
     creole (0.5.0)
     daemons (1.1.9)
-    devise (2.1.3)
+    devise (2.2.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
@@ -119,6 +119,8 @@ GEM
     factory_girl_rails (4.0.0)
       factory_girl (~> 4.0.0)
       railties (>= 3.0.0)
+    faraday (0.8.7)
+      multipart-post (~> 1.1)
     ffi (1.0.11)
     fssm (0.2.10)
     github-linguist (2.2.1)
@@ -147,9 +149,10 @@ GEM
       haml (~> 3.1)
       railties (>= 3.1, < 4.1)
     hashie (1.2.0)
-    highline (1.6.16)
+    highline (1.6.15)
     hike (1.2.1)
     hirb (0.7.1)
+    httpauth (0.2.0)
     i18n (0.6.1)
     jbuilder (0.8.3)
       activesupport (>= 3.0.0)
@@ -158,6 +161,8 @@ GEM
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
     json (1.7.7)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
     kgio (2.8.0)
     libv8 (3.3.10.4)
     macaddr (1.6.1)
@@ -179,10 +184,11 @@ GEM
       actionpack
     metaclass (0.0.1)
     mime-types (1.21)
-    mocha (0.12.7)
+    mocha (0.13.3)
       metaclass (~> 0.0.1)
     mock_redis (0.6.2)
-    multi_json (1.7.1)
+    multi_json (1.7.2)
+    multipart-post (1.2.0)
     mustache (0.99.4)
     net-scp (1.1.0)
       net-ssh (>= 2.6.5)
@@ -192,13 +198,27 @@ GEM
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     newrelic_rpm (3.5.5.38)
-    nokogiri (1.5.7)
+    nokogiri (1.5.9)
+    oauth2 (0.8.1)
+      faraday (~> 0.8)
+      httpauth (~> 0.1)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      rack (~> 1.2)
     omniauth (1.1.3)
       hashie (~> 1.2)
       rack
-    omniauth-openid (1.0.1)
+    omniauth-facebook (1.4.1)
+      omniauth-oauth2 (~> 1.1.0)
+    omniauth-github (1.1.0)
+      omniauth (~> 1.0)
+      omniauth-oauth2 (~> 1.1)
+    omniauth-google-oauth2 (0.1.13)
+      omniauth (~> 1.0)
+      omniauth-oauth2
+    omniauth-oauth2 (1.1.1)
+      oauth2 (~> 0.8.0)
       omniauth (~> 1.0)
-      rack-openid (~> 1.3.1)
     orm_adapter (0.4.0)
     paperclip (3.3.1)
       activemodel (>= 3.0.0)
@@ -218,9 +238,6 @@ GEM
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-openid (1.3.1)
-      rack (>= 1.1.0)
-      ruby-openid (>= 2.1.8)
     rack-protection (1.5.0)
       rack
     rack-ssl (1.3.3)
@@ -253,7 +270,7 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     raindrops (0.10.0)
-    rake (10.0.3)
+    rake (10.0.4)
     rdiscount (2.0.7.1)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -294,7 +311,6 @@ GEM
     ruby-haml-js (0.0.3)
       execjs
       sprockets (>= 2.0.0)
-    ruby-openid (2.2.3)
     rubypython (0.5.3)
       blankslate (>= 2.1.2.3)
       ffi (~> 1.0.7)
@@ -315,9 +331,9 @@ GEM
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (~> 1.0, >= 1.4.1)
     shoulda-context (1.0.2)
-    shoulda-matchers (1.5.0)
+    shoulda-matchers (1.5.4)
       activesupport (>= 3.0.0)
-      bourne (~> 1.2.0)
+      bourne (~> 1.3)
     sinatra (1.3.6)
       rack (~> 1.4)
       rack-protection (~> 1.3)
@@ -341,7 +357,7 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.17.0)
-    tilt (1.3.5)
+    tilt (1.3.6)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
@@ -388,7 +404,7 @@ DEPENDENCIES
   coffee-rails (~> 3.2.2)
   compass-rails (~> 1.0.3)
   creole
-  devise (~> 2.1.2)
+  devise (~> 2.2.3)
   diff-display (~> 0.0.1)
   factory_girl_rails (~> 4.0.0)
   github-linguist (~> 2.2.1)
@@ -404,8 +420,10 @@ DEPENDENCIES
   meta-tags (~> 1.2.5)
   mock_redis (= 0.6.2)
   newrelic_rpm (~> 3.5.5.38)
-  omniauth (~> 1.1.0)
-  omniauth-openid (~> 1.0.1)
+  omniauth
+  omniauth-facebook
+  omniauth-github
+  omniauth-google-oauth2
   paperclip (~> 3.3.1)
   perform_later (~> 1.3.0)
   pg (~> 0.14.0)
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index a23a8c7e1..35277c82d 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -1,30 +1,69 @@
 # -*- encoding : utf-8 -*-
 class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
-  def open_id
-    # raise env['omniauth.auth'].inspect
-    generic
+  require 'uuidtools'
+
+  # def facebook
+  #   generic
+  # end
+
+  def facebook
+    oauthorize 'Facebook'
+  end
+
+  def google_oauth2
+    oauthorize 'google_oauth2'
+  end
+
+  def github
+    oauthorize 'GitHub'
   end
 
   def passthru
     render :file => "#{Rails.root}/public/404.html", :status => 404, :layout => false
   end
+  
+  private
 
-  protected
-
-  def generic
-    authentication = Authentication.find_or_initialize_by_provider_and_uid(env['omniauth.auth']['provider'], env['omniauth.auth']['uid'])
-    if authentication.new_record?
-      if user_signed_in? # New authentication method for current_user
-        authentication.user = current_user
-        authentication.save
-      else # Register new user from session
-        session["devise.omniauth_data"] = env["omniauth.auth"].except('extra')
-        flash[:notice] = I18n.t "devise.omniauth_callbacks.register"
-        redirect_to new_user_registration_url
-      end
-    else
+  def oauthorize(kind)
+    provider = kind.downcase
+    @user = find_for_ouath(env["omniauth.auth"], current_user)
+    if @user.persisted?
       flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => action_name.classify
-      sign_in_and_redirect authentication.user, :event => :authentication
-    end
+      sign_in_and_redirect @user, :event => :authentication
+    else
+      session["devise.#{provider}_data"] = env["omniauth.auth"]
+      redirect_to new_user_registration_url
+    end   
   end
-end
+ 
+  def find_for_ouath(auth, resource=nil)
+    provider, uid   = auth['provider'], auth['uid']
+    authentication  = Authentication.find_or_initialize_by_provider_and_uid(provider, uid)
+    if authentication.new_record?
+      unless user_signed_in? # Register new user from session
+        case provider
+        when 'facebook'
+          name  = auth['extra']['raw_info']['name']
+          email = auth['info']['email']
+        when 'google_oauth2'
+          name =  auth['info']['nickname']
+          email = auth['info']['email']
+        when 'github'
+
+        else
+          raise 'Provider #{provider} not handled'
+        end
+          user = User.create(
+            :uname    => "#{provider}-#{uid}",
+            :name     => name,
+            :email    => email,
+            :password => Devise.friendly_token[0,20]
+          )
+      end
+      authentication.user = current_user
+      authentication.save
+    end
+    return user
+  end
+ 
+end
\ No newline at end of file
diff --git a/app/controllers/users/register_requests_controller.rb b/app/controllers/users/register_requests_controller.rb
index a21249cdb..e541f7476 100644
--- a/app/controllers/users/register_requests_controller.rb
+++ b/app/controllers/users/register_requests_controller.rb
@@ -4,7 +4,11 @@ class Users::RegisterRequestsController < ApplicationController
   layout 'invite'
 
   def new
-    render :invite
+    if APP_CONFIG['preregistration']
+      render :invite
+    else
+      redirect_to new_user_registration_path
+    end
   end
 
   def create
diff --git a/app/models/user.rb b/app/models/user.rb
index 953665770..fce41e6b6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -7,6 +7,7 @@ class User < Avatar
 
   devise :database_authenticatable, :registerable, :omniauthable, :token_authenticatable,# :encryptable, :timeoutable
          :recoverable, :rememberable, :validatable, :lockable, :confirmable#, :reconfirmable, :trackable
+  devise :omniauthable, :omniauth_providers => [:facebook, :google_oauth2, :github]
 
   has_one :notifier, :class_name => 'SettingsNotifier', :dependent => :destroy #:notifier
 
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index 5fb9371d6..4d1c06b22 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -17,7 +17,10 @@
       .both
       .left=t('activerecord.attributes.user.email')
       .right
-        = f.text_field :email, :id => 'email', :readonly => 'readonly',  :class => "registartion-input #{email_error ? 'registartion-input-error' : ''}"
+        - if APP_CONFIG['preregistration']
+          = f.text_field :email, :id => 'email', :readonly => 'readonly',  :class => "registartion-input #{email_error ? 'registartion-input-error' : ''}"
+        - else
+          = f.text_field :email, :id => 'email', :class => 'registartion-input'
       .both
       .left=t('activerecord.attributes.user.password')
       .right
@@ -31,6 +34,11 @@
         =f.submit t("layout.devise.shared_links.sign_up"), :class => 'button', :id => 'btnLogin'
       .both
 
+      - if devise_mapping.omniauthable?
+        - resource_class.omniauth_providers.each do |provider|
+          = link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)
+          %br
+
   =showDeviseHintError(:login, uname_error)
   =showDeviseHintError(:name, name_error)
   =showDeviseHintError(:email, email_error)
diff --git a/config/application.yml.sample b/config/application.yml.sample
index 07a3e369a..abf353069 100644
--- a/config/application.yml.sample
+++ b/config/application.yml.sample
@@ -2,6 +2,7 @@ common: &common
   project_name: ABF
   repo_project_name: ABF
   anonymous_access: true
+  preregistration: false
   file_store_url: 'http://file-store.rosalinux.ru'
   distr_types: ['mdv', 'rhel', 'nau5']
   abf_worker:
@@ -11,6 +12,15 @@ common: &common
     airbrake_api_key: 'airbrake_api_key'
     devise_pepper: 'devise_pepper'
     secret_token: 'secret_token'
+    github:
+      id: 'APP_ID'
+      secret: 'APP_SECRET'
+    google:
+      id: 'APP_ID'
+      secret: 'APP_SECRET'
+    facebook:
+      id: 'APP_ID'
+      secret: 'APP_SECRET'
 
   wiki_formats:
     markdown:  "Markdown"
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 6f9f45858..be74b0c29 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -182,14 +182,19 @@ Devise.setup do |config|
   # config.navigational_formats = [:"*/*", "*/*", :html]
 
   # The default HTTP method used to sign out a resource. Default is :delete.
-  config.sign_out_via = :delete
+  config.sign_out_via = :get
 
   # ==> OmniAuth
   # 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'
-  require 'openid/store/filesystem'
-  config.omniauth :openid, :name => 'open_id' #, :store => OpenID::Store::Filesystem.new('./tmp')
+
+  # require 'openid/store/filesystem'
+  # config.omniauth :openid, :name => 'open_id' #, :store => OpenID::Store::Filesystem.new('./tmp')
+
+  config.omniauth :facebook, APP_CONFIG['keys']['facebook']['id'], APP_CONFIG['keys']['facebook']['secret']
+  config.omniauth :google_oauth2, APP_CONFIG['keys']['google']['id'], APP_CONFIG['keys']['google']['secret'], {:access_type => 'offline', :approval_prompt => ''}
+  config.omniauth :github, APP_CONFIG['keys']['github']['id'], APP_CONFIG['keys']['github']['secret']
 
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
new file mode 100644
index 000000000..ac5e72a76
--- /dev/null
+++ b/config/initializers/omniauth.rb
@@ -0,0 +1,9 @@
+# require "omniauth-facebook"
+
+# Rails.application.config.middleware.use OmniAuth::Builder do
+#   [:facebook, :github, :google_oauth2].each do |kind|
+#     provider kind, APP_CONFIG['keys']["#{kind}"]['id'], APP_CONFIG['keys']["#{kind}"]['secret']
+#   end
+# end
+
+OmniAuth.config.logger = Rails.logger
\ No newline at end of file
diff --git a/lib/ext/preregistration.rb b/lib/ext/preregistration.rb
index 5b07c5d88..77b5ee919 100644
--- a/lib/ext/preregistration.rb
+++ b/lib/ext/preregistration.rb
@@ -51,10 +51,10 @@ module Preregistration
         end
       end
 
-    end #RegistrationsController
-  end #Devise
-end #Preregistration
+    end # RegistrationsController
+  end # Devise
+end # Preregistration
 
 Rails.application.config.to_prepare do
-  ::Devise::RegistrationsController.send :include, Preregistration::Devise::RegistrationsController
+  ::Devise::RegistrationsController.send :include, Preregistration::Devise::RegistrationsController if APP_CONFIG['preregistration']
 end

From e74e6609732e71eebf870f76e4f0319b404da1ca Mon Sep 17 00:00:00 2001
From: Vokhmin Alexey V <avokhmin@gmail.com>
Date: Tue, 26 Mar 2013 15:52:38 +0400
Subject: [PATCH 02/11] #30: update UI for sign_in and sign_up

---
 app/assets/images/{gplus.png => facebook.png} | Bin
 app/assets/images/{git.png => github.png}     | Bin
 app/assets/images/google.png                  | Bin 0 -> 3077 bytes
 app/assets/stylesheets/login.scss             |  12 +++++++++-
 app/assets/stylesheets/reg_session.scss       |  22 ++++++++++++++++++
 app/views/devise/registrations/new.html.haml  |   6 +----
 app/views/devise/sessions/new.html.haml       |   3 +--
 app/views/devise/shared/_providers.haml       |  11 +++++++++
 config/locales/en.yml                         |   1 +
 config/locales/ru.yml                         |   1 +
 10 files changed, 48 insertions(+), 8 deletions(-)
 rename app/assets/images/{gplus.png => facebook.png} (100%)
 rename app/assets/images/{git.png => github.png} (100%)
 create mode 100644 app/assets/images/google.png
 create mode 100644 app/views/devise/shared/_providers.haml

diff --git a/app/assets/images/gplus.png b/app/assets/images/facebook.png
similarity index 100%
rename from app/assets/images/gplus.png
rename to app/assets/images/facebook.png
diff --git a/app/assets/images/git.png b/app/assets/images/github.png
similarity index 100%
rename from app/assets/images/git.png
rename to app/assets/images/github.png
diff --git a/app/assets/images/google.png b/app/assets/images/google.png
new file mode 100644
index 0000000000000000000000000000000000000000..80f6155e073f4e9f879516c8b615dd5b3223933c
GIT binary patch
literal 3077
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
T2|`yx00000NkvXXu0mjfgW0qd

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss
index 6ac3c5092..8d7e34d3b 100644
--- a/app/assets/stylesheets/login.scss
+++ b/app/assets/stylesheets/login.scss
@@ -1,3 +1,13 @@
 @import 'devise/login';
 
-nav a { text-decoration: none;}
\ No newline at end of file
+nav a { text-decoration: none;}
+
+article {
+  height: auto;
+  width: 270px;
+  padding-bottom: 10px;
+
+  a {
+    text-decoration: none;
+  }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/reg_session.scss b/app/assets/stylesheets/reg_session.scss
index 025ea5b34..d8f145b3e 100644
--- a/app/assets/stylesheets/reg_session.scss
+++ b/app/assets/stylesheets/reg_session.scss
@@ -21,3 +21,25 @@ div.error.forgot {
 div.error.reset {
   margin-top: -141px;
   margin-left: 645px; }
+
+article {
+  height: auto;
+  padding-bottom: 10px;
+  .hr {
+    margin-top: 10px;
+    border-bottom: 1px solid #264862;
+    border-top: 1px solid #264862;
+    height: 1px;
+  }
+  a {
+    text-decoration: none;
+  }
+  .other {
+    .left {
+      margin-top: 6px;
+    }
+    .right {
+      margin-top: 13px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index 4d1c06b22..413c28e96 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -33,11 +33,7 @@
       .in
         =f.submit t("layout.devise.shared_links.sign_up"), :class => 'button', :id => 'btnLogin'
       .both
-
-      - if devise_mapping.omniauthable?
-        - resource_class.omniauth_providers.each do |provider|
-          = link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)
-          %br
+    = render 'devise/shared/providers'
 
   =showDeviseHintError(:login, uname_error)
   =showDeviseHintError(:name, name_error)
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 55c16f02d..1598f8dcf 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -27,8 +27,7 @@
           .text=t('devise.sessions.remember_me')
         .in=f.submit t('layout.devise.shared_links.sign_in'), :class => 'button', :id => 'btnLogin'
       %div{:style => "clear: both;"}
-      .hr
-      .both
+    = render 'devise/shared/providers'
   .forgot
     .password
       %p= link_to t("layout.devise.shared_links.forgot_password"), new_password_path(resource_name)
diff --git a/app/views/devise/shared/_providers.haml b/app/views/devise/shared/_providers.haml
new file mode 100644
index 000000000..f7cdc00c4
--- /dev/null
+++ b/app/views/devise/shared/_providers.haml
@@ -0,0 +1,11 @@
+- if devise_mapping.omniauthable?
+  .hr
+  .other
+    .left
+      %p= t('layout.sessions.sign_up_with')
+    .right
+      - resource_class.omniauth_providers.each do |provider|
+        = link_to omniauth_authorize_path(resource_name, provider) do
+          - provider = provider.to_s.gsub(/_oauth2/,'')
+          = image_tag("#{provider}.png", :alt => provider)
+  .both
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index be090706d..0eefcfc6f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -87,6 +87,7 @@ en:
 
     sessions:
       sign_in_header: Sign in
+      sign_up_with: "Sign up with:"
 
     private_users:
       list: List
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 1afe052cd..1b1974b31 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -87,6 +87,7 @@ ru:
 
     sessions:
       sign_in_header: Вход в систему
+      sign_up_with: "Зарегистрироваться с:"
 
     private_users:
       list: Список

From abfe502b5ffefad456f5a7da3e14d669b19e6f9a Mon Sep 17 00:00:00 2001
From: Vokhmin Alexey V <avokhmin@gmail.com>
Date: Tue, 26 Mar 2013 16:24:15 +0400
Subject: [PATCH 03/11] #30: update devise.rb and omniauth_callbacks_controller

---
 .../users/omniauth_callbacks_controller.rb    | 26 +++++++++----------
 config/initializers/devise.rb                 |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 35277c82d..99cad3cf7 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -1,10 +1,5 @@
 # -*- encoding : utf-8 -*-
 class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
-  require 'uuidtools'
-
-  # def facebook
-  #   generic
-  # end
 
   def facebook
     oauthorize 'Facebook'
@@ -40,30 +35,35 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
     provider, uid   = auth['provider'], auth['uid']
     authentication  = Authentication.find_or_initialize_by_provider_and_uid(provider, uid)
     if authentication.new_record?
-      unless user_signed_in? # Register new user from session
+      if user_signed_in? # Register new user from session
+        authentication.user = current_user
+      else
         case provider
         when 'facebook'
           name  = auth['extra']['raw_info']['name']
           email = auth['info']['email']
         when 'google_oauth2'
-          name =  auth['info']['nickname']
+          name =  auth['info']['name']
           email = auth['info']['email']
         when 'github'
-
+          name =  auth['info']['nickname']
+          email = auth['info']['email'] || "#{name}@github.com"
         else
           raise 'Provider #{provider} not handled'
         end
-          user = User.create(
-            :uname    => "#{provider}-#{uid}",
+          user = User.create!(
+            :uname    => "#{provider.gsub(/_oauth2/,'')}_#{uid}",
             :name     => name,
             :email    => email,
             :password => Devise.friendly_token[0,20]
           )
+          user.confirmed_at = Time.zone.now
+          user.save
+          authentication.user = user
       end
-      authentication.user = current_user
-      authentication.save
+      authentication.save!
     end
-    return user
+    return authentication.user
   end
  
 end
\ No newline at end of file
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index be74b0c29..bc4951c40 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -182,7 +182,7 @@ Devise.setup do |config|
   # config.navigational_formats = [:"*/*", "*/*", :html]
 
   # The default HTTP method used to sign out a resource. Default is :delete.
-  config.sign_out_via = :get
+  config.sign_out_via = :delete
 
   # ==> OmniAuth
   # Add a new OmniAuth provider. Check the wiki for more information on setting

From cd98088e7f406ef40ec15962cbf0c36418d420df Mon Sep 17 00:00:00 2001
From: Vokhmin Alexey V <avokhmin@gmail.com>
Date: Tue, 26 Mar 2013 17:22:25 +0400
Subject: [PATCH 04/11] #30: find user by email before registration

---
 Gemfile                                        |  2 --
 .../users/omniauth_callbacks_controller.rb     | 18 +++++++++---------
 app/models/user.rb                             | 14 --------------
 config/initializers/devise.rb                  |  2 +-
 config/initializers/omniauth.rb                |  8 --------
 5 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4b7317e2b..99c57eb49 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,13 +7,11 @@ gem 'pg', '~> 0.14.0'
 
 gem 'devise', '~> 2.2.3'
 gem 'omniauth'
-# gem 'oa-oauth', :require => 'omniauth/oauth'
 gem 'omniauth-facebook'
 gem 'omniauth-google-oauth2'
 gem 'omniauth-github'
 # gem 'omniauth-openid', '~> 1.0.1'
 gem 'cancan', '1.6.7' # 1.6.8 fail specs with strange error
-# gem 'uuidtools'
 
 gem 'ancestry', '~> 1.3.0'
 gem 'paperclip', '~> 3.3.1'
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 99cad3cf7..4e13d8833 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -47,18 +47,18 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
           email = auth['info']['email']
         when 'github'
           name =  auth['info']['nickname']
-          email = auth['info']['email'] || "#{name}@github.com"
+          email = auth['info']['email']
         else
           raise 'Provider #{provider} not handled'
         end
-          user = User.create!(
-            :uname    => "#{provider.gsub(/_oauth2/,'')}_#{uid}",
-            :name     => name,
-            :email    => email,
-            :password => Devise.friendly_token[0,20]
-          )
-          user.confirmed_at = Time.zone.now
-          user.save
+          user = User.find_or_initialize_by_email(email)
+          if user.new_record?
+            user.name     = name
+            user.uname    = name.gsub(/\s/, '').underscore
+            user.password = Devise.friendly_token[0,20]
+            user.confirmed_at = Time.zone.now
+            user.save
+          end
           authentication.user = user
       end
       authentication.save!
diff --git a/app/models/user.rb b/app/models/user.rb
index fce41e6b6..71854e991 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -99,20 +99,6 @@ class User < Avatar
              { :value => login.downcase, :orig_value => login }]).first
     end
 
-    def new_with_session(params, session)
-      super.tap do |user|
-        if data = session["devise.omniauth_data"]
-          if info = data['info'] and info.present?
-            user.email = info['email'].presence if user.email.blank?
-            user.uname ||= info['nickname'].presence || info['username'].presence
-            user.name ||= info['name'].presence || [info['first_name'], info['last_name']].join(' ').strip
-          end
-          user.password = Devise.friendly_token[0,20] # stub password
-          user.authentications.build :uid => data['uid'], :provider => data['provider']
-        end
-      end
-    end
-
     def auth_by_token_or_login_pass(user, pass)
       u = User.find_for_database_authentication(:login => user)
       u if u && !u.access_locked? && (u.authentication_token == user || u.valid_password?(pass))
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index bc4951c40..a0b635a4f 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -194,7 +194,7 @@ Devise.setup do |config|
 
   config.omniauth :facebook, APP_CONFIG['keys']['facebook']['id'], APP_CONFIG['keys']['facebook']['secret']
   config.omniauth :google_oauth2, APP_CONFIG['keys']['google']['id'], APP_CONFIG['keys']['google']['secret'], {:access_type => 'offline', :approval_prompt => ''}
-  config.omniauth :github, APP_CONFIG['keys']['github']['id'], APP_CONFIG['keys']['github']['secret']
+  config.omniauth :github, APP_CONFIG['keys']['github']['id'], APP_CONFIG['keys']['github']['secret'], {:scope => 'user'}
 
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index ac5e72a76..d5f26a3d8 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -1,9 +1 @@
-# require "omniauth-facebook"
-
-# Rails.application.config.middleware.use OmniAuth::Builder do
-#   [:facebook, :github, :google_oauth2].each do |kind|
-#     provider kind, APP_CONFIG['keys']["#{kind}"]['id'], APP_CONFIG['keys']["#{kind}"]['secret']
-#   end
-# end
-
 OmniAuth.config.logger = Rails.logger
\ No newline at end of file

From 69c226be0b3aef81af5a7a22d1267ef217420b9f Mon Sep 17 00:00:00 2001
From: Vokhmin Alexey V <avokhmin@gmail.com>
Date: Tue, 26 Mar 2013 17:30:43 +0400
Subject: [PATCH 05/11] #30: update comments, some refactoring

---
 app/controllers/users/omniauth_callbacks_controller.rb | 8 ++++----
 app/models/authentication.rb                           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 4e13d8833..8c0cfa2cc 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -22,7 +22,7 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def oauthorize(kind)
     provider = kind.downcase
     @user = find_for_ouath(env["omniauth.auth"], current_user)
-    if @user.persisted?
+    if @user && @user.persisted?
       flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => action_name.classify
       sign_in_and_redirect @user, :event => :authentication
     else
@@ -35,9 +35,9 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
     provider, uid   = auth['provider'], auth['uid']
     authentication  = Authentication.find_or_initialize_by_provider_and_uid(provider, uid)
     if authentication.new_record?
-      if user_signed_in? # Register new user from session
+      if user_signed_in? # New authentication method for current_user
         authentication.user = current_user
-      else
+      else # Register new user from session
         case provider
         when 'facebook'
           name  = auth['extra']['raw_info']['name']
@@ -61,7 +61,7 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
           end
           authentication.user = user
       end
-      authentication.save!
+      authentication.save
     end
     return authentication.user
   end
diff --git a/app/models/authentication.rb b/app/models/authentication.rb
index 0f29e3da9..e87f63c44 100644
--- a/app/models/authentication.rb
+++ b/app/models/authentication.rb
@@ -2,6 +2,6 @@
 class Authentication < ActiveRecord::Base
   belongs_to :user
 
-  validates :provider, :uid, :presence => true
+  validates :provider, :uid, :user_id, :presence => true
   validates :uid, :uniqueness => {:scope => :provider, :case_sensitive => false}
 end

From 960aecb6d5bff7bd5638677ff3c3785b52fb76c0 Mon Sep 17 00:00:00 2001
From: Vokhmin Alexey V <avokhmin@gmail.com>
Date: Tue, 26 Mar 2013 17:35:02 +0400
Subject: [PATCH 06/11] #30: refactoring of
 OmniauthCallbacksController#find_for_ouath

---
 .../users/omniauth_callbacks_controller.rb    | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 8c0cfa2cc..6b94783aa 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -41,25 +41,20 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
         case provider
         when 'facebook'
           name  = auth['extra']['raw_info']['name']
-          email = auth['info']['email']
-        when 'google_oauth2'
-          name =  auth['info']['name']
-          email = auth['info']['email']
-        when 'github'
-          name =  auth['info']['nickname']
-          email = auth['info']['email']
+        when 'google_oauth2', 'github'
+          name = auth['info']['nickname'] || auth['info']['name']
         else
           raise 'Provider #{provider} not handled'
         end
-          user = User.find_or_initialize_by_email(email)
-          if user.new_record?
-            user.name     = name
-            user.uname    = name.gsub(/\s/, '').underscore
-            user.password = Devise.friendly_token[0,20]
-            user.confirmed_at = Time.zone.now
-            user.save
-          end
-          authentication.user = user
+        user = User.find_or_initialize_by_email(auth['info']['email'])
+        if user.new_record?
+          user.name     = name
+          user.uname    = name.gsub(/\s/, '').underscore
+          user.password = Devise.friendly_token[0,20]
+          user.confirmed_at = Time.zone.now
+          user.save
+        end
+        authentication.user = user
       end
       authentication.save
     end

From f903944e6df3d6edc232365b5ecd86027cbc6a4b Mon Sep 17 00:00:00 2001
From: Vokhmin Alexey V <avokhmin@gmail.com>
Date: Tue, 26 Mar 2013 17:43:29 +0400
Subject: [PATCH 07/11] #30: update scope for github omniauth

---
 config/initializers/devise.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index a0b635a4f..f7cadfd61 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -194,7 +194,7 @@ Devise.setup do |config|
 
   config.omniauth :facebook, APP_CONFIG['keys']['facebook']['id'], APP_CONFIG['keys']['facebook']['secret']
   config.omniauth :google_oauth2, APP_CONFIG['keys']['google']['id'], APP_CONFIG['keys']['google']['secret'], {:access_type => 'offline', :approval_prompt => ''}
-  config.omniauth :github, APP_CONFIG['keys']['github']['id'], APP_CONFIG['keys']['github']['secret'], {:scope => 'user'}
+  config.omniauth :github, APP_CONFIG['keys']['github']['id'], APP_CONFIG['keys']['github']['secret'], {:scope => 'user:email'}
 
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or

From 522e931761182a08c76265075502b80734d1cafe Mon Sep 17 00:00:00 2001
From: Vokhmin Alexey V <avokhmin@gmail.com>
Date: Tue, 26 Mar 2013 19:17:26 +0400
Subject: [PATCH 08/11] #30: update icon for facebook

---
 app/assets/images/facebook.png | Bin 3077 -> 2133 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/assets/images/facebook.png b/app/assets/images/facebook.png
index 80f6155e073f4e9f879516c8b615dd5b3223933c..669c8e1d6e00da1642e69b76d94bf1af9b31fcee 100644
GIT binary patch
literal 2133
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
J`kzl-{4W*ay^H_=

delta 3055
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


From 8de8b326d8b2d4db42fc1b03a468904e819e87e3 Mon Sep 17 00:00:00 2001
From: Vokhmin Alexey V <avokhmin@gmail.com>
Date: Thu, 4 Apr 2013 15:52:54 +0400
Subject: [PATCH 09/11] #30: update facebook.png

---
 app/assets/images/facebook.png | Bin 2133 -> 2935 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/assets/images/facebook.png b/app/assets/images/facebook.png
index 669c8e1d6e00da1642e69b76d94bf1af9b31fcee..429c9425443c3a9924903f2fab1c94e2277b4bbc 100644
GIT binary patch
delta 2912
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
KMNUMnLSTYA5qWL^

literal 2133
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
J`kzl-{4W*ay^H_=


From cec46912a986b3411b0f471e27a8e5952d3273f4 Mon Sep 17 00:00:00 2001
From: Vokhmin Alexey V <avokhmin@gmail.com>
Date: Thu, 4 Apr 2013 18:03:10 +0400
Subject: [PATCH 10/11] #30: update icon for google

---
 app/assets/images/google.png | Bin 3077 -> 3059 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/assets/images/google.png b/app/assets/images/google.png
index 80f6155e073f4e9f879516c8b615dd5b3223933c..2ce2a7161deb9a0fc652e7d0fd80b50040b12c9d 100644
GIT binary patch
delta 317
zcmV-D0mA-;81omfzzTmJNkl<Zc-p*H(XE3p3_Pm0Kvu{KS%DSW5xN2$p(}I+Izl@F
z9f6KON4WkNDe@!4p%EuVkYJs$bB@!H#9laHNBkAq2LNp}e=XR&W&8(8%LpU~+R&wV
zERi_?4|)CuLsVVj&x2YYWG%^MarRK8sc%z`tEL)V4e7sENaKI^PYq{xHNT4dJ1K>f
z-Dc_EGIF0t`W%nd*^*FZ^cF|fIs<?qO4%vepJ(klYgHt^AREQf*J>OAP>oRp<7x=x
zEF#EZ_*EcBk|XUnZWTxippWL4g|-r;_Gb94Y3!B6Q+B2nb0|3P+)DIof--mNS41|a
z^eKcvQg&AM_pLQ)^hOm{>t|lh#%aY#N7CiEn!>AGP<vN&Ts3>%8@~epm{a<Ai|@F1
P00000NkvXXu0mjfvXhYQ

delta 335
zcmV-V0kHn_7ljzGzzTmbNkl<Zc-rii(M`iJ5Qe{0RLW}@p(~gX$_U8_U7?K7uD}R*
z1T#XrLPx-luEK+PIZLPD5JId9AuOE|`<(mjyZ=9>iZODlvEqi~?}FVe4e)-w>gfw`
z299ZAUDscOsQ?Bz0NW9)4zML|)&LIh>ZC@1Uj@X@N<)nCll6Zg(1)<^Lx}Q3*;^mN
zNzD(kFK4ZeyPCKez$N3`sP`wJ60@24x7g?hpgCVL>OV`+y_k_2HsYH-s$9Dou+gd8
zC9-6xy%a0~J&vVr4%ieywo7U>2h2-t3=jwAMu_ucQSX3O1bkNON!Si}C_xYdoJ1#G
z<~t{V_v^a$OVdY~YGo%hSfpk?(<wA@jC2-XB8`otF(=?w4$%R&l+HHNId%j0Q4Vk^
hBI^HtkY5e<F#sbvwLb|$S3>{*002ovPDHLkV1j2#nU4Sf


From 6e1798729efd85590b0b7f03f60474af9a5cc790 Mon Sep 17 00:00:00 2001
From: Vokhmin Alexey V <avokhmin@gmail.com>
Date: Thu, 4 Apr 2013 18:19:49 +0400
Subject: [PATCH 11/11] #30: update styles

---
 app/assets/stylesheets/login.scss       | 3 +++
 app/assets/stylesheets/reg_session.scss | 3 +++
 app/views/devise/shared/_providers.haml | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss
index 8d7e34d3b..9dea52902 100644
--- a/app/assets/stylesheets/login.scss
+++ b/app/assets/stylesheets/login.scss
@@ -10,4 +10,7 @@ article {
   a {
     text-decoration: none;
   }
+  .facebook {
+    margin-right: -4px;
+  }
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/reg_session.scss b/app/assets/stylesheets/reg_session.scss
index d8f145b3e..696780dac 100644
--- a/app/assets/stylesheets/reg_session.scss
+++ b/app/assets/stylesheets/reg_session.scss
@@ -34,6 +34,9 @@ article {
   a {
     text-decoration: none;
   }
+  .facebook {
+    margin-right: -4px;
+  }
   .other {
     .left {
       margin-top: 6px;
diff --git a/app/views/devise/shared/_providers.haml b/app/views/devise/shared/_providers.haml
index f7cdc00c4..d173f01d0 100644
--- a/app/views/devise/shared/_providers.haml
+++ b/app/views/devise/shared/_providers.haml
@@ -7,5 +7,5 @@
       - resource_class.omniauth_providers.each do |provider|
         = link_to omniauth_authorize_path(resource_name, provider) do
           - provider = provider.to_s.gsub(/_oauth2/,'')
-          = image_tag("#{provider}.png", :alt => provider)
+          = image_tag("#{provider}.png", :alt => provider, :class => provider)
   .both
\ No newline at end of file