manyfold 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20aec86cdd49554cdb045892a1f03d0209e503852f9a1edd3da6e359b45478f0
-  data.tar.gz: 06f400d8c1e7b24df66e3b9c3400147200de75c6f4be00389caa36e2e17c2881
+  metadata.gz: b5a866044e1f1c441f0945578738856e60ddb6c8fd575d44f60727c0855f6f0a
+  data.tar.gz: dbb7d9cb38f0c5725dceba6f0857ac3f92b114dfaa085b7071a77662c86fd6df
 SHA512:
-  metadata.gz: f62596bde0d8fedde0dd4f953d5ee801203cf057460b4bb7a0afcb4c2cdde0198d09ff2e1d41ce6219526fa017cf2826bfc8546999489b054155b41af8a81516
-  data.tar.gz: c9f6ea5ad920251fbe4a066691bc8ca400717ecc8d4338d1f1744605dbf572c3557dc6478a503ad3395bee6bb7cfbdf56560c77209130691cefee40f2aa9642a
+  metadata.gz: e4fe5d54b60775c2fe1832eca015e4ca1fd1929faa238941a48fbef505aba4bb78e3edc7dba4c3b58940de18100c32f40178460cbd0caef39f617dcb8dbbbbd0
+  data.tar.gz: ee99dca2f0d462def90f5d706ca75eaada0cbf7c370847ee3114ac4beeb9e6b92c14075d5c4aa324dcf2c898ae9a9646fad302c62d69ed3b8019924de6cb6b23

data/lib/generators/manyfold/app/app_generator.rb

@@ -5,19 +5,6 @@ module Manyfold
     class AppGenerator < Rails::Generators::Base
       source_root File.expand_path("templates", __dir__)
 
-      def gems
-        if [run("grep debase Gemfile"), run("grep ruby-debug-ide Gemfile")].any?(&:blank?)
-          gem_group :development, :test do
-            gem "debase", "~> 0.2.9" if run("grep debase Gemfile").blank?
-            gem "ruby-debug-ide", "~> 0.7.4" if run("grep ruby-debug-ide Gemfile").blank?
-          end
-        end
-
-        Bundler.with_unbundled_env do
-          run 'bundle install'
-        end
-      end
-
       def setup
         copy_file "lib/active_model/type/symbol.rb", "lib/active_model/type/symbol.rb"
         copy_file "config/initializers/active_model.rb", "config/initializers/active_model.rb"

data/lib/generators/manyfold/authentication/authentication_generator.rb

@@ -7,18 +7,18 @@ module Manyfold
 
       def gems
         gem "bcrypt" if run("grep bcrypt Gemfile").blank?
+
         Bundler.with_unbundled_env do
           run 'bundle install'
         end
       end
 
       def setup
-        copy_file "app/controllers/concerns/authentication.rb", "app/controllers/concerns/authentication.rb"
-        copy_file "app/controllers/request_context/session_context.rb", "app/controllers/request_context/session_context.rb"
+        copy_file "app/controllers/concerns/authentication/controller.rb", "app/controllers/concerns/authentication/controller.rb"
+        copy_file "app/controllers/concerns/authentication/controller/rememberable.rb", "app/controllers/concerns/authentication/controller/rememberable.rb"
+        copy_file "app/controllers/concerns/authentication/controller/routing.rb", "app/controllers/concerns/authentication/controller/routing.rb"
 
-        copy_file "app/lib/request_context/context/base.rb", "app/lib/request_context/context/base.rb"
-        copy_file "app/lib/request_context/session/base.rb", "app/lib/request_context/session/base.rb"
-        copy_file "app/lib/request_context/session/browser_session.rb", "app/lib/request_context/session/browser_session.rb"
+        copy_file "app/models/concerns/authentication/model/rememberable.rb", "app/models/concerns/authentication/model/rememberable.rb"
 
         inject_into_class "app/controllers/application_controller.rb", "ApplicationController" do
           <<~CODE
@@ -29,21 +29,31 @@ module Manyfold
 
         inject_into_file "app/controllers/application_controller.rb", before: /^end/ do
           <<~CODE
-
-            \tattr_accessor :request_context
-
-            \tonly_allow_authenticated_access
+            \tallow_all_access
     
             \tdef request_context
-              \t@request_context ||= RequestContext::SessionContext.new(RequestContext::Session::BrowserSession.new(session))
+              \treturn @request_context unless @request_context.nil?
+          
+              \tuser = nil
+          
+              \tif session[:user_id]
+                \tuser = User.find_by(id: session[:user_id])
+              \tend
+          
+              \tif user.nil? && remembered_session
+                \tuser_to_remember = User.find_by(id: remembered_session[:data][:user_id])
+                \tuser = user_to_remember if user_to_remember&.remember?(remembered_session[:token])
+              \tend
+          
+              \t@request_context = { user: user }
             \tend
 
             \tdef current_user
-              \trequest_context.user
+              \trequest_context[:user]
             \tend
 
-            \tdef authentication_user
-              \trequest_context.user
+            \tdef authenticated?
+              \t!request_context[:user].nil?
             \tend
           CODE
         end
@@ -56,11 +66,11 @@ module Manyfold
         end
 
         double_space = '  '
-        inject_into_file "config/etc/app.yml.erb", after: /default: &default/ do
+        inject_into_file "config/etc/app.yml", after: /default: &default/ do
           <<~CODE.chomp
 
-            #{double_space}unauthenticated_root_path:
-            #{double_space}authenticated_root_path:
+            #{double_space}unauthenticated_root_path: # TODO - Generated by Manyfold
+            #{double_space}authenticated_root_path: # TODO - Generated by Manyfold
           CODE
         end
 
@@ -76,6 +86,8 @@ module Manyfold
 
         inject_into_class 'app/models/user.rb', "User" do
           <<~CODE.chomp
+            \tinclude Authentication::Model::Rememberable
+
             \thas_secure_password
 
           CODE

data/lib/generators/manyfold/authentication/templates/app/controllers/concerns/authentication/controller/rememberable.rb

@@ -0,0 +1,31 @@
+module Authentication
+  module Controller
+    module Rememberable
+
+      def remember_session!(data, with:)
+        rememberable_token = with
+        cookies.encrypted.permanent[AppConfig.rememberable_token] = {
+          value: { token: rememberable_token, data: data },
+          httponly: true,
+          secure: AppConfig.secure_sessions,
+          same_site: :lax
+        }
+      end
+
+      def forget_session!
+        cookies.delete(AppConfig.rememberable_token)
+      end
+
+      def remembered_session
+        return @remembered_session unless @remembered_session.nil?
+        @remembered_session = cookies.encrypted[AppConfig.rememberable_token]
+
+        if @remembered_session.is_a?(Hash)
+          @remembered_session.deep_symbolize_keys!
+        end
+
+        @remembered_session
+      end
+    end
+  end
+end

data/lib/generators/manyfold/authentication/templates/app/controllers/concerns/authentication/controller/routing.rb

@@ -0,0 +1,68 @@
+module Authentication
+  module Controller
+    module Routing
+      extend ActiveSupport::Concern
+
+      private
+
+      def redirect_unauthenticated
+        redirect_to self.class.auth_redirect_paths[:unauthenticated]
+      end
+
+      def redirect_authenticated
+        redirect_to self.class.auth_redirect_paths[:authenticated]
+      end
+
+      class_methods do
+
+        def inherited(subclass)
+          super
+          subclass.instance_variable_set(:@auth_redirect_paths, auth_redirect_paths)
+        end
+
+        def allow_all_access(**options)
+          allow_authenticated_access(**options)
+          allow_unauthenticated_access(**options)
+        end
+
+        def only_allow_authenticated_access(**options)
+          allow_authenticated_access(**options)
+          restrict_unauthenticated_access(**options)
+        end
+
+        def only_allow_unauthenticated_access(**options)
+          allow_unauthenticated_access(**options)
+          restrict_authenticated_access(**options)
+        end
+
+        def restrict_unauthenticated_access(**options)
+          before_action :redirect_unauthenticated, unless: AppConfig.authenticated_method, **options
+        end
+
+        def allow_unauthenticated_access(**options)
+          skip_before_action :redirect_unauthenticated, unless: AppConfig.authenticated_method, raise: false, **options
+        end
+
+        def restrict_authenticated_access(**options)
+          before_action :redirect_authenticated, if: AppConfig.authenticated_method, **options
+        end
+
+        def allow_authenticated_access(**options)
+          skip_before_action :redirect_authenticated, if: AppConfig.authenticated_method, raise: false, **options
+        end
+
+        def unauthenticated_root_path(redirect_path)
+          auth_redirect_paths[:unauthenticated] = redirect_path
+        end
+
+        def authenticated_root_path(redirect_path)
+          auth_redirect_paths[:authenticated] = redirect_path
+        end
+
+        def auth_redirect_paths
+          @auth_redirect_paths ||= {}
+        end
+      end
+    end
+  end
+end

data/lib/generators/manyfold/authentication/templates/app/controllers/concerns/authentication/controller.rb

@@ -0,0 +1,8 @@
+module Authentication
+  module Controller
+    extend ActiveSupport::Concern
+
+    include Rememberable
+    include Routing
+  end
+end

data/lib/generators/manyfold/authentication/templates/app/models/concerns/authentication/model/rememberable.rb

@@ -0,0 +1,26 @@
+module Authentication
+  module Model
+    module Rememberable
+      extend ActiveSupport::Concern
+
+      def remember!
+        raw_token = SecureRandom.urlsafe_base64
+        update!(AppConfig.rememberable_column => BCrypt::Password.create(raw_token))
+        raw_token
+      end
+
+      def forget!
+        update!(AppConfig.rememberable_column => nil)
+      end
+
+      def rememberable_token
+        public_send(AppConfig.rememberable_column)
+      end
+
+      def remember?(raw_token)
+        return nil if raw_token.nil?
+        BCrypt::Password.new(rememberable_token).is_password?(raw_token)
+      end
+    end
+  end
+end

data/lib/generators/manyfold/config/templates/config/etc/app.yml.erb

@@ -8,4 +8,4 @@ development:
 production:
   <<: *default
   application_name: <%= @application_name %>
-  host:
+  host: # TODO - Generated by Manyfold

data/lib/manyfold/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Manyfold
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: manyfold
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Bevan Holborn
@@ -20,11 +20,10 @@ files:
 - lib/generators/manyfold/app/templates/lib/active_model/type/symbol.rb
 - lib/generators/manyfold/authentication/USAGE
 - lib/generators/manyfold/authentication/authentication_generator.rb
-- lib/generators/manyfold/authentication/templates/app/controllers/concerns/authentication.rb
-- lib/generators/manyfold/authentication/templates/app/controllers/request_context/session_context.rb
-- lib/generators/manyfold/authentication/templates/app/lib/request_context/context/base.rb
-- lib/generators/manyfold/authentication/templates/app/lib/request_context/session/base.rb
-- lib/generators/manyfold/authentication/templates/app/lib/request_context/session/browser_session.rb
+- lib/generators/manyfold/authentication/templates/app/controllers/concerns/authentication/controller.rb
+- lib/generators/manyfold/authentication/templates/app/controllers/concerns/authentication/controller/rememberable.rb
+- lib/generators/manyfold/authentication/templates/app/controllers/concerns/authentication/controller/routing.rb
+- lib/generators/manyfold/authentication/templates/app/models/concerns/authentication/model/rememberable.rb
 - lib/generators/manyfold/authorization/USAGE
 - lib/generators/manyfold/authorization/authorization_generator.rb
 - lib/generators/manyfold/config/USAGE

data/lib/generators/manyfold/authentication/templates/app/controllers/concerns/authentication.rb

@@ -1,32 +0,0 @@
-module Authentication
-  extend ActiveSupport::Concern
-
-  included do
-    only_allow_authenticated_access
-  end
-
-  class_methods do
-    def only_allow_unauthenticated_access(**options)
-      skip_before_action :redirect_unauthenticated_user, raise: false, **options
-      before_action :redirect_authenticated_user, **options
-    end
-
-    def only_allow_authenticated_access(**options)
-      before_action :redirect_unauthenticated_user, **options
-    end
-
-    def allow_all_access(**options)
-      skip_before_action :redirect_unauthenticated_user, raise: false, **options
-      skip_before_action :redirect_authenticated_user, raise: false, **options
-    end
-  end
-
-  private
-    def redirect_unauthenticated_user(route = nil)
-      redirect_to route || AppConfig.unauthenticated_root_path if current_user.nil?
-    end
-
-    def redirect_authenticated_user(route = nil)
-      redirect_to route || AppConfig.authenticated_root_path if current_user
-    end
-end

data/lib/generators/manyfold/authentication/templates/app/controllers/request_context/session_context.rb

@@ -1,17 +0,0 @@
-class RequestContext::SessionContext < RequestContext::Context::Base
-  attr_reader :user
-
-  def sync
-    if session[:user_id].nil? && @user
-      @user = nil
-    elsif @user || session[:user_id]
-      if @user.nil? || @user.id != session[:user_id]
-        @user = User.find_by(id: session[:user_id])
-      else
-        @user.reload
-      end
-    end
-
-    session.close if @user.nil? || @user.session_key != session[:session_key]
-  end
-end

data/lib/generators/manyfold/authentication/templates/app/lib/request_context/context/base.rb

@@ -1,35 +0,0 @@
-module RequestContext
-  module Context
-    class Base
-      extend ActiveModel::Callbacks
-
-      define_model_callbacks :initialize, only: [:after]
-
-      attr_reader :session
-
-      after_initialize :sync
-
-      def initialize(session)
-        raise NotImplementedError.new("`#{self.class.name}` is abstract and cannot be instantiated directly.") if self.class.name == RequestContext::Context::Base.name
-
-        run_callbacks(:initialize) do
-          @session = session
-        end
-      end
-
-      def sync
-        # Can be derived to specify how the session and the context should be synchronized
-      end
-
-      def update(data)
-        session.update(data)
-        sync
-      end
-
-      def close
-        session.close
-        sync
-      end
-    end
-  end
-end

data/lib/generators/manyfold/authentication/templates/app/lib/request_context/session/base.rb

@@ -1,35 +0,0 @@
-module RequestContext
-  module Session
-    class Base
-      include ActiveModel::Callbacks
-
-      attr_reader :session_store
-
-      def initialize(session_store)
-        raise NotImplementedError.new("`#{self.class.name}` is abstract and cannot be instantiated directly.") if self.class.name == RequestContext::Session::Base.name
-        @session_store = session_store
-      end
-
-      def [](key)
-        raise NotImplementedError
-      end
-
-      def []=(key, value)
-        raise NotImplementedError
-      end
-
-      def delete(key)
-        raise NotImplementedError
-      end
-
-      def update(data)
-        raise NotImplementedError
-      end
-
-      def close
-        raise NotImplementedError
-      end
-
-    end
-  end
-end

data/lib/generators/manyfold/authentication/templates/app/lib/request_context/session/browser_session.rb

@@ -1,27 +0,0 @@
-module RequestContext
-  module Session
-    class BrowserSession < RequestContext::Session::Base
-
-      def [](key)
-        session_store[key]
-      end
-
-      def []=(key, value)
-        session_store[key] = value
-      end
-
-      def delete(key)
-        session_store.delete(key)
-      end
-
-      def close
-        session_store.destroy
-      end
-
-      def update(data)
-        session_store.update(data)
-      end
-
-    end
-  end
-end