tinytokenauth-rails 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56710adbeea3a54def8b6280ba56d760316061457d30c6c76938068d855b2f86
-  data.tar.gz: 578dd2d02f006c3d8e0ab4b016c77e434eb22c82910d00097238c021aff6c23d
+  metadata.gz: 62e5b134761c6b6009408bf044d89af8f97a343a35edb30871c98479568a0cc2
+  data.tar.gz: 88891f8ee0df8a324869ea9e3a429f76a35bde3f073cef8aa93f51013a0203b6
 SHA512:
-  metadata.gz: 7895965842d6a660960f1c12bb9b73aaaf0b3d1f48e354e48aa0d5d26905e5c50b429ac56e0388df36bc36390596c0c436f9b058f86bb7a062f79763f7fe004c
-  data.tar.gz: e46643638fec5fd36587be45754a75ceeb4af27bc8f7b2ffece2e461c1095ce4db115a4e6af0ec219e7133fecddd79b4ba2e78e71e4f7a453a2965e5b3c187b0
+  metadata.gz: 00e6b497c92575be98be6122612cc01d61c9804d1c940c94785e3295cd77fa16902df4bb3014f92622e2ac72c5384512c24248a881d9172bd5252db5456ad5f4
+  data.tar.gz: 5af3702edf28bd7b5115a6bbc178239ccda067ab8ff7635039c2385baee4cd28333fe144a65b86316864c94239fd43322dce4a984feb512c480a7594f3d854e4

data/Gemfile.lock

@@ -1,26 +1,154 @@
 PATH
   remote: .
   specs:
-    tinytokenauth-rails (0.1.0)
+    tinytokenauth-rails (0.1.1)
       bcrypt (~> 3.1)
       jwt (~> 2.7)
+      rails (>= 6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    actioncable (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      actionview (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.0)
+    actionpack (7.0.4.3)
+      actionview (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      rack (~> 2.0, >= 2.2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.0.4.3)
+      activesupport (= 7.0.4.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (7.0.4.3)
+      activesupport (= 7.0.4.3)
+      globalid (>= 0.3.6)
+    activemodel (7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activerecord (7.0.4.3)
+      activemodel (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activestorage (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.4.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
     ast (2.4.2)
     base64 (0.1.1)
     bcrypt (3.1.19)
+    builder (3.2.4)
+    concurrent-ruby (1.2.2)
+    crass (1.0.6)
+    date (3.3.3)
     diff-lcs (1.5.0)
+    erubi (1.12.0)
+    globalid (1.1.0)
+      activesupport (>= 5.0)
+    i18n (1.13.0)
+      concurrent-ruby (~> 1.0)
     json (2.6.3)
     jwt (2.7.1)
     language_server-protocol (3.17.0.3)
     lint_roller (1.1.0)
+    loofah (2.21.2)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.2)
+    method_source (1.0.0)
+    mini_mime (1.1.2)
+    minitest (5.18.0)
+    net-imap (0.3.4)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nio4r (2.5.9)
+    nokogiri (1.14.4-arm64-darwin)
+      racc (~> 1.4)
     parallel (1.23.0)
     parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     racc (1.7.1)
+    rack (2.2.7)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails (7.0.4.3)
+      actioncable (= 7.0.4.3)
+      actionmailbox (= 7.0.4.3)
+      actionmailer (= 7.0.4.3)
+      actionpack (= 7.0.4.3)
+      actiontext (= 7.0.4.3)
+      actionview (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activemodel (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      bundler (>= 1.15.0)
+      railties (= 7.0.4.3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.8.2)
@@ -68,7 +196,15 @@ GEM
     standard-performance (1.2.1)
       lint_roller (~> 1.1)
       rubocop-performance (~> 1.19.1)
+    thor (1.2.1)
+    timeout (0.3.2)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.11)
 
 PLATFORMS
   arm64-darwin-22

data/lib/tinytokenauth/authorizable.rb

@@ -0,0 +1,133 @@
+module Tinytokenauth
+
+  module Authorizable
+    # class Configuration
+    #   attr_accessor :token_duration
+    # end
+
+    class << self
+      def configuration
+        @configuration ||= Configuration.new
+      end
+
+      def configure
+        yield(configuration)
+      end
+    end
+
+    def authorize_with_header(klass = User)
+      token = ''
+      header = request.headers['Authorization']
+      token = header.split(' ').last if header
+      # p "token from header: #{token}"
+
+      begin
+        @decoded = JsonWebToken.decode(token)
+        # @current_user = User.find(@decoded[:user_id])
+        @current_user = klass.send 'find', @decoded[:user_id]
+      rescue ActiveRecord::RecordNotFound => e
+        render json: { errors: e.message }, status: :unauthorized
+      rescue JWT::DecodeError => e
+        render json: { errors: e.message }, status: :unauthorized
+      end
+    end
+
+    # Tinytokenauth.configure do |config|
+    #   config.token_duration = 24.hours
+    # 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_user2(klass = User, &block)
+      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, JWT::DecodeError => e
+        if block_given? && current_user.nil?
+          block.call
+        else
+          raise e
+        end
+      end
+    end
+
+    def set_current_user(klass = User)
+      token = cookies['klap-auth']
+      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_user2(klass = User)
+      begin
+        require_current_user2(klass)
+      rescue ActiveRecord::RecordNotFound
+        # Ignored
+      rescue JWT::DecodeError
+        # Ignored
+      end
+      @current_user
+    end
+
+    def sign_in(user)
+      @current_user = user
+      cookies['klap-auth'] = JsonWebToken.encode(user_id: user.id)
+    end
+
+    def current_user
+      @current_user
+    end
+  end
+end

data/lib/tinytokenauth/configuration.rb

@@ -0,0 +1,6 @@
+module Tinytokenauth
+
+  class Configuration
+    attr_accessor :token_duration
+  end
+end

data/lib/tinytokenauth/engine.rb

@@ -0,0 +1,10 @@
+module Tinytokenauth
+  class Engine < Rails::Engine
+    # initializer "tinytokenauth-rails.view_helpers" do
+    #   ActiveSupport.on_load(:action_view) do
+    #     include ViewHelpers
+    #   end
+    # end
+  end
+
+end

data/lib/tinytokenauth/{rails/version.rb → version.rb}

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
 module Tinytokenauth
-  module Rails
-    VERSION = "0.1.0"
-  end
+  VERSION = "0.1.1"
 end

data/lib/tinytokenauth/{rails/view_helpers.rb → view_helpers.rb}

@@ -1,9 +1,7 @@
 module Tinytokenauth
-  module Rails
     module ViewHelpers
       def current_user
         @current_user
       end
     end
-  end
 end

data/lib/tinytokenauth.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Tinytokenauth
+  require_relative "tinytokenauth/version"
+  require_relative "tinytokenauth/engine"
+  require_relative "tinytokenauth/authorizable"
+  require_relative "tinytokenauth/view_helpers"
+
+end
+
+# module Tinytokenauth
+#   module Rails
+#     class Error < StandardError; end
+#     # Your code goes here...
+#   end
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tinytokenauth-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kim Laplume
@@ -10,6 +10,20 @@ bindir: exe
 cert_chain: []
 date: 2023-10-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -53,12 +67,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/tinytokenauth/rails.rb
-- lib/tinytokenauth/rails/authorizable.rb
-- lib/tinytokenauth/rails/configuration.rb
-- lib/tinytokenauth/rails/railtie.rb
-- lib/tinytokenauth/rails/version.rb
-- lib/tinytokenauth/rails/view_helpers.rb
+- lib/tinytokenauth.rb
+- lib/tinytokenauth/authorizable.rb
+- lib/tinytokenauth/configuration.rb
+- lib/tinytokenauth/engine.rb
+- lib/tinytokenauth/version.rb
+- lib/tinytokenauth/view_helpers.rb
 - sig/tinytokenauth/rails.rbs
 homepage: https://github.com/1klap/tinytokenauth-rails
 licenses:

data/lib/tinytokenauth/rails/authorizable.rb

@@ -1,134 +0,0 @@
-module Tinytokenauth
-  module Rails
-    module Authorizable
-      # class Configuration
-      #   attr_accessor :token_duration
-      # end
-
-      class << self
-        def configuration
-          @configuration ||= Configuration.new
-        end
-
-        def configure
-          yield(configuration)
-        end
-      end
-
-      def authorize_with_header(klass = User)
-        token = ''
-        header = request.headers['Authorization']
-        token = header.split(' ').last if header
-        # p "token from header: #{token}"
-
-        begin
-          @decoded = JsonWebToken.decode(token)
-          # @current_user = User.find(@decoded[:user_id])
-          @current_user = klass.send 'find', @decoded[:user_id]
-        rescue ActiveRecord::RecordNotFound => e
-          render json: { errors: e.message }, status: :unauthorized
-        rescue JWT::DecodeError => e
-          render json: { errors: e.message }, status: :unauthorized
-        end
-      end
-
-      # Tinytokenauth.configure do |config|
-      #   config.token_duration = 24.hours
-      # 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_user2(klass = User, &block)
-        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, JWT::DecodeError => e
-          if block_given? && current_user.nil?
-            block.call
-          else
-            raise e
-          end
-        end
-      end
-
-      def set_current_user(klass = User)
-        token = cookies['klap-auth']
-        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_user2(klass = User)
-        begin
-          require_current_user2(klass)
-        rescue ActiveRecord::RecordNotFound
-          # Ignored
-        rescue JWT::DecodeError
-          # Ignored
-        end
-        @current_user
-      end
-
-      def sign_in(user)
-        @current_user = user
-        cookies['klap-auth'] = JsonWebToken.encode(user_id: user.id)
-      end
-
-      def current_user
-        @current_user
-      end
-    end
-  end
-end

data/lib/tinytokenauth/rails/configuration.rb

@@ -1,7 +0,0 @@
-module Tinytokenauth
-  module Rails
-    class Configuration
-      attr_accessor :token_duration
-    end
-  end
-end

data/lib/tinytokenauth/rails/railtie.rb

@@ -1,11 +0,0 @@
-module Tinytokenauth
-  module Rails
-    class Engine < Rails::Engine
-      initializer "tinytokenauth-rails.view_helpers" do
-        ActiveSupport.on_load(:action_view) do
-          include ViewHelpers
-        end
-      end
-    end
-  end
-end

data/lib/tinytokenauth/rails.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "rails/version"
-
-require_relative "rails/authorizable"
-require_relative "rails/railtie"
-require_relative "rails/view_helpers"
-
-# module Tinytokenauth
-#   module Rails
-#     class Error < StandardError; end
-#     # Your code goes here...
-#   end
-# end