tinytokenauth-rails 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9b10e6633d4606de4ec2969019871de80021a50126afac2c928abcb69ecf403
-  data.tar.gz: ab5f071a30e1408bc4467dc797607962f1b68d035954287aae753b959b4aa479
+  metadata.gz: 66680bf32b4e6d3afa62c34a808ff3fcd9dcf95dcc5b80fc695930772cd492eb
+  data.tar.gz: ba4a8953327622f5c5f3fc99afd006f55d2aff301a55f84f261956d0821d2c4c
 SHA512:
-  metadata.gz: a90e3dc70c6e8d28265862f23cdb9eb8581f6220fa13ed4d1428118227cefb1131e7e2ed5083666ba8e0d070ae48ef506eb343ab2b40d355c76c8a1d5234df41
-  data.tar.gz: 57be5affdbfbf2b5205077627c59115c1f0bf756ac12df2d3fe82cd89bd37acef5d7e868519ae0ea9f1e39e91336a27d1575e58f8e9b048fceafa5a8b87e7db9
+  metadata.gz: 0ad22f16e163112c36ab7642dd7e2f32911e7fc593c68cf63ae48ca5a7dcbc62fb5becc45459fab0fecbac1d90e3a10d4c5ea7376c5d235949cdbba5c963e458
+  data.tar.gz: 15b53b180f1e071fb8ae9f7c1c8078f1ab822e6757484b36551275514be6149aa057ae65afa78e78e1402c1973e6e989a54a14afc30cc398cc9ac08b309e6020

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tinytokenauth-rails (0.1.7)
+    tinytokenauth-rails (0.1.8)
       jwt (~> 2.7)
       rails (>= 6.0)
 

data/lib/tinytokenauth/authorizable.rb

@@ -19,9 +19,9 @@ module Tinytokenauth
       token = header.split(' ').last if header
 
       begin
-        @decoded = JsonWebToken.decode(token)
-        # @current_user = User.find(@decoded[:user_id])
-        @current_user = Tinytokenauth.configuration.user_class.send 'find', @decoded[:user_id]
+        @decoded = JsonWebToken.decode(Tinytokenauth.configuration.token_secret, token)
+        # @current_user = Tinytokenauth.configuration.user_class.send 'find', @decoded[:user_id]
+        @current_user = User.find @decoded[:user_id]
       rescue ActiveRecord::RecordNotFound => e
         render json: { errors: e.message }, status: :unauthorized
       rescue JWT::DecodeError => e
@@ -29,45 +29,11 @@ module Tinytokenauth
       end
     end
 
-    # def require_current_user(klass = User)
-    #   token = cookies['klap-auth']
-    #   # p "token from cookie: #{token}"
-    #
-    #   begin
-    #     @decoded = JsonWebToken.decode(token)
-    #     # @current_user = User.find(@decoded[:user_id])
-    #     @current_user = klass.send 'find', @decoded[:user_id]
-    #     @exp = @decoded[:exp]
-    #     # if @exp < 24.hours.from_now.to_i # Always refresh token
-    #     if @exp < 4.hours.from_now.to_i # Always refresh token
-    #       sign_in @current_user
-    #     end
-    #   rescue ActiveRecord::RecordNotFound => e
-    #     # TODO: evaluate if we should always forward
-    #     redirect_to new_session_path(forward_to: request.path), notice: "Please sign in again" #, status: :unauthorized
-    #   rescue JWT::DecodeError => e
-    #     # TODO: evaluate if we should always forward
-    #     # render json: { errors: e.message }, status: :unauthorized
-    #     redirect_to new_session_path(forward_to: request.path), notice: "Please sign in again" #, status: :unauthorized
-    #   end
-    # end
-
-    # def require_current_user2(klass = User, &block)
-    #   current_user = set_current_user(klass)
-    #   if block_given? && current_user.nil?
-    #     block.call
-    #   else
-    #     raise MissingArgumentError
-    #   end
-    # end
-
     def require_current_user(&block)
       token = cookies[Tinytokenauth.configuration.cookie_name]
-      # p "token from cookie: #{token}"
       begin
-        @decoded = JsonWebToken.decode(token)
-        # @current_user = User.find(@decoded[:user_id])
-        @current_user = Tinytokenauth.configuration.user_class.send 'find', @decoded[:user_id]
+        @decoded = JsonWebToken.decode(Tinytokenauth.configuration.token_secret, token)
+        @current_user = User.find @decoded[:user_id]
         @exp = @decoded[:exp]
         if Tinytokenauth.configuration.token_auto_renew_hours &&
           @exp < Tinytokenauth.configuration.token_auto_renew_hours.hours.from_now.to_i
@@ -82,27 +48,6 @@ module Tinytokenauth
       end
     end
 
-    # def set_current_user(klass = User)
-    #   token = cookies[Authorizable.configuration.cookie_name]
-    #   begin
-    #     @decoded = JsonWebToken.decode(token)
-    #     # @current_user = User.find(@decoded[:user_id])
-    #     @current_user = klass.send 'find', @decoded[:user_id]
-    #     @exp = @decoded[:exp]
-    #     # if @exp < 24.hours.from_now.to_i # Always refresh token
-    #     if @exp < 4.hours.from_now.to_i # Always refresh token
-    #       # token = JsonWebToken.encode(user_id: @current_user.id)
-    #       # cookies['klap-auth'] = token
-    #       sign_in @current_user
-    #     end
-    #   rescue ActiveRecord::RecordNotFound
-    #     # Ignored
-    #   rescue JWT::DecodeError
-    #     # Ignored
-    #   end
-    #   @current_user
-    # end
-
     def set_current_user
       begin
         require_current_user
@@ -116,9 +61,9 @@ module Tinytokenauth
 
     def sign_in(user)
       @current_user = user
-      jwt = JsonWebToken.encode(user_id: user.id,
-                                exp: Tinytokenauth.configuration.token_validity_hours.hours.from_now,
-                                secret: Tinytokenauth.configuration.token_secret)
+      jwt = JsonWebToken.encode(Tinytokenauth.configuration.token_validity_hours.hours.from_now,
+                                Tinytokenauth.configuration.token_secret,
+                                user_id: user.id,)
       cookies[Tinytokenauth.configuration.cookie_name] = jwt
     end
 

data/lib/tinytokenauth/json_web_token.rb

@@ -2,19 +2,12 @@ require 'jwt'
 
 module Tinytokenauth
   class JsonWebToken
-    # def self.encode(payload, exp = 24.hours.from_now, secret = Rails.application.credentials.secret_key_base)
-    def self.encode(payload, options = {})
-      exp = options[:exp]
-      secret = options[:secret]
-      puts exp
-      puts exp.to_i
-      puts payload
+    def self.encode(exp, secret, payload)
       payload[:exp] = exp.to_i
       JWT.encode(payload, secret)
     end
 
-    def self.decode(token, options = {})
-      secret = options[:secret]
+    def self.decode(secret, token)
       decoded = JWT.decode(token, secret)[0]
       HashWithIndifferentAccess.new decoded
     end

data/lib/tinytokenauth/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tinytokenauth
-  VERSION = "0.1.7"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tinytokenauth-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Kim Laplume