octopus_auth 0.1.0.rc3 → 0.1.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 826544084e17baa43f7f6cf1b7d372a82f702b900758079e6b1f27bdf9c4a557
-  data.tar.gz: df7bc4b566621e579c0c1788d653fa0f2baee984d9db3cef98c01a65eb2d97ce
+  metadata.gz: dea163ab3acbfb9fb64c8dea4596562e14d3ac465ce3c3ba8c9c13c42f186473
+  data.tar.gz: 30bf9a7272d92c5b81cffa2b28776f81e16a33e9a1ed59c57dad50df7d0ff175
 SHA512:
-  metadata.gz: ef1cb35e874555d690eabcc44610c181153bdc50e9338fafbb05d5331873774c2436c912366af0b7d15b71df24d38d9e6f7d1b4730ce21df2850245684227cd0
-  data.tar.gz: f124b4c7e3de3566ea9bd5a67f8bc26022bb4bb20eea9b57a10f878ae983d1524f359fc3344d73b8bd6f813fb542519e3790b5a2512d32218f7607105ad771bc
+  metadata.gz: 5b69d6cda506b681ba86863a2fec17ca366b6d7abe61c21b321e447b7b1e8f006b3bb8577fffe9132246d77a5fc1f947c344367c26a403909a12c3e2ab08b047
+  data.tar.gz: 2840c1bed3397ba04f85e89ce712109a161c6d0fb86fc6c0ec97eaf7ccd7fccd8c58c6717862002ef165263790442d6c251ef66c7e5d0c3609c47ea1adfec4c4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    octopus_auth (0.1.0.rc3)
+    octopus_auth (0.1.0.rc4)
       activerecord (>= 3.0.0)
 
 GEM

data/README.md

@@ -51,6 +51,7 @@ Currently, model class `AccessToken` must be an ActiveRecord sub class. with att
 :issued_at,
 :active,
 :expires_at,
+:expired_at,
 :scope,
 :owner_id,
 :owner_type,

data/lib/octopus_auth/authenticator.rb

@@ -9,8 +9,7 @@ module OctopusAuth
       return false if @token.empty?
 
       access_token = OctopusAuth.configuration.model_class.find_by(token: @token)
-      return false unless access_token && access_token.active?
-      return false if access_token.scope.to_sym != @scope
+      return false unless access_token && valid?(access_token)
 
       if access_token.expires_at.utc < Time.now.utc
         unless OctopusAuth.configuration.model_readonly
@@ -25,6 +24,12 @@ module OctopusAuth
 
     private
 
+    def valid?(access_token)
+      access_token.active? &&
+        !access_token.expired_at &&
+        access_token.scope.to_sym == @scope
+    end
+
     ResultObject = Struct.new(:token, :owner_id, :owner_type, :scope)
     def build_success_result(access_token)
       ResultObject.new(access_token.token,

data/lib/octopus_auth/decorators.rb

@@ -7,6 +7,7 @@ module OctopusAuth
       :issued_at, #        Keep here just for compatible reason, use `issued_at` instead
       :active,
       :expires_at,
+      :expired_at,
       :scope,
       :owner_id,
       :owner_type,

data/lib/octopus_auth/version.rb

@@ -1,3 +1,3 @@
 module OctopusAuth
-  VERSION = "0.1.0.rc3"
+  VERSION = "0.1.0.rc4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopus_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc3
+  version: 0.1.0.rc4
 platform: ruby
 authors:
 - TINYpulse Devops