apiphobic-tokens 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4030c1789098ddaa92ba453c07fad65e895e9abcebe7c2ef6087c8ec0f7f3f47
-  data.tar.gz: 72f570aaaf61e7d2f80f272a9988b415bc2b6837f267c0925d21185934d5ab0e
+  metadata.gz: cfdcea174929f4bc35d14489cc907975cc52b7bdadde0685d149fe170bcef040
+  data.tar.gz: d9ef964a93b454acb6924d778e77c43b3aa863fdb3e4c99dbc634f85262f01a3
 SHA512:
-  metadata.gz: 210c77fa2424697f7773975a346e386833598456f17a3583c4939da775ec9468dbf45d5d5b5cef5b702420b7870ee39e961666b6391152ab45e981ac7d414980
-  data.tar.gz: 9e1551a52affe49184c314a5c5e07bb2a4df22f2063b4bdefe4986b52e28e9ce7abf446177d7a8a4aa60d76e7727041ea37efdd9dcd9bda30d238031e753426e
+  metadata.gz: 1d2dfabbb167d21ed16940580db4b6c25ce0d97b96bd80ae9be9dc3b9fd908ac47468f8510ddb6a4784319ebe953164a43088e030a2293e9d71223cdf37472c5
+  data.tar.gz: 07b4557ae1ee5fdd39ee0ead41ac95eb63222d2c14a78fd00029308d3e08f5f736a98ed24f10b750169735e1482a6e7582e3712d91014d59e828129c4c8a1fca

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2016 The Kompanee, Ltd
+Copyright (c) 2010-2019 The Kompanee, Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/apiphobic/errors/invalid_attribute.rb

@@ -10,7 +10,7 @@ class   InvalidAttribute < ::Erratum::Errors::InvalidToken
                 :additional_message
 
   def title
-    'Invalid Issuance'
+    'Invalid Attribute'
   end
 
   def detail

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

@@ -10,7 +10,6 @@ require 'apiphobic/tokens/configurable'
 require 'apiphobic/tokens/json_web_tokens/null'
 require 'apiphobic/tokens/role_predicable'
 
-# rubocop:disable Metrics/ClassLength
 module  Apiphobic
 module  Tokens
 class   JsonWebToken
@@ -47,38 +46,36 @@ class   JsonWebToken
     new(data: data, headers: headers)
   end
 
-  # rubocop:disable Metrics/ParameterLists, Metrics/LineLength
-  def self.build(id:                SecureRandom.uuid,
+  # rubocop:disable Metrics/ParameterLists
+  def self.build(audience_id:,
+                 id:                SecureRandom.uuid,
                  audience:          configuration.default_audience,
-                 expiration:        Time.now.utc.to_i + (60 * configuration.default_expiration_in_minutes),
+                 expiration:        Time.now.utc.to_i + (60 * configuration.default_expiration_in_minutes), # rubocop:disable Layout/LineLength
                  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,
       },
     )
   end
-  # rubocop:enable Metrics/ParameterLists, Metrics/LineLength
+  # rubocop:enable Metrics/ParameterLists
 
   def available?
     not_before <= (Time.now.to_i + configuration.default_availability_leeway_in_seconds)
@@ -116,7 +113,7 @@ class   JsonWebToken
   end
 
   def valid_id?
-    id =~ /[a-f0-9]{8}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{12}/i
+    id =~ /[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}/i
   end
 
   def valid_issuer?
@@ -151,6 +148,10 @@ class   JsonWebToken
     data['aud']
   end
 
+  def audience_id
+    data['aid']
+  end
+
   def issued_at
     data['iat']
   end
@@ -179,10 +180,6 @@ class   JsonWebToken
     Time.at(not_before)
   end
 
-  def owner_id
-    data['own']
-  end
-
   def subject_id
     data['sid']
   end
@@ -325,4 +322,3 @@ class   JsonWebToken
 end
 end
 end
-# rubocop:enable Metrics/ClassLength

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/role_predicable.rb

@@ -5,7 +5,7 @@ module  Tokens
 module  RolePredicable
   def method_missing(name, *args)
     if role_predicates.include?(name)
-      roles.map(&:to_s).include?(name.to_s.gsub(/\?\z/, ''))
+      roles.map(&:to_s).include?(name.to_s.delete_suffix('?'))
     else
       super
     end

data/lib/apiphobic/tokens/version.rb

@@ -2,6 +2,6 @@
 
 module Apiphobic
 module Tokens
-  VERSION = '1.0.1'
+  VERSION = '1.2.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.2.0
 platform: ruby
 authors:
 - thegranddesign
@@ -10,28 +10,34 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDqjCCApKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBNMREwDwYDVQQDDAhydWJ5
-  Z2VtczEjMCEGCgmSJomT8ixkARkWE2xpdmluZ2hpZ2hvbnRoZWJsb2cxEzARBgoJ
-  kiaJk/IsZAEZFgNjb20wHhcNMTcwODAyMjI1OTM1WhcNMTgwODAyMjI1OTM1WjBN
-  MREwDwYDVQQDDAhydWJ5Z2VtczEjMCEGCgmSJomT8ixkARkWE2xpdmluZ2hpZ2hv
-  bnRoZWJsb2cxEzARBgoJkiaJk/IsZAEZFgNjb20wggEiMA0GCSqGSIb3DQEBAQUA
-  A4IBDwAwggEKAoIBAQDtLa7+7p49gW15OgOyRZad/F92iZcMdDjZ2kAxZlviXgVe
-  PCtjfdURobH+YMdt++6eRkE25utIFqHyN51Shxfdc21T3fPQe/ZEoMyiJK4tYzbh
-  7VjNJG4ldvKKpS1p7iVz9imnyTxNwb0JaIOsOFCA04T0u6aCQi2acNvAPLviXk0q
-  xJ/CKjI4QUTZKVrBt8Q1Egrp2yzmEnSNftDuTbBb8m4vDR+w325CwbKCgycHJ1/g
-  YZ3FO76TzJuRVbsYS/bU5XKHVEpkeFmWBqEXsk4DuUIWLa6WZEJcoZf+YP+1pycG
-  7YqSbydpINtEdopD+EEI+g+zNJ4nSI8/eQcQyEjBAgMBAAGjgZQwgZEwCQYDVR0T
-  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFDWuVrg4ve0vLu71kqiGdyBnzJGV
-  MCsGA1UdEQQkMCKBIHJ1YnlnZW1zQGxpdmluZ2hpZ2hvbnRoZWJsb2cuY29tMCsG
-  A1UdEgQkMCKBIHJ1YnlnZW1zQGxpdmluZ2hpZ2hvbnRoZWJsb2cuY29tMA0GCSqG
-  SIb3DQEBBQUAA4IBAQDJIpHjbBPGiaY4wOHcXlltQ+BMmhWQNh+1fZtyajQd+7Ay
-  fv23mO7Mf25Q38gopQlpaODkfxq54Jt8FvQbr5RYRS4j+JEKb75NgrAtehd8USUd
-  CiJJGH+yvGNWug9IGZCGX91HIbTsLQ5IUUWQasC5jGP8nxXufUr9xgAJZZenewny
-  B2qKu8q1A/kj6cw62RCY7yBmUXxlcJBj8g+JKYAFbYYKUdQSzf50k9IiWLWunJM+
-  Y2GAoHKstmfIVhc4XHOPpmTd2o/C29O9oaRgjrkfQEhF/KvJ/PhoV5hvokzsCyI5
-  iUeXPfvrGD/itYIBCgk+fnzyQQ4QtE5hTQaWQ3o2
+  MIIEyjCCAzKgAwIBAgIBATANBgkqhkiG9w0BAQsFADBVMSIwIAYDVQQDDBlsb2Nh
+  bGV1bmtub3duODEwX3J1YnlnZW1zMRowGAYKCZImiZPyLGQBGRYKcHJvdG9ubWFp
+  bDETMBEGCgmSJomT8ixkARkWA2NvbTAeFw0yMjA3MDkwNTMxMjJaFw0yMzA3MDkw
+  NTMxMjJaMFUxIjAgBgNVBAMMGWxvY2FsZXVua25vd244MTBfcnVieWdlbXMxGjAY
+  BgoJkiaJk/IsZAEZFgpwcm90b25tYWlsMRMwEQYKCZImiZPyLGQBGRYDY29tMIIB
+  ojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0otlhSPyU7jLLW1p786Mo/pV
+  5cJ1Ed8D/bJK78PqGFO2h0ZUefupxT5PRMokLYNNGRPopnAAxZ0zVxJ68aOyYCBW
+  Wk3/XFcXCrtk/OcFwLTltgeMjyqCBd/zRRx6CCjY4uOfH0E3n1gQ6Fbmewjg83XJ
+  nOs7Gu/hzj5+feEQ1Exmg6z1oCM/8BTIBtK+p++HvcDK3AhJ7x3fc6P9WS+22w6j
+  7jpi3p9YtoAjrXIzw3lsobiX+bEt+N+T47e8gOATVgapuZ/QmJzNU6LWepehs4V1
+  8J+FUaIMV7nAMKmpkbYL51uHEiGV+HDx1HUdOsCFx8zD4h49KRT2t6AcumJ5P1Cj
+  c7NX2xl85ShHDNNFkozuC2c5cwj6F20EVaVjGwv2OFq0S2tUw9EJXHTN9RpfRUmn
+  IHwS9M4gcJO7IzV39a1YL6+9hrabF4+JTSYDehq8oxTdcOPLYyvH54aJWVqCrnLO
+  KNa/p6hMmwxTWNS5Vz0uxuEGyE9E0tHbtjIs2XX5AgMBAAGjgaQwgaEwCQYDVR0T
+  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFAK3RicwO0f6+puFN6lRVMOKMJuu
+  MDMGA1UdEQQsMCqBKGxvY2FsZXVua25vd244MTArcnVieWdlbXNAcHJvdG9ubWFp
+  bC5jb20wMwYDVR0SBCwwKoEobG9jYWxldW5rbm93bjgxMCtydWJ5Z2Vtc0Bwcm90
+  b25tYWlsLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAQwV6pOp5gm8141pyXeQFI/5E
+  rZYO3MvdyZM8O3HMD51LDS8mtMURceaKZM6WTambe2RVX4A++0qUiEnn9K4Fexm/
+  SEGaC/Gp+Fg9D1SKfkdq9bgdIhOEUwiGqjczgzNC806AtWZ+awI940oydFYZlpo0
+  jMQihPPJEqF1U6JBDMZYV5tX/dJYSGRl9L3s1k2tjoN98q+beNaZQDn21Amml4eK
+  KEkMeTTJ2E4GVzR9eKEETLq2LygdUWWZ5NdWOYTxJMdg1GZp3b6X8hJrwfOiizqt
+  /ANlIEh11/pOnWa6WPUVpGIMpYdquvmJXnF2LX6zxkKK1hbrebt+vAEAGczgw1Ri
+  rkLM6y+BHQdkOTj3VG4MjIU8D4h1Z73Exzxds/VbVKMEz+8JrFjGJ/tYa0PZ8U5p
+  3yXL4G6eW3rdBW/OiLF7GgG2o26d02OMzf4+ubUVS5LQDOcd4vgNPLWzJSBt1YIh
+  TgBsED7Me5YdMVXxtTWYsF1VMzaL9hReD3UXGcxe
   -----END CERTIFICATE-----
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2022-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-jwt
@@ -53,28 +59,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: rspeckled
   requirement: !ruby/object:Gem::Requirement
@@ -126,15 +132,22 @@ 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
 - lib/apiphobic/tokens/version.rb
-homepage: ''
+homepage: https://github.com/thekompanee/apiphobic-tokens
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
+  bug_tracker_uri: https://github.com/thekompanee/apiphobic-tokens/issues
+  changelog_uri: https://github.com/thekompanee/apiphobic-tokens/blob/master/CHANGELOG.md
+  documentation_uri: https://github.com/thekompanee/apiphobic-tokens/tree/releases/v1.2.0
+  homepage_uri: https://github.com/thekompanee/apiphobic-tokens
+  source_code_uri: https://github.com/thekompanee/apiphobic-tokens
+  wiki_uri: https://github.com/thekompanee/apiphobic-tokens/wiki
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -150,8 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: API Tokens