omniauth-swagger 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c266f0f11e17f0aeb7f34f1b3f2971ef18206ffa
-  data.tar.gz: 0f9c87ee827001095f6b367bc38a44735dc0c97f
+  metadata.gz: e9d3e6a898c3f01e4e7dadf5346a80eadb9f1b43
+  data.tar.gz: 2864dd4622faf11d5446adc016fed566085001d6
 SHA512:
-  metadata.gz: d87d183a03d750de7271d8d779ba6f639417f77074c0cc1e0e73bdbb4da598c2d6e2ca22cf1821123029d5ed0bf1f5c891a4da319e74f8626c514a870beb329f
-  data.tar.gz: 7b16a79d6f61e3647591941afe6060e2ca74418b6ec735da239fedc9b3cdad0f98f82ff8dc46594623c9866deff0400c3b21cb70db22cf919965ce99a10c715a
+  metadata.gz: 72f09e591ba504b9a0f14ca04965a38105d427555cc5753fef031b529d292b2ae98849600dcfb24fb6a98caf737b26fc4675b25650edb8be198279b7fc65245e
+  data.tar.gz: b86613fb5f762a38df03cdd986f92a390eaf2cc8c244c2f50292b81620caab42bf4ae7e9f99448427b95fec568922c9cd6e2439480e7922b3b2b31f9ce17215e

data/lib/omniauth/strategies/swagger.rb

@@ -1,7 +1,8 @@
 require 'omniauth-oauth2'
 require 'omniauth/swagger/oauth2_definition'
 require 'omniauth/swagger/default_provider_lookup'
-require 'diesel'
+require 'omniauth/swagger/uid_options'
+require 'apiture'
 
 module OmniAuth
   module Strategies
@@ -9,8 +10,6 @@ module OmniAuth
     class Swagger < OmniAuth::Strategies::OAuth2
 
       OPTION_UID = 'uid'.freeze
-      OPTION_UID_API = 'api'.freeze
-      OPTION_UID_PARAM = 'param'.freeze
       OPTION_SPECIFICATION = 'specification'.freeze
       OPTION_SUBDOMAIN = 'subdomain'.freeze
 
@@ -44,17 +43,25 @@ module OmniAuth
       end
 
       uid do
-        if uid_api
-          operation, key = uid_api.split('#')
-          value = key.split('.').reduce(raw_info) { |memo, key| memo[key] }
-          value.to_s
-        else
-          uid_option = provider_options[OPTION_UID]
-          if uid_option[OPTION_UID_PARAM]
-            access_token.params[uid_option[OPTION_UID_PARAM]]
+        if uid_options.nil?
+          raise "Missing #{OPTION_UID} setting for provider '#{provider_name}'"
+
+        elsif uid_options.api?
+          val = uid_options.
+            api_value_path.
+            split('.').
+            reduce(raw_info) { |memo, key| memo && memo[key] }
+          if val
+            val.to_s
           else
-            raise "Unsupported UID option: #{uid_option.inspect}"
+            raise "Invalid UID value path #{uid_options.api_value_path}: #{raw_info.inspect}"
           end
+
+        elsif uid_options.access_token_param?
+          access_token.params[uid_options.param]
+
+        else
+          raise "Unsupported UID option: #{provider_options[OPTION_UID].inspect}"
         end
       end
 
@@ -64,7 +71,12 @@ module OmniAuth
 
       protected
         def provider_name
-          @provider_name ||= request.params[options[:provider_param]].to_sym
+          @provider_name ||= begin
+                               unless nm = request.params[options[:provider_param]]
+                                 raise OmniAuth::Error, "Unable to determine provider"
+                               end
+                               nm.to_sym
+                             end
         end
 
         def provider_options
@@ -85,21 +97,19 @@ module OmniAuth
                                end
         end
 
-        def uid_api
-          opt = provider_options[OPTION_UID]
-          opt.kind_of?(Hash) ? opt[OPTION_UID_API] : opt
+        def uid_options
+          @uid_options ||= OmniAuth::Swagger::UIDOptions.from_options(provider_options[OPTION_UID])
         end
 
         def raw_info
-          if uid_api
+          if uid_options
             api_options = {@definition.oauth2_key => {token: access_token.token}}
             if provider_options[OPTION_SUBDOMAIN]
               api_options[:subdomain] = provider_options[OPTION_SUBDOMAIN]
             end
-            api_class = Diesel.build_api(specification)
+            api_class = Apiture.build_api(specification)
             api = api_class.new(api_options)
-            operation, key = uid_api.split('#')
-            api.__send__(operation, {})
+            api.__send__(uid_options.api_operation, uid_options.api_params).body
           else
             {}
           end

data/lib/omniauth/swagger/default_provider_lookup.rb

@@ -30,7 +30,7 @@ module OmniAuth
           opts[OmniAuth::Strategies::Swagger::OPTION_SPECIFICATION] = Proc.new{
             spec = nil
             open(uri) do |f|
-              spec = Diesel::Swagger::Parser.new.parse(f)
+              spec = Apiture::Swagger::Parser.new.parse(f)
             end
             spec
           }

data/lib/omniauth/swagger/uid_options.rb

@@ -0,0 +1,45 @@
+module OmniAuth
+  module Swagger
+    class UIDOptions
+
+      OPTION_API = 'api'.freeze
+      OPTION_API_PARAMS = 'api_params'.freeze
+      OPTION_PARAM = 'param'.freeze
+
+      attr_accessor :api, :api_params, :param
+
+      def self.from_options(opts)
+        return nil if opts.nil?
+        unless opts.kind_of?(Hash)
+          opts = {OPTION_API => opts}
+        end
+        uid_options = new
+        uid_options.api = opts[OPTION_API]
+        uid_options.api_params = opts[OPTION_API_PARAMS]
+        uid_options.param = opts[OPTION_PARAM]
+        uid_options
+      end
+
+      def api?
+        api != nil
+      end
+
+      def access_token_param?
+        param != nil
+      end
+
+      def api_value_path
+        @api_value_path ||= api.split("#")[1]
+      end
+
+      def api_operation
+        @api_operation ||= api.split("#").first
+      end
+
+      def api_params
+        @api_params || {}
+      end
+
+    end
+  end
+end

data/lib/omniauth/swagger/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Swagger
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

data/omniauth-swagger.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
 
   spec.add_dependency "omniauth-oauth2", "~> 1.3.0"
-  spec.add_dependency "diesel-api-dsl", ">= 0.1.5"
+  spec.add_dependency "apiture", "~> 0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-swagger
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Calvin Yu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2016-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: diesel-api-dsl
+  name: apiture
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.2.3
 description: Uses a spec's security definition information to build the oauth2 strategy
 email:
 - me@sourcebender.com
@@ -99,6 +99,7 @@ files:
 - lib/omniauth/swagger/oauth2_definition.rb
 - lib/omniauth/swagger/provider_defaults.rb
 - lib/omniauth/swagger/providers.yml
+- lib/omniauth/swagger/uid_options.rb
 - lib/omniauth/swagger/version.rb
 - omniauth-swagger.gemspec
 homepage: http://github.com/incominghq/omniauth-swagger