omniauth-myvr 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be539216235569cefc79eb137a4bc8d35e20b32c
-  data.tar.gz: bf27996d04f0d8a79d68b9d4d9637e86724912bf
+  metadata.gz: 5628f6edef469d955e3dd28ac5489ad566fdb50d
+  data.tar.gz: 9a5ca5ed3183d23ed78252b9c3f219625bf3ad26
 SHA512:
-  metadata.gz: da15aeb66bf290238efff6d17b08b201a8f926384538f15ff197e04192dd3b65aff860bf0ae58e3e60529049c8982914cab5fdbb52b05530223cd33c3c95e948
-  data.tar.gz: d7c4b89f958917add54f746858655e895f639d3b61e1a9b8b0afc21ab737c7d34fd51e5086e8e08984275c3bc5533a43e0aa8e152d78f786e571fea46fe1ab8c
+  metadata.gz: ed21c07fcc864aba84088561b3df7ff59fc3365f73ad2dbbd6d4ed5eb0ae2cae2814c4ba98cfac3bcc7d8970363c33f0852ae6010a8d096ffac2950031294bb4
+  data.tar.gz: 6425e315fa6970f56a9913abb47484382f222dd6e833fd785f3e35ae438dcde6e3ed0ed5353a4d8bf805c041c47934bc626d27710cf4ed4e811d748367a00fd5

data/example/config.ru

@@ -6,7 +6,7 @@ require 'rubygems'
 require 'bundler'
 require 'sinatra'
 require 'omniauth'
-require '../lib/omniauth-myvr'
+require '../lib/omniauth_myvr'
 
 # Do not use for production code.
 # This is only to make setup easier when running through the sample.

data/lib/omniauth/strategies/myvr.rb

@@ -5,7 +5,7 @@ require 'uri'
 
 module OmniAuth
   module Strategies
-    class MyVROAuth < OmniAuth::Strategies::OAuth2
+    class Myvr < OmniAuth::Strategies::OAuth2
       BASE_SCOPE_URL = "https://api.myvr.com/auth/"
       BASE_SCOPES = %w[profile email openid]
       DEFAULT_SCOPE = "email,profile"
@@ -30,184 +30,184 @@ module OmniAuth
       option :authorized_client_ids, []
 
       option :client_options, {
-        :site          => 'https://accounts.google.com',
-        :authorize_url => '/o/oauth2/auth',
-        :token_url     => '/o/oauth2/token'
+        :site          => 'https://myvr.com/',
+        :authorize_url => '/connect/oauth/auth',
+        :token_url     => '/connect/oauth/token'
       }
 
-      def authorize_params
-        super.tap do |params|
-          options[:authorize_options].each do |k|
-            params[k] = request.params[k.to_s] unless [nil, ''].include?(request.params[k.to_s])
-          end
-
-          raw_scope = params[:scope] || DEFAULT_SCOPE
-          scope_list = raw_scope.split(" ").map {|item| item.split(",")}.flatten
-          scope_list.map! { |s| s =~ /^https?:\/\// || BASE_SCOPES.include?(s) ? s : "#{BASE_SCOPE_URL}#{s}" }
-          params[:scope] = scope_list.join(" ")
-          params[:access_type] = 'offline' if params[:access_type].nil?
-          params['openid.realm'] = params.delete(:openid_realm) unless params[:openid_realm].nil?
-
-          session['omniauth.state'] = params[:state] if params['state']
-        end
-      end
-
-      uid { raw_info['sub'] || verified_email }
-
-      info do
-        prune!({
-          :name       => raw_info['name'],
-          :email      => verified_email,
-          :first_name => raw_info['given_name'],
-          :last_name  => raw_info['family_name'],
-          :image      => image_url,
-          :urls => {
-            'Google' => raw_info['profile']
-          }
-        })
-      end
-
-      extra do
-        hash = {}
-        hash[:id_token] = access_token['id_token']
-        if !options[:skip_jwt] && !access_token['id_token'].nil?
-          hash[:id_info] = JWT.decode(
-            access_token['id_token'], nil, false, {
-              :verify_iss => true,
-              'iss' => 'accounts.google.com',
-              :verify_aud => true,
-              'aud' => options.client_id,
-              :verify_sub => false,
-              :verify_expiration => true,
-              :verify_not_before => true,
-              :verify_iat => true,
-              :verify_jti => false,
-              :leeway => options[:jwt_leeway]
-            }).first
-        end
-        hash[:raw_info] = raw_info unless skip_info?
-        hash[:raw_friend_info] = raw_friend_info(raw_info['sub']) unless skip_info? || options[:skip_friends]
-        hash[:raw_image_info] = raw_image_info(raw_info['sub']) unless skip_info? || options[:skip_image_info]
-        prune! hash
-      end
-
-      def raw_info
-        @raw_info ||= access_token.get('https://www.googleapis.com/plus/v1/people/me/openIdConnect').parsed
-      end
-
-      def raw_friend_info(id)
-        @raw_friend_info ||= access_token.get("https://www.googleapis.com/plus/v1/people/#{id}/people/visible").parsed
-      end
-
-      def raw_image_info(id)
-        @raw_image_info ||= access_token.get("https://www.googleapis.com/plus/v1/people/#{id}?fields=image").parsed
-      end
-
-      def custom_build_access_token
-        access_token =
-          if request.xhr? && request.params['code']
-            verifier = request.params['code']
-            client.auth_code.get_token(verifier, get_token_options('postmessage'), deep_symbolize(options.auth_token_params || {}))
-          elsif request.params['code'] && request.params['redirect_uri']
-            verifier = request.params['code']
-            redirect_uri = request.params['redirect_uri']
-            client.auth_code.get_token(verifier, get_token_options(redirect_uri), deep_symbolize(options.auth_token_params || {}))
-          elsif verify_token(request.params['access_token'])
-            ::OAuth2::AccessToken.from_hash(client, request.params.dup)
-          else
-            verifier = request.params["code"]
-            client.auth_code.get_token(verifier, get_token_options(callback_url), deep_symbolize(options.auth_token_params))
-          end
-
-        verify_hd(access_token)
-        access_token
-      end
-      alias_method :build_access_token, :custom_build_access_token
-
-      private
-
-      def callback_url
-        options[:redirect_uri] || (full_host + script_name + callback_path)
-      end
-
-      def get_token_options(redirect_uri)
-        { :redirect_uri => redirect_uri }.merge(token_params.to_hash(:symbolize_keys => true))
-      end
-
-      def prune!(hash)
-        hash.delete_if do |_, v|
-          prune!(v) if v.is_a?(Hash)
-          v.nil? || (v.respond_to?(:empty?) && v.empty?)
-        end
-      end
-
-      def verified_email
-        raw_info['email_verified'] ? raw_info['email'] : nil
-      end
-
-      def image_url
-        return nil unless raw_info['picture']
-
-        u = URI.parse(raw_info['picture'].gsub('https:https', 'https'))
-
-        path_index = u.path.to_s.index('/photo.jpg')
-
-        if path_index && image_size_opts_passed?
-          u.path.insert(path_index, image_params)
-          u.path = u.path.gsub('//', '/')
-        end
-
-        u.query = strip_unnecessary_query_parameters(u.query)
-
-        u.to_s
-      end
-
-      def image_size_opts_passed?
-        !!(options[:image_size] || options[:image_aspect_ratio])
-      end
-
-      def image_params
-        image_params = []
-        if options[:image_size].is_a?(Integer)
-          image_params << "s#{options[:image_size]}"
-        elsif options[:image_size].is_a?(Hash)
-          image_params << "w#{options[:image_size][:width]}" if options[:image_size][:width]
-          image_params << "h#{options[:image_size][:height]}" if options[:image_size][:height]
-        end
-        image_params << 'c' if options[:image_aspect_ratio] == 'square'
-
-        '/' + image_params.join('-')
-      end
-
-      def strip_unnecessary_query_parameters(query_parameters)
-        # strip `sz` parameter (defaults to sz=50) which overrides `image_size` options
-        return nil if query_parameters.nil?
-
-        params = CGI.parse(query_parameters)
-        stripped_params = params.delete_if { |key| key == "sz" }
-
-        # don't return an empty Hash since that would result
-        # in URLs with a trailing ? character: http://image.url?
-        return nil if stripped_params.empty?
-
-        URI.encode_www_form(stripped_params)
-      end
-
-      def verify_token(access_token)
-        return false unless access_token
-        raw_response = client.request(:get, 'https://www.googleapis.com/oauth2/v3/tokeninfo',
-                                      params: { access_token: access_token }).parsed
-        raw_response['aud'] == options.client_id || options.authorized_client_ids.include?(raw_response['aud'])
-      end
-
-      def verify_hd(access_token)
-        return true unless options.hd
-        @raw_info ||= access_token.get('https://www.googleapis.com/plus/v1/people/me/openIdConnect').parsed
-        allowed_hosted_domains = Array(options.hd)
-
-        raise CallbackError.new(:invalid_hd, "Invalid Hosted Domain") unless allowed_hosted_domains.include? @raw_info['hd']
-        true
-      end
+      # def authorize_params
+      #   super.tap do |params|
+      #     options[:authorize_options].each do |k|
+      #       params[k] = request.params[k.to_s] unless [nil, ''].include?(request.params[k.to_s])
+      #     end
+      #
+      #     raw_scope = params[:scope] || DEFAULT_SCOPE
+      #     scope_list = raw_scope.split(" ").map {|item| item.split(",")}.flatten
+      #     scope_list.map! { |s| s =~ /^https?:\/\// || BASE_SCOPES.include?(s) ? s : "#{BASE_SCOPE_URL}#{s}" }
+      #     params[:scope] = scope_list.join(" ")
+      #     params[:access_type] = 'offline' if params[:access_type].nil?
+      #     params['openid.realm'] = params.delete(:openid_realm) unless params[:openid_realm].nil?
+      #
+      #     session['omniauth.state'] = params[:state] if params['state']
+      #   end
+      # end
+
+      # uid { raw_info['sub'] || verified_email }
+      #
+      # info do
+      #   prune!({
+      #     :name       => raw_info['name'],
+      #     :email      => verified_email,
+      #     :first_name => raw_info['given_name'],
+      #     :last_name  => raw_info['family_name'],
+      #     :image      => image_url,
+      #     :urls => {
+      #       'Google' => raw_info['profile']
+      #     }
+      #   })
+      # end
+      #
+      # extra do
+      #   hash = {}
+      #   hash[:id_token] = access_token['id_token']
+      #   if !options[:skip_jwt] && !access_token['id_token'].nil?
+      #     hash[:id_info] = JWT.decode(
+      #       access_token['id_token'], nil, false, {
+      #         :verify_iss => true,
+      #         'iss' => 'accounts.google.com',
+      #         :verify_aud => true,
+      #         'aud' => options.client_id,
+      #         :verify_sub => false,
+      #         :verify_expiration => true,
+      #         :verify_not_before => true,
+      #         :verify_iat => true,
+      #         :verify_jti => false,
+      #         :leeway => options[:jwt_leeway]
+      #       }).first
+      #   end
+      #   hash[:raw_info] = raw_info unless skip_info?
+      #   hash[:raw_friend_info] = raw_friend_info(raw_info['sub']) unless skip_info? || options[:skip_friends]
+      #   hash[:raw_image_info] = raw_image_info(raw_info['sub']) unless skip_info? || options[:skip_image_info]
+      #   prune! hash
+      # end
+      #
+      # def raw_info
+      #   @raw_info ||= access_token.get('https://www.googleapis.com/plus/v1/people/me/openIdConnect').parsed
+      # end
+      #
+      # def raw_friend_info(id)
+      #   @raw_friend_info ||= access_token.get("https://www.googleapis.com/plus/v1/people/#{id}/people/visible").parsed
+      # end
+      #
+      # def raw_image_info(id)
+      #   @raw_image_info ||= access_token.get("https://www.googleapis.com/plus/v1/people/#{id}?fields=image").parsed
+      # end
+      #
+      # def custom_build_access_token
+      #   access_token =
+      #     if request.xhr? && request.params['code']
+      #       verifier = request.params['code']
+      #       client.auth_code.get_token(verifier, get_token_options('postmessage'), deep_symbolize(options.auth_token_params || {}))
+      #     elsif request.params['code'] && request.params['redirect_uri']
+      #       verifier = request.params['code']
+      #       redirect_uri = request.params['redirect_uri']
+      #       client.auth_code.get_token(verifier, get_token_options(redirect_uri), deep_symbolize(options.auth_token_params || {}))
+      #     elsif verify_token(request.params['access_token'])
+      #       ::OAuth2::AccessToken.from_hash(client, request.params.dup)
+      #     else
+      #       verifier = request.params["code"]
+      #       client.auth_code.get_token(verifier, get_token_options(callback_url), deep_symbolize(options.auth_token_params))
+      #     end
+      #
+      #   verify_hd(access_token)
+      #   access_token
+      # end
+      # alias_method :build_access_token, :custom_build_access_token
+      #
+      # private
+      #
+      # def callback_url
+      #   options[:redirect_uri] || (full_host + script_name + callback_path)
+      # end
+      #
+      # def get_token_options(redirect_uri)
+      #   { :redirect_uri => redirect_uri }.merge(token_params.to_hash(:symbolize_keys => true))
+      # end
+      #
+      # def prune!(hash)
+      #   hash.delete_if do |_, v|
+      #     prune!(v) if v.is_a?(Hash)
+      #     v.nil? || (v.respond_to?(:empty?) && v.empty?)
+      #   end
+      # end
+      #
+      # def verified_email
+      #   raw_info['email_verified'] ? raw_info['email'] : nil
+      # end
+      #
+      # def image_url
+      #   return nil unless raw_info['picture']
+      #
+      #   u = URI.parse(raw_info['picture'].gsub('https:https', 'https'))
+      #
+      #   path_index = u.path.to_s.index('/photo.jpg')
+      #
+      #   if path_index && image_size_opts_passed?
+      #     u.path.insert(path_index, image_params)
+      #     u.path = u.path.gsub('//', '/')
+      #   end
+      #
+      #   u.query = strip_unnecessary_query_parameters(u.query)
+      #
+      #   u.to_s
+      # end
+      #
+      # def image_size_opts_passed?
+      #   !!(options[:image_size] || options[:image_aspect_ratio])
+      # end
+      #
+      # def image_params
+      #   image_params = []
+      #   if options[:image_size].is_a?(Integer)
+      #     image_params << "s#{options[:image_size]}"
+      #   elsif options[:image_size].is_a?(Hash)
+      #     image_params << "w#{options[:image_size][:width]}" if options[:image_size][:width]
+      #     image_params << "h#{options[:image_size][:height]}" if options[:image_size][:height]
+      #   end
+      #   image_params << 'c' if options[:image_aspect_ratio] == 'square'
+      #
+      #   '/' + image_params.join('-')
+      # end
+      #
+      # def strip_unnecessary_query_parameters(query_parameters)
+      #   # strip `sz` parameter (defaults to sz=50) which overrides `image_size` options
+      #   return nil if query_parameters.nil?
+      #
+      #   params = CGI.parse(query_parameters)
+      #   stripped_params = params.delete_if { |key| key == "sz" }
+      #
+      #   # don't return an empty Hash since that would result
+      #   # in URLs with a trailing ? character: http://image.url?
+      #   return nil if stripped_params.empty?
+      #
+      #   URI.encode_www_form(stripped_params)
+      # end
+      #
+      # def verify_token(access_token)
+      #   return false unless access_token
+      #   raw_response = client.request(:get, 'https://www.googleapis.com/oauth2/v3/tokeninfo',
+      #                                 params: { access_token: access_token }).parsed
+      #   raw_response['aud'] == options.client_id || options.authorized_client_ids.include?(raw_response['aud'])
+      # end
+      #
+      # def verify_hd(access_token)
+      #   return true unless options.hd
+      #   @raw_info ||= access_token.get('https://www.googleapis.com/plus/v1/people/me/openIdConnect').parsed
+      #   allowed_hosted_domains = Array(options.hd)
+      #
+      #   raise CallbackError.new(:invalid_hd, "Invalid Hosted Domain") unless allowed_hosted_domains.include? @raw_info['hd']
+      #   true
+      # end
     end
   end
 end

data/lib/omniauth_myvr.rb

@@ -1,7 +1,7 @@
 require File.join('omniauth', 'strategies', 'myvr')
 
 module OmniAuth
-  module MyVROAuth
-    VERSION = '0.0.1'
+  module Myvr
+    VERSION = '0.0.3'
   end
 end

data/omniauth-myvr.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "omniauth-myvr"
-  s.version     = "0.0.2"
+  s.version     = "0.0.4"
   s.authors     = ["CJ Avilla"]
   s.email       = ["cjavilla@gmail.com"]
   s.homepage    = "https://github.com/w1zeman1p/omniauth-myvr"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-myvr
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - CJ Avilla