real_savvy 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1952776f35bc650b82d5f3686ebdf1f2d959b68
-  data.tar.gz: 2fe7b245b44ddb8f93620fd3a098b02d76bfa592
+  metadata.gz: a089cce034187b8f9c6592b50b73e0ff2bcb4416
+  data.tar.gz: d98f257df54ca0c40f9565e9b8be9fa3958b0c4a
 SHA512:
-  metadata.gz: 8e2bbbd513d79ecf979a5ac45f3c3d94ac2f4134eda5aee5d70e6336a4b2d227131f8f87b3b8acff1e6ded6717c69a124682b2408ddc5f7c1b47dc8d551b912a
-  data.tar.gz: f66a2d8060897f3b7cb2ba7b7c7e81b337c6a02250890fc8ff5f96a1d418674e6cc1ad271d30874c3bab2fedb005824410a08fcb1a1ea7dc3b47368eda17c9ba
+  metadata.gz: 704bb7a5810c7e0b3f42f82c106c4f32a907f7cc2797cdc192382cf1d072c49ecd8ad6d8c9034ac34a9fd23eb2c2701395d79b8b08a73f091cfa72e0247bc1a9
+  data.tar.gz: 1a24892e521670cc0ba0727fbdb90b9614fd6caad1711b366140eb13bff864e0166647f22ac2f98b6f272c9ce9567ae29c6a97d4a26efddf0a0cfc0fbc4d71ee

data/lib/real_savvy/jwt/abstract_token.rb

@@ -4,21 +4,18 @@ module RealSavvy
       # In order of access level
       SCOPE_VERBS = %w{public read write admin}.freeze
 
-      attr_reader :scopes, :user, :site, :token, :header, :claims
+      attr_reader :token
 
       def initialize(token)
         @token = token
         standardized_token
-        retrieve_claims
-        retrieve_scopes
-        retrieve_audience
-        retrieve_site
-        retrieve_subject
-        retrieve_user
       end
 
+      # New token, plus makes sure there isn't any errors with the token
       def self.decode(token)
-        new(token)
+        new(token).tap do |new_token|
+          new_token.valid?
+        end
       end
 
       def scope_includes?(*scope_parts)
@@ -90,6 +87,7 @@ module RealSavvy
       end
 
       def imposter?
+        user
         @imposter ? true : false
       end
 
@@ -97,43 +95,53 @@ module RealSavvy
         @token.split('.')[1]
       end
 
-      private
+      def claims
+        retrieve_claims unless @claims
+        @claims
+      end
 
-      attr_reader :audience, :subject
+      def header
+        retrieve_claims unless @header
+        @header
+      end
 
-      def retrieve_claims
-        raise NotImplementedError, "subclass did not define #retrieve_claims"
+      def site
+        audience
       end
 
-      def retrieve_audience
-        @audience = ::RealSavvy::JWT::Config.retrieve_audience(self) if claims && claims['aud']
+      def user
+        @user ||= begin
+                    if subject_is_user?
+                      subject
+                    elsif subject_is_imposter?
+                      @imposter = true
+                      subject.user
+                    end
+                  end
       end
 
-      def retrieve_subject
-        @subject = ::RealSavvy::JWT::Config.retrieve_subject(self) if claims && claims['sub']
+      def scopes
+        @scopes ||= raw_scopes.each_with_object({}) do |scope, result|
+          scope.split(':').inject(result) { |m, v| m[v] ||= {} }
+        end
       end
 
-      def retrieve_site
-        @site = audience
+      private
+
+      def retrieve_claims
+        raise NotImplementedError, "subclass did not define #retrieve_claims"
       end
 
-      def retrieve_user
-        if subject_is_user?
-          @user = subject
-        elsif subject_is_imposter?
-          @user = subject.user
-          @imposter = true
-        end
+      def audience
+        @audience ||= ::RealSavvy::JWT::Config.retrieve_audience(self) if claims && claims['aud']
       end
 
-      def raw_scopes
-        claims&.fetch('scopes', nil).to_a
+      def subject
+        @subject ||= ::RealSavvy::JWT::Config.retrieve_subject(self) if claims && claims['sub']
       end
 
-      def retrieve_scopes
-        @scopes = raw_scopes.each_with_object({}) do |scope, result|
-          scope.split(':').inject(result) { |m, v| m[v] ||= {} }
-        end
+      def raw_scopes
+        claims&.fetch('scopes', nil).to_a
       end
 
       def standardized_token

data/lib/real_savvy/jwt/config.rb

@@ -5,6 +5,7 @@ module RealSavvy
         if block_given?
           @public_key = Proc.new
         else
+          raise NotImplementedError, "public_key not provided" unless @public_key
           result = @public_key.is_a?(Proc) ? @public_key.call : @public_key
           result.is_a?(OpenSSL::PKey::RSA) ? result : OpenSSL::PKey::RSA.new(result)
         end
@@ -14,11 +15,12 @@ module RealSavvy
         @public_key = value
       end
 
-      def self.retrieve_audience claims = nil
+      def self.retrieve_audience token = nil
         if block_given?
           @retrieve_audience = Proc.new
         else
-          @retrieve_audience.call(claims)
+          raise NotImplementedError, "retrieve_audience logic not implemeted" unless @retrieve_audience
+          @retrieve_audience.call(token)
         end
       end
 
@@ -26,11 +28,12 @@ module RealSavvy
         @retrieve_audience = value
       end
 
-      def self.retrieve_subject claims = nil
+      def self.retrieve_subject token = nil
         if block_given?
           @retrieve_subject = Proc.new
         else
-          @retrieve_subject.call(claims)
+          raise NotImplementedError, "retrieve_subject logic not implemeted" unless @retrieve_subject
+          @retrieve_subject.call(token)
         end
       end
 
@@ -42,6 +45,7 @@ module RealSavvy
         if block_given?
           @validate_token = Proc.new
         else
+          raise NotImplementedError, "validate_token logic not implemeted" unless @validate_token
           @validate_token.call(token)
         end
       end

data/lib/real_savvy/version.rb

@@ -1,3 +1,3 @@
 module RealSavvy
-  VERSION = [0,0,9]
+  VERSION = [0,0,10]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: real_savvy
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Ryan Rauh