Merge pull request #7 from Sage/GH-6_Resolve_conflict_with_omniauth-jwt

GH-6: Resolve conflict with omniauth-jwt
Sage · Mar 26, 2020 · 9881dbc · 9881dbc
2 parents 38cd4ed + 2c15aad
commit 9881dbc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
-# v0.1.0 (to be released)
+# v0.1.1 (2020-03-26)
+
+* [GH-6](https://github.com/Sage/omniauth-cognito-idp/issues/6): Resolve conflict with omniauth-jwt
+
+# v0.1.0 (2018-05-17)
 
 Initial Release with basic features.
diff --git a/lib/omniauth-cognito-idp/version.rb b/lib/omniauth-cognito-idp/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OmniAuthCognitoIdP
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end
diff --git a/lib/omniauth/strategies/cognito_idp.rb b/lib/omniauth/strategies/cognito_idp.rb
@@ -79,7 +79,7 @@ def id_token
       def parsed_id_token
         return nil unless id_token
 
-        @parsed_id_token ||= JWT.decode(
+        @parsed_id_token ||= ::JWT.decode(
           id_token,
           nil,
           false,

diff --git a/omniauth-cognito-idp.gemspec b/omniauth-cognito-idp.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'aws-sdk-cognitoidentityprovider'
   s.add_development_dependency 'bundler'
-  s.add_development_dependency 'pry-byebug'
+  s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'simplecov'

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -4,7 +4,7 @@
   add_filter 'lib/omniauth-cognito-idp/version'
 end
 #
-require 'pry-byebug'
+require 'pry'
 require 'omniauth-cognito-idp'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }