c80_news_tz 0.1.1.21 → 0.1.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15f192a8810ee8e908dda8d442f54e4eaf7f8f15
-  data.tar.gz: d7aed5c07568f7a4e3c33a5c4197a54fd522faf9
+  metadata.gz: f176c63a7d34761544aeadf49b255c7e871ec83d
+  data.tar.gz: ce4470d35eaec9c3cdc5dc51ea17b0fcbd3ff37d
 SHA512:
-  metadata.gz: 7de32164e50f27bf30c091240376769e33b519905a5bc5483b37f85fbffd0e7712dc9e1818be8e81fbbe48b535913d2c10a6ade76f27f013747f66740868fda5
-  data.tar.gz: b207cfb134caa3fc127026c0df61b2e90531ba5351e077e8936de762cbe29d3aca72f80ffcad1c2b61944ce1fa7d392ccd3e3821545fa511d56fecafb59bf77d
+  metadata.gz: e17cb7c6e990ea0c756f07f43cdcc5260e615410f8be402130310e5259509e54127aea0e7f99cf1376b0fe9e5daf7efc15f8906ea7edf9f72f99f1a2d7a7a42a
+  data.tar.gz: 166791118577e689e52b4ccbac7a30ca807a7ac883f172e2461ab5a32654bbe8406d3e0b9653cb2c04b593015038dbfb31ee294a3557179251aa5934eccde1a9

data/app/controllers/c80_news_tz/sessions_controller.rb

@@ -0,0 +1,38 @@
+module C80NewsTz
+  class SessionsController < ApplicationController
+
+    def create
+      #render text: request.env['omniauth.auth'].to_yaml
+
+      begin
+        @user = User.from_omniauth(request.env['omniauth.auth'])
+        session[:user_id] = @user.id
+        flash[:success] = "Welcome, #{@user.name}!"
+      rescue => e
+        Rails.logger.debug(e)
+        flash[:warning] = 'There was an error while try to authenticate you...'
+      end
+
+      # Rails.logger.debug("<SessionsController.create> request.env['omniauth.origin'] = " + request.env['omniauth.origin'])
+      redirect_to request.env['omniauth.origin']
+
+    end
+
+    def destroy
+      if current_user
+        session.delete(:user_id)
+        flash[:success] = 'See you!'
+      end
+
+      redirect_to request.referer
+
+    end
+
+    def auth_failure
+      # redirect_to request.referer
+      redirect_to request.env['omniauth.origin']
+    end
+
+  end
+
+end

data/app/models/c80_news_tz/user.rb

@@ -0,0 +1,43 @@
+module C80NewsTz
+  class User < ActiveRecord::Base
+
+    def self.from_omniauth(auth_hash)
+      user = find_or_create_by(uid: auth_hash['uid'], provider: auth_hash['provider'])
+      user.name = auth_hash['info']['name']
+      user.location = get_social_location_for user.provider, auth_hash['info']['location']
+      user.image_url = auth_hash['info']['image']
+      user.url = get_social_url_for user.provider, auth_hash['info']['urls'] #[user.provider.capitalize]
+      user.save!
+      user
+    end
+
+    private
+
+    # LinkedIn’s authentication hash is a bit different from the ones that we’ve seen up to now:
+    # * location is a nested hash with country’s code and name.
+    # * urls is also a nested hash, but there is no LinkedIn key. Instead, there is a
+    #   public_profile key and probably a bunch of others (storing personal web site and things like that).
+    # This introduces some complexity to the parsing methods:
+
+    def self.get_social_location_for(provider, location_hash)
+      case provider
+        when 'linkedin'
+          location_hash['name']
+        else
+          location_hash
+      end
+    end
+
+    def self.get_social_url_for(provider, urls_hash)
+      case provider
+        when 'linkedin'
+          urls_hash['public_profile']
+        else
+          urls_hash[provider.capitalize]
+      end
+
+    end
+
+  end
+
+end

data/config/initializers/omniauth.rb

@@ -0,0 +1,24 @@
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :twitter, ENV['TWITTER_KEY'], ENV['TWITTER_SECRET']
+
+  provider :facebook, ENV['FACEBOOK_KEY'], ENV['FACEBOOK_SECRET'],
+      scope: 'public_profile',
+      info_fields: 'id,name,link'
+
+  provider :google_oauth2, ENV['GOOGLE_CLIENT_ID'], ENV['GOOGLE_SECRET'],
+      scope: 'profile',
+      image_aspect_ratio: 'square',
+      image_size: 48,
+      access_type: 'online',
+      name: 'google',
+      skip_jwt: true
+
+  provider :linkedin, ENV['LINKEDIN_KEY'], ENV['LINKEDIN_SECRET'],
+      scope: 'r_basicprofile',
+      fields: %w'id first-name last-name location picture-url public_profile_url'
+
+end
+
+OmniAuth.config.on_failure = Proc.new do |env|
+  C80NewsTz::SessionsController.action(:auth_failure).call(env)
+end

data/config/routes.rb

@@ -1,4 +1,8 @@
 C80NewsTz::Engine.routes.draw do
   match 'news_guru', :to => 'application#guru', :via => :post
   match 'rb', :to => 'banners#counter', :via => :post
+
+  get '/auth/:provider/callback', to: 'sessions#create'
+  delete '/logout', to: 'sessions#destroy'
+
 end

data/db/migrate/20160314093945_create_users.rb

@@ -0,0 +1,14 @@
+class CreateUsers < ActiveRecord::Migration
+  def change
+    create_table :c80_news_tz_users, :options => 'COLLATE=utf8_unicode_ci' do |t|
+      t.string :provider, null: false
+      t.string :uid, null: false
+      t.string :name
+      t.string :location
+      t.string :image_url
+      t.string :url
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20160314093946_add_users_indexes.rb

@@ -0,0 +1,9 @@
+class AddUsersIndexes < ActiveRecord::Migration
+  def change
+
+      add_index :c80_news_tz_users, :provider
+      add_index :c80_news_tz_users, :uid
+      add_index :c80_news_tz_users, [:provider, :uid], unique: true
+
+  end
+end

data/lib/c80_news_tz/version.rb

@@ -1,3 +1,3 @@
 module C80NewsTz
-  VERSION = "0.1.1.21"
+  VERSION = "0.1.1.22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_news_tz
 version: !ruby/object:Gem::Version
-  version: 0.1.1.21
+  version: 0.1.1.22
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,6 +130,7 @@ files:
 - app/assets/stylesheets/c80_news_tz/frontend/pubs_medium.scss
 - app/controllers/c80_news_tz/application_controller.rb
 - app/controllers/c80_news_tz/banners_controller.rb
+- app/controllers/c80_news_tz/sessions_controller.rb
 - app/helpers/c80_news_tz/advertisers_helper.rb
 - app/helpers/c80_news_tz/application_helper.rb
 - app/helpers/c80_news_tz/banners_helper.rb
@@ -161,6 +162,7 @@ files:
 - app/models/c80_news_tz/rubric.rb
 - app/models/c80_news_tz/rubric_validator.rb
 - app/models/c80_news_tz/spot.rb
+- app/models/c80_news_tz/user.rb
 - app/uploaders/c80_news_tz/bimage01_uploader.rb
 - app/uploaders/c80_news_tz/bimage02_uploader.rb
 - app/uploaders/c80_news_tz/bimage03_uploader.rb
@@ -184,6 +186,7 @@ files:
 - bin/console
 - bin/setup
 - c80_news_tz.gemspec
+- config/initializers/omniauth.rb
 - config/locales/ru.yml
 - config/routes.rb
 - db/migrate/20151129000045_create_rubrics.rb
@@ -218,6 +221,8 @@ files:
 - db/migrate/20160309194444_create_banners01.rb
 - db/migrate/20160310110000_create_banners02.rb
 - db/migrate/20160310114242_create_banners03.rb
+- db/migrate/20160314093945_create_users.rb
+- db/migrate/20160314093946_add_users_indexes.rb
 - db/seeds/19_fill_news_props.rb.example
 - db/seeds/20_fill_rubrics.rb.example
 - db/seeds/21_fill_facts.rb.example