otp-jwt 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87c3f2de0234d1da0b76d2e98fdec783cc7d5fb6
-  data.tar.gz: fe6cff9c4f3feb032c7690932dd595cc14b35f05
+  metadata.gz: 5a6047b41e5b59f65c9a0ab0b138798ba611a113
+  data.tar.gz: 5b157ecb5af5abebcd324f3b18698279af02d050
 SHA512:
-  metadata.gz: b913eb0bc73388ea94966599018dc0b41c4b99572125d5cccf542d9f0a8734553b4b84b89ee2e741fa2c7eee456cccb9906cf1c7bcd6eb1f99879df0ebbd6bd8
-  data.tar.gz: ca553bd555eb871ae2312cae64cdfb7243fd7c61a42d075430fe42251c2759b379d4b714c81f07384ccc5ff1ee98a774a44e6dc42e1f05917ec3d124ea7ca3eb
+  metadata.gz: 3c9ee97ec926b861d0599462def570ae799ac65a3f59040725b376359de451817680b1a538759126fe698895157813b15a911738c4976dd801cce5d17aa0a562
+  data.tar.gz: d3fede4d63a6121e34fdcad1b8d3c48cd85088e99bfa94b001cf94895ea6574e66e061db7e442a9b4904eb079c7457cd0398d897eaf0085b0d29b50cb3428655

data/.github/main.workflow

@@ -2,7 +2,8 @@ workflow "Tests" {
   on = "push"
   resolves = [
     "rspec-ruby2.6_rails4",
-    "rspec-ruby2.6_rails5"
+    "rspec-ruby2.6_rails5",
+    "rspec-ruby2.6_rails6"
   ]
 }
 
@@ -10,10 +11,11 @@ action "rspec-ruby2.6_rails4" {
   uses = "docker://ruby:2.6-alpine"
   env = {
     RAILS_VERSION = "~> 4"
+    SQLITE3_VERSION = "~> 1.3.6"
   }
   args = [
     "sh", "-c",
-    "apk add -U git build-base sqlite-dev && rm Gemfile.lock && bundle install && rake"
+    "apk add -U git build-base sqlite-dev && bundle install && rake"
   ]
 }
 
@@ -25,6 +27,18 @@ action "rspec-ruby2.6_rails5" {
   }
   args = [
     "sh", "-c",
-    "apk add -U git build-base sqlite-dev && rm Gemfile.lock && bundle install && rake"
+    "apk add -U git build-base sqlite-dev && bundle install && rake"
+  ]
+}
+
+action "rspec-ruby2.6_rails6" {
+  uses = "docker://ruby:2.6-alpine"
+  needs = ["rspec-ruby2.6_rails5"]
+  env = {
+    RAILS_VERSION = "~> 6.0.0.rc1"
+  }
+  args = [
+    "sh", "-c",
+    "apk add -U git build-base sqlite-dev && bundle install && rake"
   ]
 }

data/.gitignore

@@ -1,2 +1,4 @@
 coverage
 pkg
+*.lock
+tmp

data/Gemfile

@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rails', ENV['RAILS_VERSION']
+gem 'tzinfo-data'

data/lib/otp/jwt/active_record.rb

@@ -14,7 +14,16 @@ module OTP
         # @return [ActiveRecord::Base] model
         def from_jwt(token, claim_name = 'sub')
           OTP::JWT::Token.decode(token) do |payload|
-            self.find_by(id: payload[claim_name])
+            val = payload[claim_name]
+            pk_col = self.column_for_attribute(self.primary_key)
+
+            # Arel casts the values to the primary key type, which means
+            # that an UUID will become an integer...
+            casted_val = self.connection.type_cast(val, pk_col)
+
+            return if casted_val.to_s != val.to_s.strip
+
+            self.find_by(self.primary_key => val)
           end
         end
       end
@@ -24,8 +33,10 @@ module OTP
       # @param claims [Hash] extra claims to be included
       # @return [ActiveRecord::Base] model
       def to_jwt(claims = nil)
-        claims ||= {}
-        OTP::JWT::Token.sign(sub: self.id, **claims)
+        OTP::JWT::Token.sign(
+          sub: self.send(self.class.primary_key),
+          **(claims || {})
+        )
       end
     end
   end

data/lib/otp/jwt/test_helpers.rb

@@ -4,16 +4,23 @@ module OTP
   module JWT
     # Helpers to help you test the [JWT] requests.
     module TestHelpers
+      # Helper provides JSON content type headers
+      #
+      # @return [Hash] the relevant content type &co
+      def json_headers
+        { 'Content-Type': Mime[:json].to_s }
+      end
+
       # Helper to handle authentication requests easier
       #
       # @return [Hash] the authorization headers
       def jwt_auth_header(entity_or_subject)
-        return {} unless entity_or_subject.present?
+        return json_headers unless entity_or_subject.present?
 
         token = entity_or_subject.try(:to_jwt)
         token ||= OTP::JWT::Token.sign(sub: entity_or_subject)
 
-        { 'Authorization': "Bearer #{token}" }
+        { 'Authorization': "Bearer #{token}" }.merge(json_headers)
       end
 
       # Parses and returns a deserialized JSON

data/lib/otp/jwt/version.rb

@@ -1,5 +1,5 @@
 module OTP
   module JWT
-    VERSION = '0.2.3'
+    VERSION = '0.2.4'
   end
 end

data/otp-jwt.gemspec

@@ -31,6 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-rails_config'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'sqlite3', '~> 1.3.6'
+  spec.add_development_dependency 'sqlite3', ENV['SQLITE3_VERSION']
   spec.add_development_dependency 'yardstick'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: otp-jwt
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Stas Suscov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2019-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -168,16 +168,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yardstick
   requirement: !ruby/object:Gem::Requirement
@@ -205,7 +205,6 @@ files:
 - ".rubocop.yml"
 - ".yardstick.yml"
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - lib/otp.rb

data/Gemfile.lock

@@ -1,197 +0,0 @@
-PATH
-  remote: .
-  specs:
-    otp-jwt (0.2.3)
-      activesupport
-      jwt (~> 2.2.0.pre.beta.0)
-      rotp (~> 4.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
-      globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
-      marcel (~> 0.3.1)
-    activesupport (5.2.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    arel (9.0.0)
-    ast (2.4.0)
-    builder (3.2.3)
-    concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    diff-lcs (1.3)
-    docile (1.3.1)
-    erubi (1.8.0)
-    ffaker (2.10.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.6.0)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.2)
-    json (2.2.0)
-    jwt (2.2.0.pre.beta.0)
-    loofah (2.2.3)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mimemagic (0.3.3)
-    mini_mime (1.0.1)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nio4r (2.3.1)
-    nokogiri (1.10.2)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.16.2)
-    parser (2.6.2.0)
-      ast (~> 2.4.0)
-    psych (3.1.0)
-    public_suffix (3.0.3)
-    rack (2.0.6)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
-      bundler (>= 1.3.0)
-      railties (= 5.2.3)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rainbow (3.0.0)
-    rake (12.3.2)
-    rotp (4.1.0)
-      addressable (~> 2.5)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.66.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      psych (>= 3.1.0)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
-    rubocop-performance (1.0.0)
-      rubocop (>= 0.58.0)
-    rubocop-rails_config (0.4.4)
-      railties (>= 3.0)
-      rubocop (~> 0.58)
-    rubocop-rspec (1.32.0)
-      rubocop (>= 0.60.0)
-    ruby-progressbar (1.10.0)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.5.0)
-    websocket-driver (0.7.0)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-    yard (0.9.18)
-    yardstick (0.9.9)
-      yard (~> 0.8, >= 0.8.7.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  ffaker
-  otp-jwt!
-  rails
-  rspec-rails
-  rubocop-performance
-  rubocop-rails_config
-  rubocop-rspec
-  simplecov
-  sqlite3 (~> 1.3.6)
-  yardstick
-
-BUNDLED WITH
-   1.17.3