tzispa_helpers 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff5ee9fd3dbe5599f7ba42bace28922feb0c8ce4
-  data.tar.gz: ddfc4699dd6ee7e4b84a5cb0dbf122d4f6531862
+  metadata.gz: 0102c92ceaff055b26a8547b791bc900c9e1a5b8
+  data.tar.gz: 28341d8615fbaa60ed0d180a805ec032f2d4614e
 SHA512:
-  metadata.gz: 30ad6c7d0682f26e51958570daeae58ab0e3a8da45a2ecd4749b0ec0193a6761e40959aa9600dc38513aa6d2a6490ce95954b05d0ce228d363860cd02a5aa7b1
-  data.tar.gz: df205ac43b8b2be62d400379e298bf42c9539c30edb733faa037977e7fff742e9cb89bb9f238898863d5a050b18bed42c20a4e0d67142f28df5e0a26d8027b3b
+  metadata.gz: c26223806ffd4b4600ed41e19dbb27d452290ff38ea0fc3e91d18fa7aa9283ed7a402ae6d7d4569b1d0117fb215c7e8b446c7152dedc6969d85d7be1c166281b
+  data.tar.gz: cd4aa19893ccf96fe2a87fbb6a1fb0103a915ae1d33523b4ee0f7f672b99a761f8a4aa5ee6f6fb596a590b76b54e33f12cc4a52a2a6e3463584d519a98d08d60

data/lib/tzispa/helpers/macro_field.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'tzispa/utils/string'
 require 'json'
+require 'tzispa_utils'
 require_relative 'text'
 
 module Tzispa

data/lib/tzispa/helpers/request.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'tzispa/utils/string'
 require 'json'
+require 'tzispa_utils'
 require_relative 'macro_field'
 
 module Tzispa

data/lib/tzispa/helpers/security.rb

@@ -45,23 +45,6 @@ module Tzispa
         hashed == hash_password(pwd, salt)
       end
 
-      class Identity
-        attr_reader :id, :token
-
-        def initialize(id, secret)
-          @id = id
-          @token = generate_token id, secret
-        end
-
-        def valid?(secret)
-          @token == Identity.generate_token(@id, secret)
-        end
-
-        def self.generate_token(value, salt)
-          Digest::SHA1.hexdigest "___#{value}_#{salt}__token__"
-        end
-      end
-
     end
   end
 end

data/lib/tzispa/helpers/session.rb

@@ -9,11 +9,10 @@ module Tzispa
 
       SESSION_LAST_ACCESS   = :__last_access
       SESSION_ID            = :__session_id
-      SESSION_AUTH_USER     = :__auth__user
       GLOBAL_MESSAGE_FLASH  = :__global_message_flash
 
       def init_session
-        generate_session_id if config&.sessions&.enabled && !session?
+        generate_session_id if config.sessions&.enabled && !session?
       end
 
       def set_last_access
@@ -32,21 +31,7 @@ module Tzispa
         !session[SESSION_ID].nil? && (session[SESSION_ID] == session.id)
       end
 
-      def logged?
-        session? && login
-      end
-
-      def login=(user)
-        session[SESSION_AUTH_USER] = user unless user.nil?
-      end
-
-      def login
-        session[SESSION_AUTH_USER]
-      end
-
-      def logout
-        session.delete(SESSION_AUTH_USER)
-      end
+      private
 
       def generate_session_id
         SecureRandom.uuid.tap do |uuid|

data/lib/tzispa/helpers/session_auth.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'digest'
+
+module Tzispa
+  module Helpers
+    module SessionAuth
+
+      SESSION_AUTH_USER = :__auth__user
+
+      class Authentication
+        attr_reader :id
+
+        def initialize(id, secret)
+          @id = id
+          @token = generate_token secret
+        end
+
+        def valid?(secret)
+          @token == generate_token(secret)
+        end
+
+        private
+
+        attr_reader :token
+
+        def generate_token(secret)
+          Digest::MD5.hexdigest "___#{id}__authtoken__#{secret}_"
+        end
+      end
+
+      def session_auth?
+        return unless context.session?
+        ident = context.session[SESSION_AUTH_USER]
+        ident&.valid?(context.session.id)
+      end
+
+      def session_auth
+        ident = context.session[SESSION_AUTH_USER]
+        ident.id if session_auth?
+      end
+      alias session_login session_auth
+
+      def session_login(user)
+        context.session[SESSION_AUTH_USER] = Authentication.new(user, context.session.id)
+      end
+
+      def session_logout
+        context.session.delete(SESSION_AUTH_USER)
+      end
+
+      def login_redirect
+        login_layout = context.layout_path(context.config.login_layout.to_sym)
+        context.redirect(login_layout, true, context.response) if login_redirect?
+      end
+
+      def login_redirect?
+        !session_auth? && (context.layout != context.config.login_layout)
+      end
+
+      def unauthorized_but_auth
+        context.not_authorized unless session_auth?
+      end
+
+    end
+  end
+end

data/lib/tzispa/helpers/version.rb

@@ -3,7 +3,7 @@
 module Tzispa
   module Helpers
 
-    VERSION  = '0.3.4'
+    VERSION  = '0.3.5'
     NAME     = 'Tzispa Helpers'
     GEM_NAME = 'tzispa_helpers'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa_helpers
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.5
 description: Module Helpers for Tzispa framework
 email:
 - japinero@area-integral.com
@@ -67,7 +67,6 @@ files:
 - lib/tzispa/helpers/hooks/after.rb
 - lib/tzispa/helpers/hooks/before.rb
 - lib/tzispa/helpers/html.rb
-- lib/tzispa/helpers/login.rb
 - lib/tzispa/helpers/macro_field.rb
 - lib/tzispa/helpers/mime.rb
 - lib/tzispa/helpers/pattern.rb
@@ -80,6 +79,7 @@ files:
 - lib/tzispa/helpers/services/error_view.rb
 - lib/tzispa/helpers/services/send_file.rb
 - lib/tzispa/helpers/session.rb
+- lib/tzispa/helpers/session_auth.rb
 - lib/tzispa/helpers/session_flash_bag.rb
 - lib/tzispa/helpers/sign_requirer.rb
 - lib/tzispa/helpers/text.rb
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Helpers for Tzispa

data/lib/tzispa/helpers/login.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Tzispa
-  module Helpers
-    module Login
-
-      def login_redirect
-        context.redirect(context.layout_path(context.config.login_layout.to_sym), true, context.response) if login_redirect?
-      end
-
-      def login_redirect?
-        !context.logged? && (context.layout != context.config.login_layout)
-      end
-
-      def unauthorized_but_logged
-        context.not_authorized unless context.logged?
-      end
-
-    end
-  end
-end