omniauth-test 0.0.6 → 0.0.7

data/lib/omniauth/strategies/test.rb

@@ -1,84 +1,45 @@
-require 'omniauth-oauth'
+require 'omniauth/oauth'
 require 'multi_json'
-require 'omniauth/strategies/test'
-require 'rspec/rails'
-
+ 
 module OmniAuth
-  module Strategies
-    class Test < OmniAuth::Strategies::OAuth
-      option :name, 'test'
-
-      option :client_options, {:authorize_path => 'http://auth.cibplus.com/oauth/authorize',
-                               :site => 'http://auth.cibplus.com',
-                               :proxy => ENV['http_proxy'] ? URI(ENV['http_proxy']) : nil}
-
-      uid { access_token.params[:user_id] }
-
-      info do
-        
-        {
-          :nickname => raw_info['screen_name'],
-          :name => raw_info['name'],
-          :location => raw_info['location'],
-          :image => image_url,
-          :description => raw_info['description'],
-          :urls => {
-            'Website' => raw_info['url'],
-            'Test' => "http://auth.cibplus.com/#{raw_info['screen_name']}",
-          }
-        }
-      end
-
-      extra do
-        { :raw_info => raw_info }
-      end
-
-      def raw_info
-        @raw_info ||= MultiJson.load(access_token.get('/1.1/account/verify_credentials.json?include_entities=false&skip_status=true').body)
-      rescue ::Errno::ETIMEDOUT
-        raise ::Timeout::Error
-      end
-
-      alias :old_request_phase :request_phase
-
-      def request_phase
-        %w[force_login lang screen_name].each do |v|
-          if request.params[v]
-            options[:authorize_params][v.to_sym] = request.params[v]
-          end
-        end
-
-        %w[x_auth_access_type].each do |v|
-          if request.params[v]
-            options[:request_params][v.to_sym] = request.params[v]
-          end
-        end
-
-        if request.params['use_authorize'] == 'true'
-          options[:client_options][:authorize_path] = '/oauth/authorize'
-        else
-          options[:client_options][:authorize_path] = '/oauth/authenticate'
-        end
-
-        old_request_phase
-      end
-
-      private
-
-      def image_url
-        original_url = options[:secure_image_url] ? raw_info['profile_image_url_https'] : raw_info['profile_image_url']
-        case options[:image_size]
-        when 'mini'
-          original_url.sub('normal', 'mini')
-        when 'bigger'
-          original_url.sub('normal', 'bigger')
-        when 'original'
-          original_url.sub('_normal', '')
-        else
-          original_url
-        end
-      end
-
-    end
+ module Strategies
+  class Test < OAuth2
+ 
+   def initialize(app, api_key = nil, secret_key = nil, options = {}, &block)
+     client_options = {
+      :site =>  'http://auth.cibplus.com',
+      :authorize_url => "http://auth.cibplus.com/oauth/authorize",
+      :access_token_url => "http://auth.cibplus.com/oauth/token"
+     }
+     super(app, :test, api_key, secret_key, client_options, &block)
+   end
+ 
+protected
+ 
+   def user_data
+     #@data ||= MultiJson.decode(@access_token.get("/auth/my_strategy/user.json"))
+   end
+ 
+   def request_phase
+     options[:scope] ||= "read"
+     super
+   end
+ 
+   def user_hash
+     user_data
+   end
+ 
+   def auth_hash
+     OmniAuth::Utils.deep_merge(super, {
+       'uid' => user_data["uid"],
+       'user_info' => user_data['user_info'],
+       'extra' => {
+         'admin' => user_data['extra']['admin'],
+         'first_name' => user_data['extra']['first_name'],
+         'last_name' => user_data['extra']['last_name'],
+       }
+     })
+   end
   end
-end
+ end
+end

data/lib/omniauth/test/version.rb

@@ -1,3 +1,3 @@
 module OmniauthTest
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-test
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors: