omniauth-wistia 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef55da8bb520cacda20dea1f4e126d6ba440cf726989787ff65f5f87d3ce9f54
-  data.tar.gz: dc0d1212aec184ddc2a12fda9dc870071243dad20d6502e17038ed4e372d2a8b
+  metadata.gz: f1a301fddb41a520fe57b528518fd40de15e3f8be58e93a39d87e64361ff97f6
+  data.tar.gz: 87ba89eb9881531283d1e6b41c859ec50a5c564a630fb75fc9c649f1010e11ee
 SHA512:
-  metadata.gz: 6dad91e721ce75c46a7a593a1c720fc2e1d7037cc7a9db5494707b1d74990179068ed96ff24fc003111f8e4766c7bf6c15bb2cd7310f709e4eb02a8b334cea9e
-  data.tar.gz: 9e3afea588ef2803c48c30a496a9642a3daeac9cedbd58094eeef7938aa9b223091fd9a369e40fa1c07d2e172f7f9b636a0b86dcc46fb14ab8a21ab555fbbbcd
+  metadata.gz: f40fa6db2af447e33d067aeaa086da9f7dde605fd1b31553bdcb57c187eff9e9727e1714536386b6fc80309abd6398d5dd1fa430727ed810e6b9b6e26fe2cebc
+  data.tar.gz: 11aa30380febf5fceed2d6a3d7f860c4c8e9cca28c6df7f33b707296260dad6a3805c73a109dbdaa4aacc3776d92e68cdb5674e91325f193d4072dd7ae1c17ec

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+### Unreleased
+
+### 0.1.1
+
+* Fix callback url
+* Setup uid, info, and raw_info to include as many details as we get back
+
+### 0.1.0
+
+* Initial release

data/Rakefile

@@ -7,4 +7,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task :default => :test
+task default: :test

data/lib/omniauth/strategies/wistia.rb

@@ -1,37 +1,49 @@
-require 'omniauth-oauth2'
-require 'multi_json'
+require "omniauth-oauth2"
+require "multi_json"
 
 module OmniAuth
   module Strategies
     class Wistia < OmniAuth::Strategies::OAuth2
-      DEFAULT_SCOPE = 'all:all'
+      DEFAULT_SCOPE = "all:all"
 
-      option :name, 'wistia'
+      option :name, "wistia"
 
       option :client_options, {
-        :site => 'https://api.wistia.com',
-        :authorize_path => '/oauth/authorize',
-        :token_url => '/oauth/token',
+        site: "https://api.wistia.com",
+        authorize_path: "/oauth/authorize",
+        token_url: "/oauth/token"
       }
 
+      uid do
+        raw_info["id"]
+      end
+
+      info do
+        {
+          name: raw_info["name"],
+          email: request.params["contact_email"],
+          urls: {
+            account: raw_info["url"]
+          }
+        }
+      end
+
       extra do
         {
-          'raw_info' => raw_info
+          "raw_info" => raw_info.merge(request.params.slice("contact_id", "contact_email"))
         }
       end
 
       def raw_info
-        @raw_info ||= access_token.get('https://api.wistia.com/v1/account.json').parsed
+        @raw_info ||= access_token.get("https://api.wistia.com/v1/account.json").parsed
       end
 
       protected
 
-      def build_access_token
-        verifier = request.params["code"]
-        params = {:redirect_uri => callback_url, :state => request.params["state"], :client_id => client.id, :client_secret => client.secret}
-        client.auth_code.get_token(verifier, params.merge(token_params.to_hash(:symbolize_keys => true)), deep_symbolize(options.auth_token_params))
+      # Override callback URL to strip query params, Wistia is strict about this (as per oauth2 spec).
+      def callback_url
+        full_host + script_name + callback_path
       end
-
     end
   end
 end

data/lib/omniauth/wistia/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Wistia
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/omniauth-wistia.gemspec

@@ -1,27 +1,29 @@
-require_relative 'lib/omniauth/wistia/version'
+require_relative "lib/omniauth/wistia/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "omniauth-wistia"
-  spec.version       = Omniauth::Wistia::VERSION
-  spec.authors       = ["Chris Oliver"]
-  spec.email         = ["excid3@gmail.com"]
+  spec.name = "omniauth-wistia"
+  spec.version = Omniauth::Wistia::VERSION
+  spec.authors = ["Chris Oliver"]
+  spec.email = ["excid3@gmail.com"]
 
-  spec.summary       = %q{OmniAuth strategy for Wistia}
-  spec.description   = %q{OmniAuth strategy for Wistia}
-  spec.homepage      = "https://github.com/excid3/omniauth-wistia"
-  spec.license       = "MIT"
+  spec.summary = "OmniAuth strategy for Wistia"
+  spec.description = "OmniAuth strategy for Wistia"
+  spec.homepage = "https://github.com/excid3/omniauth-wistia"
+  spec.license = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
-  #spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
+  # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+
+  spec.add_dependency "omniauth-oauth2", ">= 1.7", "< 2.0"
 end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-wistia
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Chris Oliver
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
-dependencies: []
+date: 2020-08-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: omniauth-oauth2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: OmniAuth strategy for Wistia
 email:
 - excid3@gmail.com
@@ -19,6 +39,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt