apiphobic-tokens 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4030c1789098ddaa92ba453c07fad65e895e9abcebe7c2ef6087c8ec0f7f3f47
-  data.tar.gz: 72f570aaaf61e7d2f80f272a9988b415bc2b6837f267c0925d21185934d5ab0e
+  metadata.gz: ae8a5780d2cdb2f8b53a9f2cbafb3a6babe879f1f95427c7864dbbe9f55ffdcd
+  data.tar.gz: 34234f4f2b5f5aa5d5c5d5ee7bb8e33521d19e47a0c72e106dbad0daf9ba61bf
 SHA512:
-  metadata.gz: 210c77fa2424697f7773975a346e386833598456f17a3583c4939da775ec9468dbf45d5d5b5cef5b702420b7870ee39e961666b6391152ab45e981ac7d414980
-  data.tar.gz: 9e1551a52affe49184c314a5c5e07bb2a4df22f2063b4bdefe4986b52e28e9ce7abf446177d7a8a4aa60d76e7727041ea37efdd9dcd9bda30d238031e753426e
+  metadata.gz: 8cf66ae1fc76c0ee1aa654d2a0b0ef0fbc24a5012d265bed9f1d713bf79f8875706cfd264ba746d6009816d659c626edd7d47d5a5a740bdd6371258fbff5baf8
+  data.tar.gz: e3375f866acf219df3ded1404d92fc3c7d656fbb6db0f66f71b134473725d0170328c5b0210f5dd19392fe7d6d3179039f65a2251dc17e574d6ce88efbbe56b6

data/lib/apiphobic/tokens/configuration.rb

@@ -39,7 +39,7 @@ module  Tokens
     end
 
     def default_audience
-      @default_audience || 'public'
+      @default_audience || 'User'
     end
 
     def default_availability_leeway_in_seconds
@@ -63,7 +63,7 @@ module  Tokens
     end
 
     def default_subject
-      @default_subject || 'User'
+      @default_subject || nil
     end
 
     def private_key

data/lib/apiphobic/tokens/json_web_token.rb

@@ -50,28 +50,26 @@ class   JsonWebToken
   # rubocop:disable Metrics/ParameterLists, Metrics/LineLength
   def self.build(id:                SecureRandom.uuid,
                  audience:          configuration.default_audience,
+                 audience_id:,
                  expiration:        Time.now.utc.to_i + (60 * configuration.default_expiration_in_minutes),
                  issuer:            configuration.default_issuer,
                  issued_at:         Time.now.utc,
                  not_before:        Time.now.utc,
-                 owner:             nil,
                  roles:             configuration.default_roles,
                  subject:           configuration.default_subject,
-                 subject_id:,
+                 subject_id:        nil,
                  token_private_key: configuration.private_key)
 
-    owner ||= subject_id
-
     new(
       private_key: token_private_key,
       data:        {
+        'aid' => audience_id,
         'aud' => audience,
         'exp' => expiration.to_i,
         'iat' => issued_at.to_i,
         'iss' => issuer,
         'jti' => id,
         'nbf' => not_before.to_i,
-        'own' => owner,
         'rol' => roles.join(','),
         'sid' => subject_id,
         'sub' => subject,
@@ -151,6 +149,10 @@ class   JsonWebToken
     data['aud']
   end
 
+  def audience_id
+    data['aid']
+  end
+
   def issued_at
     data['iat']
   end
@@ -179,10 +181,6 @@ class   JsonWebToken
     Time.at(not_before)
   end
 
-  def owner_id
-    data['own']
-  end
-
   def subject_id
     data['sid']
   end

data/lib/apiphobic/tokens/json_web_tokens/null.rb

@@ -15,6 +15,10 @@ class   Null < Tokens::Null
     nil
   end
 
+  def audience_id
+    nil
+  end
+
   def issued_at
     nil
   end
@@ -35,10 +39,6 @@ class   Null < Tokens::Null
     nil
   end
 
-  def owner_id
-    nil
-  end
-
   def subject_id
     nil
   end

data/lib/apiphobic/tokens/json_web_tokens/object.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'apiphobic/tokens/json_web_token'
+
+module  Apiphobic
+module  Tokens
+module  JsonWebTokens
+class   Object < JsonWebToken
+  def self.build(object:,
+                 expiration: Time.now.utc.to_i + (60 * 60 * 24 * 7),
+                 **attrs)
+
+    super(subject:    object.class.name,
+          subject_id: object.id,
+          expiration: expiration,
+          **attrs)
+  end
+end
+end
+end
+end

data/lib/apiphobic/tokens/json_web_tokens/password_reset.rb

@@ -8,9 +8,10 @@ module  JsonWebTokens
 class   PasswordReset < JsonWebToken
   def self.build(expiration: Time.now.utc.to_i + (30 * 60),
                  roles:      %w{password_reset},
+                 subject:    'Password',
                  **attrs)
 
-    super(expiration: expiration, roles: roles, **attrs)
+    super(expiration: expiration, roles: roles, subject: subject, **attrs)
   end
 end
 end

data/lib/apiphobic/tokens/version.rb

@@ -2,6 +2,6 @@
 
 module Apiphobic
 module Tokens
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apiphobic-tokens
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - thegranddesign
@@ -31,7 +31,7 @@ cert_chain:
   Y2GAoHKstmfIVhc4XHOPpmTd2o/C29O9oaRgjrkfQEhF/KvJ/PhoV5hvokzsCyI5
   iUeXPfvrGD/itYIBCgk+fnzyQQ4QtE5hTQaWQ3o2
   -----END CERTIFICATE-----
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-jwt
@@ -126,6 +126,7 @@ files:
 - lib/apiphobic/tokens/json_web_token.rb
 - lib/apiphobic/tokens/json_web_tokens/invalid.rb
 - lib/apiphobic/tokens/json_web_tokens/null.rb
+- lib/apiphobic/tokens/json_web_tokens/object.rb
 - lib/apiphobic/tokens/json_web_tokens/password_reset.rb
 - lib/apiphobic/tokens/null.rb
 - lib/apiphobic/tokens/role_predicable.rb