rails_auth_generator 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57cf671f5c6352bcd54a7a4766bc3ae0dc0a515d2eca9df4508f59e2da941dde
-  data.tar.gz: e67935ab3b0c63a1765a4411818d5d945ae8ac6ad9d22f6e32f9af895d7c54ff
+  metadata.gz: bf69a30ca1854528205157aa7d45cf0138f78b50dc87b86e3db9a803e1368443
+  data.tar.gz: de809c1c82d18fae7af04964caf5d07c26db2178cd4e4cd40407a7debaf78d7f
 SHA512:
-  metadata.gz: 260738a21ff80dc301f384c446539bb9a98fd882f38db0a000fb46fd7dacba7202f61dc2f7c4ebaf9860b7414b501e2578fbfc825676d003d960fdd9466101d5
-  data.tar.gz: 4b3fc7f835b388f967edcbba74a6ee558a007dfd4ae6fedfea59600bd0885b4175f6b59ab5c2f2ff2e49ad8cd0bd6e0fcbc18b37caafe235be054f9227285a22
+  metadata.gz: 0203aa88a66a391c60837ecd69dee7a69b813b407e840256cdbd891e10b3f29a354450811dcbeaca3f50588e48b369aba92b41c96cf781ce130aae1630a35717
+  data.tar.gz: c3fbeee8f0b7f1ba781d14872b43e33571826866c868a51df2c5e316ac2471a6b2e564555bc854be9f0691076f5e795125e3f9457541449a87bb63941cd2c086

data/README.md

@@ -27,7 +27,7 @@
 ## 📦 Installation
 
 Add this line to your application's Gemfile:  
-`gem 'rails_auth_generator', '~> 0.1.0'`  
+`gem 'rails_auth_generator', '~> 0.2.1'`  
 
 and then run:  
 `bundle install`  

data/lib/generators/auth/auth_generator.rb

@@ -13,14 +13,14 @@ def modify_gemfile
     end
 end
 
-def modify_application_rb
-  insert_into_file "config/application.rb", after: "config.api_only = true" do
-    <<~RUBY
-      config.middleware.use ActionDispatch::Cookies
-    RUBY
-  end
+  def modify_application_rb
+    insert_into_file "config/application.rb", after: "config.api_only = true\n" do
+      <<~RUBY
+        config.middleware.use ActionDispatch::Cookies
+      RUBY
+    end
 
-end
+  end
 
   def add_routes
     route <<~RUBY
@@ -41,77 +41,49 @@ end
   end
 
   def create_auth_files
-    template "auth_controller.rb", "app/controllers/auth_controller.rb"
-    template "user_serializer.rb", "app/serializers/user_serializer.rb"
-    template "users_controller.rb", "app/controllers/users_controller.rb"
-    template "password_resets_controller.rb", "app/controllers/password_resets_controller.rb"
-    template "user.rb", "app/models/user.rb"
-    template "refresh_token.rb", "app/models/refresh_token.rb"
+    template "controllers/auth_controller.rb", "app/controllers/auth_controller.rb"
+    template "serializers/user_serializer.rb", "app/serializers/user_serializer.rb"
+    template "controllers/users_controller.rb", "app/controllers/users_controller.rb"
+    template "controllers/password_resets_controller.rb", "app/controllers/password_resets_controller.rb"
+    template "models/user.rb", "app/models/user.rb"
+    template "models/refresh_token.rb", "app/models/refresh_token.rb"
     template "mailers/user_mailer.rb", "app/mailers/user_mailer.rb"
     template "mailers/application_mailer.rb", "app/mailers/application_mailer.rb"
+    template "concerns/authenticatable.rb", "app/controllers/concerns/authenticatable.rb"
+    template "initializers/rails_auth_generator.rb", "config/initializers/rails_auth_generator.rb"
   end
 
   def modify_application_controller
     inject_into_class "app/controllers/application_controller.rb", "ApplicationController" do
-      <<~RUBY
-      include ActionController::Cookies
-      before_action :authorized
-      SECRET_KEY = Rails.application.credentials.dig(:jwt, :secret)
-
-
-      def encode_token(payload, exp = 15.minutes.from_now)
-        # Add admin status to the payload if user is admin
-        payload[:admin] = @user.admin? if @user.is_a?(User)
-        payload[:exp] = exp.to_i
-        JWT.encode(payload, SECRET_KEY) 
-      end
+      "  include Authenticatable\n"
+    end
+  end
 
-      def decoded_token
-        header = request.headers['Authorization']
-        if header
-          token = header.split(" ")[1]
-          begin
-            JWT.decode(token, SECRET_KEY, true, algorithm: 'HS256')
-          rescue JWT::DecodeError
-            nil
-          end
-        end
-      end
 
-      def current_user 
-        if decoded_token
-          user_id = decoded_token[0]['user_id']
-          @user = User.find_by(id: user_id)
-        end
-      end
+  def self.next_migration_number(dirname)
+    @prev_migration_nr ||= Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+    @prev_migration_nr += 1
+    @prev_migration_nr.to_s
+  end
 
-      def current_admin
-        current_user && (current_user.admin? || decoded_token[0]['admin'])
-      end
+  def copy_migration
+    migration_template "migrations/create_user.rb", "db/migrate/create_users.rb"
+    migration_template "migrations/create_refresh_token.rb", "db/migrate/create_refresh_tokens.rb"
+  end
 
-      def authorized
-        unless !!current_user
-          render json: { message: 'Please log in' }, status: :unauthorized
-        end
-      end
+  def enable_cors
+    insert_into_file "config/application.rb"do
+      <<~RUBY
+        Rails.application.config.middleware.insert_before 0, Rack::Cors do
+          allow do
+            origins "example.com"
 
-      def admin_authorized
-        unless current_admin
-          render json: { message: 'Admin access required' }, status: :forbidden
+            resource "*",
+              headers: :any,
+              methods: [:get, :post, :put, :patch, :delete, :options, :head]
+          end
         end
-      end
       RUBY
     end
   end
-
-def self.next_migration_number(dirname)
-  @prev_migration_nr ||= Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-  @prev_migration_nr += 1
-  @prev_migration_nr.to_s
-end
-
-  def copy_migration
-    migration_template "migrations/create_user.rb", "db/migrate/create_users.rb"
-    migration_template "migrations/create_refresh_token.rb", "db/migrate/create_refresh_tokens.rb"
-  end
 end

data/lib/generators/auth/templates/concerns/authenticatable.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Authenticatable
+  extend ActiveSupport::Concern
+
+  included do
+    include ActionController::Cookies
+    before_action :authorized
+
+    SECRET_KEY = RailsAuthGenerator.configuration.jwt_secret
+
+def encode_token(payload, exp = RailsAuthGenerator.configuration.access_token_expiry.from_now)
+
+  
+  payload[:exp] = exp.to_i
+  payload[:admin] = @user.admin? if @user.is_a?(User) && RailsAuthGenerator.configuration.enable_roles
+  
+  token = JWT.encode(payload, SECRET_KEY)
+  
+end
+
+    def decoded_token
+      header = request.headers['Authorization']
+      return nil unless header
+
+      token = header.split(" ")[1]
+      puts "🔍 DECODE_TOKEN DEBUG: Token: #{token}"
+      
+      begin
+        decoded = JWT.decode(token, SECRET_KEY, true, { algorithm: 'HS256', verify_expiration: true })
+        puts "   Token valid, expires at: #{Time.at(decoded[0]['exp'])}" if decoded[0]['exp']
+        decoded
+      rescue JWT::ExpiredSignature => e
+        puts "   ❌ Token expired: #{e.message}"
+        @token_expired = true
+        nil
+      rescue JWT::DecodeError => e
+        puts "   ❌ Token decode error: #{e.message}"
+        nil
+      end
+    end
+
+    def current_user
+      return @current_user if defined?(@current_user)
+      
+      if decoded_token
+        user_id = decoded_token[0]['user_id']
+        @current_user = User.find_by(id: user_id)
+      else
+        @current_user = nil
+      end
+    end
+
+    def current_admin
+      current_user && (current_user.admin? || (decoded_token && decoded_token[0]['admin']))
+    end
+
+    def authorized
+      # Check if token is expired first
+      if @token_expired
+        render json: { error: 'Token has expired' }, status: :unauthorized
+        return false
+      end
+      
+      unless current_user
+        render json: { message: 'Please log in' }, status: :unauthorized
+        return false
+      end
+      
+      true
+    end
+
+    def admin_authorized
+      authorized && current_admin
+    end
+  end
+end

data/lib/generators/auth/templates/{auth_controller.rb → controllers/auth_controller.rb}

@@ -36,7 +36,7 @@ class AuthController < ApplicationController
   end
 
   # Issue new access + refresh token
-  new_access_token  = encode_token({ user_id: rt.user_id }, 15.minutes.from_now)
+  new_access_token  = encode_token({ user_id: rt.user_id })
   new_refresh_token = rt.user.generate_refresh_token
 
   # revoke the old token

data/lib/generators/auth/templates/initializers/rails_auth_generator.rb

@@ -0,0 +1,6 @@
+RailsAuthGenerator.configure do |config|
+  config.jwt_secret = "test_secret_key"
+  config.access_token_expiry = 10.minutes
+  config.refresh_token_expiry = 7.days
+  config.enable_roles = true
+end

data/lib/generators/auth/templates/serializers/user_serializer.rb

@@ -0,0 +1,3 @@
+class UserSerializer < ActiveModel::Serializer
+  attributes :username, :bio, :admin, :email
+end

data/lib/rails_auth_generator/configuration.rb

@@ -0,0 +1,15 @@
+module RailsAuthGenerator
+  class Configuration
+    attr_accessor :jwt_secret,
+                  :access_token_expiry,
+                  :refresh_token_expiry,
+                  :enable_roles
+
+    def initialize
+      @jwt_secret = nil
+      @access_token_expiry = 15.minutes
+      @refresh_token_expiry = 30.days
+      @enable_roles = false
+    end
+  end
+end

data/lib/rails_auth_generator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsAuthGenerator
-  VERSION = "0.2.1"
+  VERSION = "1.0.0"
 end

data/lib/rails_auth_generator.rb

@@ -1,5 +1,15 @@
 require "rails_auth_generator/version"
+require "rails_auth_generator/configuration"
 
 module RailsAuthGenerator
   class Error < StandardError; end
+
+  class << self
+    attr_accessor :configuration
+
+    def configure
+      self.configuration ||= Configuration.new
+      yield(configuration)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_auth_generator
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Zeyad Hassan
@@ -29,6 +29,48 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
+- !ruby/object:Gem::Dependency
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.9'
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 email:
 - " studying.zezo@gmail.com"
 executables: []
@@ -46,17 +88,20 @@ files:
 - bin/setup
 - lib/generators/auth/USAGE
 - lib/generators/auth/auth_generator.rb
-- lib/generators/auth/templates/auth_controller.rb
+- lib/generators/auth/templates/concerns/authenticatable.rb
+- lib/generators/auth/templates/controllers/auth_controller.rb
+- lib/generators/auth/templates/controllers/password_resets_controller.rb
+- lib/generators/auth/templates/controllers/users_controller.rb
+- lib/generators/auth/templates/initializers/rails_auth_generator.rb
 - lib/generators/auth/templates/mailers/application_mailer.rb
 - lib/generators/auth/templates/mailers/user_mailer.rb
 - lib/generators/auth/templates/migrations/create_refresh_token.rb
 - lib/generators/auth/templates/migrations/create_user.rb
-- lib/generators/auth/templates/password_resets_controller.rb
-- lib/generators/auth/templates/refresh_token.rb
-- lib/generators/auth/templates/user.rb
-- lib/generators/auth/templates/user_serializer.rb
-- lib/generators/auth/templates/users_controller.rb
+- lib/generators/auth/templates/models/refresh_token.rb
+- lib/generators/auth/templates/models/user.rb
+- lib/generators/auth/templates/serializers/user_serializer.rb
 - lib/rails_auth_generator.rb
+- lib/rails_auth_generator/configuration.rb
 - lib/rails_auth_generator/version.rb
 homepage: https://github.com/Zeyad-Hassan-1/authJWT.git
 licenses:

data/lib/generators/auth/templates/user_serializer.rb

@@ -1,3 +0,0 @@
-class UserSerializer < ActiveModel::Serializer
-  attributes :username, :bio, :admin
-end