propel_authentication 0.3.1.6 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cd741c44d75fbf65d7f7db0eaf8f1fc2d777791da65a17104118ae8264791bd
-  data.tar.gz: f381d9454b167d222d2b029a9568ee1c55e79bf52c760d044c5a506e4a7ea52e
+  metadata.gz: 49609b9aadde056ceb7d0aaa9f5e6442b1665efcff9236cf581c93a05199d617
+  data.tar.gz: 23ad3f6706cffe5f0841322cea1dbba44fff43ca8a5feddf6d1dbb32bc57c411
 SHA512:
-  metadata.gz: 6983150a0198d1d3dd5e371f7f61a14b66cbfc8408e5937aa997e2c2b12ecb4bbd8786354515fd326cc6f6af19eb772225843d479a62702217f9b6a0bb15f71d
-  data.tar.gz: 67759000cd49bc86d34770197a40893d7120ce5209b2936687267d841f7589fa13f19e379e1e7e9a08c96cac9012fed3a82448e53d7ca843384d14b824e25601
+  metadata.gz: cdcb9d2852913c823a8a3e6642044572fe1a931bd72872b9d186d1595dc36b280946535600a1bda07b0a0a9cf2cf76e388a564c5eb209fcfa529b9ee2bbbfdb7
+  data.tar.gz: f2178a8e4baece710a38a41042062cb91511ea86567ce796745dc51ec6d4320e9e94c0412d949cb835b0bfb91fb9cac936553747142436ceda265acb0fa7d915

data/CHANGELOG.md

@@ -13,6 +13,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Session management and device tracking
 - Advanced password policies
 
+## [0.3.3] - 2025-01-XX
+
+### 🔧 Version Synchronization  
+- **Version Consistency**: Updated version to maintain consistency with PropelApi 0.3.3 comprehensive filtering system
+  - No functional changes in this release
+  - Synchronized release with PropelApi's new dynamic filtering capabilities
+  - Better coordination with PropelApi's enhanced test suite and documentation
+
+### 🧪 Enhanced Test Integration
+- **Filtering System Compatibility**: Authentication system now fully compatible with PropelApi's new filtering features
+  - JWT token validation works seamlessly with filtered API endpoints
+  - Multi-tenancy scoping integrates properly with dynamic filtering
+  - Organization context properly maintained across all filtered queries
+
+## [0.3.2] - 2025-09-15
+
+### 🔧 Version Synchronization  
+- **Version Consistency**: Updated version to maintain consistency with PropelApi 0.3.2 critical generator improvements
+  - No functional changes in this release
+  - Synchronized release with PropelApi's enhanced generator destroy/rollback functionality
+  - Better coordination with PropelApi's improved generator infrastructure and error handling
+
 ## [0.3.1.6] - 2025-09-13
 
 ### 🔧 Version Synchronization  

data/lib/generators/propel_authentication/install_generator.rb

@@ -182,8 +182,53 @@ module PropelAuthentication
         return
       end
       
-      # Use dedicated routes template for clean separation of concerns
-      route template_file_for_routes
+      add_auth_routes_simple
+    end
+
+    def add_auth_routes_simple
+       routes_content = File.read("config/routes.rb")
+      
+      # Check if auth routes already exist - be specific
+      if routes_content.include?("post 'login', to: 'tokens#create'")
+        say "Authentication routes already exist, skipping", :yellow
+        return
+      end
+      
+      auth_routes = [
+        "post 'signup', to: 'signup#create', as: :signup",
+        "post 'login', to: 'tokens#create', as: :login",
+        "get 'me', to: 'tokens#show', as: :me", 
+        "delete 'logout', to: 'tokens#destroy', as: :logout",
+        "post 'unlock', to: 'tokens#unlock', as: :unlock",
+        "post 'reset', to: 'passwords#create', as: :reset",
+        "get 'reset', to: 'passwords#show', as: :verify_reset",
+        "patch 'reset', to: 'passwords#update', as: :update_reset"
+      ]
+      
+      # Try to insert into existing namespace, otherwise create new
+      if @auth_namespace.present? && @auth_version.present?
+        # Look for api/v1 pattern  
+        pattern = /namespace\s+:#{@auth_namespace}\s+do\s*\n\s*namespace\s+:#{@auth_version}\s+do\s*\n/
+        if routes_content.match?(pattern)
+          # Insert into existing namespace with proper indentation
+          gsub_file "config/routes.rb", pattern do |match|
+            routes_to_add = auth_routes.map { |r| "      #{r}" }.join("\n") + "\n"
+            match + routes_to_add
+          end
+          say "Added authentication routes to existing #{@auth_namespace}/#{@auth_version} namespace", :green
+        else
+          # Create new namespace
+          route_block = "namespace :#{@auth_namespace} do\n  namespace :#{@auth_version} do\n"
+          auth_routes.each { |r| route_block += "    #{r}\n" }
+          route_block += "  end\nend"
+          route route_block
+          say "Created new #{@auth_namespace}/#{@auth_version} namespace with authentication routes", :green
+        end
+      else
+        # Fallback - just add routes
+        route auth_routes.join("\n")
+        say "Added authentication routes at root level", :green
+      end
     end
     
     def copy_authentication_migrations_and_fixtures
@@ -297,11 +342,6 @@ module PropelAuthentication
       end
     end
 
-    # Render authentication routes template to string
-    def template_file_for_routes
-      source_path = find_in_source_paths("routes/auth_routes.rb.tt")
-      ERB.new(File.read(source_path), trim_mode: '-').result(binding)
-    end
 
 
     def migration_exists?(migration_name)

data/lib/generators/propel_authentication/templates/models/agency.rb.tt

@@ -12,8 +12,17 @@ class Agency < ApplicationRecord
 
   # Facets
   json_facet :short, 
-    fields: [:id, :name]
+    fields: 
+      [
+        :id, :name, :phone_number, :time_zone, :address, :type<% if PropelAuthentication.configuration.organization_required? -%><% end -%>
+      ]
   json_facet :details, 
-    fields: [:id, :name, :organization_id, :created_at, :updated_at]
+    fields: 
+      [
+        :id, :name<% if PropelAuthentication.configuration.organization_required? -%>, :organization_id<% end -%>, 
+        :phone_number, :address, :time_zone, 
+        :created_at, :updated_at, 
+        :metadata, :settings<% if PropelAuthentication.configuration.organization_required? -%>, :type<% end -%>
+      ]<% if PropelAuthentication.configuration.organization_required? -%>, include: [:organization]<% end -%>
 <% end -%>
 end 

data/lib/generators/propel_authentication/templates/models/agent.rb.tt

@@ -17,8 +17,23 @@ class Agent < ApplicationRecord
 
   # Facets
   json_facet :short, 
-    fields: [:id, :title]
+    fields: 
+      [
+        :id, :title, :role, :user_id<% if PropelAuthentication.configuration.organization_required? || PropelAuthentication.configuration.agency_required? -%>, :type<% end -%>
+      ]
   json_facet :details, 
-    fields: [:id, :title, :role, :organization_id, :created_at, :updated_at]
+    fields: 
+      [
+        :id, :title, :role<% if PropelAuthentication.configuration.organization_required? -%>, :organization_id<% end -%><% if PropelAuthentication.configuration.agency_required? -%>, :agency_id<% end -%>, :user_id,
+        :created_at, :updated_at<% if PropelAuthentication.configuration.organization_required? || PropelAuthentication.configuration.agency_required? -%>, :type<% end -%>
+      ], include: [<% include_associations = [] -%>
+<% if PropelAuthentication.configuration.organization_required? -%>
+<% include_associations << ':organization' -%>
+<% end -%>
+<% if PropelAuthentication.configuration.agency_required? -%>
+<% include_associations << ':agency' -%>
+<% end -%>
+<% include_associations << ':user' -%>
+<%= include_associations.join(', ') %>]
 <% end -%>
 end 

data/lib/propel_authentication.rb

@@ -1,3 +1,3 @@
 module PropelAuthentication
-  VERSION = "0.3.1.6"
+  VERSION = "0.3.3"
 end 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propel_authentication
 version: !ruby/object:Gem::Version
-  version: 0.3.1.6
+  version: 0.3.3
 platform: ruby
 authors:
 - Propel Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-13 00:00:00.000000000 Z
+date: 2025-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,7 +123,6 @@ files:
 - lib/generators/propel_authentication/templates/models/organization.rb.tt
 - lib/generators/propel_authentication/templates/models/user.rb.tt
 - lib/generators/propel_authentication/templates/propel_authentication.rb.tt
-- lib/generators/propel_authentication/templates/routes/auth_routes.rb.tt
 - lib/generators/propel_authentication/templates/services/auth_notification_service.rb
 - lib/generators/propel_authentication/templates/test/concerns/confirmable_test.rb.tt
 - lib/generators/propel_authentication/templates/test/concerns/lockable_test.rb.tt

data/lib/generators/propel_authentication/templates/routes/auth_routes.rb.tt

@@ -1,55 +0,0 @@
-# JWT Authentication routes for <%= auth_route_prefix %>
-<%- if @auth_namespace.present? || @auth_version.present? || @auth_scope.present? -%>
-<%- namespace_parts = [] -%>
-<%- namespace_parts << @auth_namespace if @auth_namespace.present? -%>
-<%- namespace_parts << @auth_version if @auth_version.present? -%>
-<%- namespace_parts.each_with_index do |part, index| -%>
-<%= "  " * index %>namespace :<%= part %> do
-<%- end -%>
-  <%- if @auth_scope.present? -%>
-<%= "  " * namespace_parts.length %>namespace :<%= @auth_scope %> do
-<%= "  " * (namespace_parts.length + 1) %>post 'signup', to: 'signup#create', as: :signup
-<%= "  " * (namespace_parts.length + 1) %>post 'login', to: 'tokens#create', as: :login
-<%= "  " * (namespace_parts.length + 1) %>get 'me', to: 'tokens#show', as: :me
-<%= "  " * (namespace_parts.length + 1) %>delete 'logout', to: 'tokens#destroy', as: :logout
-<%= "  " * (namespace_parts.length + 1) %>post 'unlock', to: 'tokens#unlock', as: :unlock
-<%= "  " * (namespace_parts.length + 1) %>post 'reset', to: 'passwords#create', as: :reset
-<%= "  " * (namespace_parts.length + 1) %>get 'reset', to: 'passwords#show', as: :verify_reset
-<%= "  " * (namespace_parts.length + 1) %>patch 'reset', to: 'passwords#update', as: :update_reset
-<%= "  " * namespace_parts.length %>end
-  <%- else -%>
-<%= "  " * namespace_parts.length %>post 'signup', to: 'signup#create', as: :signup
-<%= "  " * namespace_parts.length %>post 'login', to: 'tokens#create', as: :login
-<%= "  " * namespace_parts.length %>get 'me', to: 'tokens#show', as: :me
-<%= "  " * namespace_parts.length %>delete 'logout', to: 'tokens#destroy', as: :logout
-<%= "  " * namespace_parts.length %>post 'unlock', to: 'tokens#unlock', as: :unlock
-<%= "  " * namespace_parts.length %>post 'reset', to: 'passwords#create', as: :reset
-<%= "  " * namespace_parts.length %>get 'reset', to: 'passwords#show', as: :verify_reset
-<%= "  " * namespace_parts.length %>patch 'reset', to: 'passwords#update', as: :update_reset
-  <%- end -%>
-<%- namespace_parts.length.times do |index| -%>
-<%= "  " * (namespace_parts.length - 1 - index) %>end
-<%- end -%>
-<%- else -%>
-  <%- if @auth_scope.present? -%>
-namespace :<%= @auth_scope %> do
-  post 'signup', to: 'signup#create', as: :signup
-  post 'login', to: 'tokens#create', as: :login
-  get 'me', to: 'tokens#show', as: :me
-  delete 'logout', to: 'tokens#destroy', as: :logout
-  post 'unlock', to: 'tokens#unlock', as: :unlock
-  post 'reset', to: 'passwords#create', as: :reset
-  get 'reset', to: 'passwords#show', as: :verify_reset
-  patch 'reset', to: 'passwords#update', as: :update_reset
-end
-  <%- else -%>
-post 'signup', to: 'signup#create', as: :signup
-post 'login', to: 'tokens#create', as: :login
-get 'me', to: 'tokens#show', as: :me
-delete 'logout', to: 'tokens#destroy', as: :logout
-post 'unlock', to: 'tokens#unlock', as: :unlock
-post 'reset', to: 'passwords#create', as: :reset
-get 'reset', to: 'passwords#show', as: :verify_reset  
-patch 'reset', to: 'passwords#update', as: :update_reset
-  <%- end -%>
-<%- end -%>