tinytokenauth-rails 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a51cd8dbe7faddbd28aa43eab713a841bb3ea8b629d4753c949e522e09627048
-  data.tar.gz: 35168279b0cb122da90c5a56502adb804e15f3f05b5bfe96a2a238dd7179ca53
+  metadata.gz: 16db7cdd60c7295a08eb0ca07fbcc229289cff1a0f867d5147c98fd1c10929e7
+  data.tar.gz: 483600dc44ab04a814b04f21ef9cf0fe24b09908327d46c6a29b12a5f480bc78
 SHA512:
-  metadata.gz: '08f62d165b73b1b0e0e9517643b143e708e40600dfdf7bdbbbb1fe4cb6daa02d53c808bac82c5feaef1d3d8a71831ffbbac55f9c08ef0ba80f9e6a6161ae29b2'
-  data.tar.gz: 5cb15b86e8d527860b646155a49f7dc318346f6d96a3a91876c53e6fdf5b9d18b8275661e96aceef537cc01943b868e6837089f325351efd4446fa760cd8212a
+  metadata.gz: 482c5de56d33c9135b2ee74b1a7fa0bc1d5aa43386d9a6ef6dc30acfaed128ad3ef4dc6274e17f6dda82a8370f22bca64566da6d8f62efb3c91c94003695c8d8
+  data.tar.gz: a7e8813692d44a322b74e37b5562f5e6a9228d1a82b2ec724cef16004615b29856e385029a9d3c7ba05614b71fb0a51b9e1939825a7807aa6ac59b56b3875715

data/Gemfile.lock

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

data/lib/tinytokenauth/authorizable.rb

@@ -1,15 +1,17 @@
 module Tinytokenauth
 
-  module Authorizable
-    class << self
-      def configuration
-        @configuration ||= Configuration.new
-      end
+  class << self
+    def configuration
+      @configuration ||= Configuration.new
+    end
 
-      def configure
-        yield(configuration)
-      end
+    def configure
+      yield(configuration)
     end
+  end
+
+  module Authorizable
+
 
     def authorize_with_header
       token = ''
@@ -17,9 +19,8 @@ module Tinytokenauth
       token = header.split(' ').last if header
 
       begin
-        @decoded = JsonWebToken.decode(token)
-        # @current_user = User.find(@decoded[:user_id])
-        @current_user = Authorizable.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]
       rescue ActiveRecord::RecordNotFound => e
         render json: { errors: e.message }, status: :unauthorized
       rescue JWT::DecodeError => e
@@ -27,48 +28,14 @@ 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[Authorizable.configuration.cookie_name]
-      # p "token from cookie: #{token}"
+      token = cookies[Tinytokenauth.configuration.cookie_name]
       begin
-        @decoded = JsonWebToken.decode(token)
-        # @current_user = User.find(@decoded[:user_id])
-        @current_user = Authorizable.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]
         @exp = @decoded[:exp]
-        if Authorizable.configuration.token_auto_renew_hours &&
-          @exp < Authorizable.configuration.token_auto_renew_hours.hours.from_now.to_i
+        if Tinytokenauth.configuration.token_auto_renew_hours &&
+          @exp < Tinytokenauth.configuration.token_auto_renew_hours.hours.from_now.to_i
           sign_in @current_user
         end
       rescue ActiveRecord::RecordNotFound, JWT::DecodeError => e
@@ -80,27 +47,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
@@ -114,10 +60,10 @@ module Tinytokenauth
 
     def sign_in(user)
       @current_user = user
-      jwt = JsonWebToken.encode(user_id: user.id,
-                                exp: Authorizable.configuration.token_validity_hours.hours.from_now,
-                                secret: Authorizable.configuration.token_secret)
-      cookies[Authorizable.configuration.cookie_name] = jwt
+      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
 
     def current_user

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.6"
+  VERSION = "0.1.8"
 end

metadata

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