auth-lh 0.30.0 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fa5f3d2a3422c1b745ef86e6433d07b9dceed3a
-  data.tar.gz: 9c9936633084f85bacb6a953aa7209d4b86320aa
+  metadata.gz: eb4241bf40e9b6644cbb77638cf083fe9161a675
+  data.tar.gz: de2e76baef61b694fca69931cc30866d13909b96
 SHA512:
-  metadata.gz: 196279305e6d72f47df50660261a1c47cad024dd582b2431fc85a51e733884a25ffe2db6858582f6c879d2d6c9a8c3d3c5a209cacb13e7ecd800a587a6d6f0aa
-  data.tar.gz: f6a49d56b789e80b7b07886676ff040f7bb160885d316f97e8c463edad854306ee0122c3c74d08f3af574c1b23702abed1ef847c934054cd75f7864bb505a3cd
+  metadata.gz: 58b3ca6c33c947982634c3b64a81c02c57d0055449c51eb55fa96facba9ee3041049e1fdd62f6a3d35a1c07b6f713d08a884a8fbdbe135726714816e371f1d50
+  data.tar.gz: aa3115b2f40894959d9bc1ceb695bb000a0db91ed82995a0bc784b4126f68eee73a391ed85a737d3a6ed2a71bafe9e1ba3b5f7939304c846cff6fcdfb9a33c5e

data/CHANGELOG.md

@@ -261,3 +261,7 @@
 ## v0.30.0
 
 * Fixed change password url
+
+## v1.0
+
+* Refactor on auth, static methods moved to class, added module for authentication.

data/lib/auth/lh.rb

@@ -1,4 +1,5 @@
 require 'auth_lh/api'
+require 'auth_lh/auth_management'
 require 'auth_lh/external_app'
 require 'auth_lh/role'
 require 'auth_lh/role_management'

data/lib/auth/lh/version.rb

@@ -1,5 +1,5 @@
 module Auth
   module Lh
-    VERSION = "0.30.0"
+    VERSION = "1.0"
   end
 end

data/lib/auth_lh/api.rb

@@ -1,44 +1,44 @@
 module AuthLh
   class Api
-    def self.configure(args={})
+    def initialize(args={})
       @endpoint = (args[:endpoint] || 'https://usuarios.lhconfort.com.ar')
       @application_code = args[:application_code]
       @access_token = args[:access_token]
     end
 
-    def self.get_user(login)
+    def get_user(login)
       User.new(get_request("/api/users/#{CGI::escape(login)}"))
     end
 
-    def self.update_user(login, attrs={})
+    def update_user(login, attrs={})
       User.new(put_request("/api/users/#{CGI::escape(login)}", attrs))
     end
 
-    def self.get_users(filters={})
+    def get_users(filters={})
       results = get_request('/api/users', filters)
       results.map { |r| User.new(r) }
     end
 
-    def self.get_users_extended(filters={})
+    def get_users_extended(filters={})
       results = get_request('/api/users/extended', filters)
       results.map { |r| UserExtended.new(r) }
     end
 
-    def self.get_external_apps
+    def get_external_apps
       results = get_request('/api/external_apps')
       results.map { |r| ExternalAppExtended.new(r) }
     end
 
-    def self.get_roles
+    def get_roles
       results = get_request('/api/roles')
       results.map { |r| Role.new(r) }
     end
 
-    def self.get_role(role_id)
+    def get_role(role_id)
       Role.new(get_request("/api/roles/#{role_id}"))
     end
 
-    def self.get_current_user(session_token, remote_ip, return_url=nil)
+    def get_current_user(session_token, remote_ip, return_url=nil)
       result = get_request '/api/current_user', {
         app_code: @application_code,
         session_token: session_token,
@@ -49,13 +49,13 @@ module AuthLh
       SessionResponse.new(result)
     end
 
-    def self.get_current_shop(ip_address=nil)
+    def get_current_shop(ip_address=nil)
       attrs = { ip: ip_address }
       response = get_request('/api/current_shop', attrs)
       response.nil? ? nil : Shop.new(response)
     end
 
-    def self.login_url(return_url=nil)
+    def login_url(return_url=nil)
       if return_url.present?
         "#{@endpoint}/login?return_url=#{CGI::escape(return_url)}"
       else
@@ -63,7 +63,7 @@ module AuthLh
       end
     end
 
-    def self.logout_url(return_url=nil)
+    def logout_url(return_url=nil)
       if return_url.present?
         "#{@endpoint}/logout?return_url=#{CGI::escape(return_url)}"
       else
@@ -71,7 +71,7 @@ module AuthLh
       end
     end
 
-    def self.change_password_url(return_url=nil)
+    def change_password_url(return_url=nil)
       if return_url.present?
         "#{@endpoint}/current_user/password/edit?return_url=#{CGI::escape(return_url)}"
       else
@@ -79,13 +79,9 @@ module AuthLh
       end
     end
 
-    def self.my_apps_url
-      "#{@endpoint}"
-    end
-
     protected
 
-    def self.get_request(action, params={})
+    def get_request(action, params={})
       response = RestClient.get("#{@endpoint}#{action}", {params: params}.merge(auth_headers))
 
       if response.body == 'null'
@@ -95,7 +91,7 @@ module AuthLh
       end
     end
 
-    def self.put_request(action, params={})
+    def put_request(action, params={})
       response = RestClient.put("#{@endpoint}#{action}", params, auth_headers)
 
       if response.body == 'null'
@@ -105,7 +101,7 @@ module AuthLh
       end
     end
 
-    def self.auth_headers
+    def auth_headers
       { authorization: "Token token=\"#{@access_token}\"" }
     end
   end

data/lib/auth_lh/auth_management.rb

@@ -0,0 +1,48 @@
+module AuthLh
+  module AuthManagement
+    def set_current_user
+      session_response = @auth_api.get_current_user(cookies[:session_token], request.remote_ip, request.original_url)
+
+      if session_response.user
+        @current_user = ::User.find_or_create_by(login: session_response.user.login)
+        @current_user.auth_user = session_response.user
+      end
+
+      if session_response.destination_url.present?
+        redirect_to session_response.destination_url
+      end
+    end
+
+    def current_user
+      @current_user
+    end
+
+    def set_current_shop
+      @current_shop = @auth_api.get_current_shop(request.remote_ip)
+    end
+
+    def current_shop
+      @current_shop
+    end
+
+    def check_access_grants
+      if current_user
+        if !current_user.can_access?(params[:controller], params[:action])
+          if request.xhr?
+            render status: :forbidden
+          else
+            render file: 'public/403.html', layout: false
+          end
+        end
+      end
+    end
+
+    def logout_url
+      @auth_api.logout_url(request.protocol + request.host_with_port)
+    end
+
+    def change_password_url
+      @auth_api.change_password_url(request.original_url)
+    end
+  end
+end

data/lib/auth_lh/user_management.rb

@@ -22,7 +22,7 @@ module AuthLh
 
     module ClassMethods
       def all_external
-        @cached_users ||= AuthLh::Api.get_users({ pagination: 'false' })
+        @cached_users ||= auth_api.get_users({ pagination: 'false' })
       end
 
       def all_external_with_role(role_id)
@@ -31,7 +31,13 @@ module AuthLh
 
       def all_external_with_some_role(role_ids)
         all_external.find_all { |x|
-          role_ids.any? { |role_id| x.has_role?(role_id) }
+          role_ids.any? { |role_id| x.has_some_role?(role_id) }
+        }
+      end
+
+      def all_external_with_all_roles(role_ids)
+        all_external.find_all { |x|
+          role_ids.any? { |role_id| x.has_all_roles?(role_id) }
         }
       end
 
@@ -39,43 +45,32 @@ module AuthLh
         all_external.find { |x| x.login == login.to_s }
       end
 
-      def clear_cache!
-        @cached_users = nil
+      def find_external_with_role(role_id)
+        all_external_with_role(role_id).first
       end
 
-      def find_current_user(session_token, remote_ip, return_url=nil)
-        response = AuthLh::Api.get_current_user(session_token, remote_ip, return_url)
-
-        logged_user = response.user
-        @destination_url = response.destination_url
+      def find_external_with_some_role(role_ids)
+        all_external_with_some_role(role_ids).first
+      end
 
-        if logged_user
-          user = find_or_create_by(login: logged_user.login)
-          user.auth_user = logged_user
-          user
-        else
-          nil
-        end
+      def find_external_with_all_roles(role_ids)
+        all_external_with_all_roles(role_ids).first
       end
 
-      def login_url(return_url=nil)
-        if @destination_url.present?
-          @destination_url
-        else
-          AuthLh::Api.login_url(return_url)
-        end
+      def with_role(role_id)
+        all.to_a.find_all { |x| x.has_role?(role_id) }
       end
 
-      def logout_url(return_url=nil)
-        AuthLh::Api.logout_url(return_url)
+      def with_some_role(role_ids)
+        all.to_a.find_all { |x| x.has_some_role?(role_ids) }
       end
 
-      def change_password_url(return_url=nil)
-        AuthLh::Api.change_password_url(return_url)
+      def with_all_roles(role_ids)
+        all.to_a.find_all { |x| x.has_all_roles?(role_ids) }
       end
 
-      def my_apps_url
-        AuthLh::Api.my_apps_url
+      def clear_cache!
+        @cached_users = nil
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auth-lh
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: '1.0'
 platform: ruby
 authors:
 - Matias Hick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,6 +65,7 @@ files:
 - lib/auth/lh.rb
 - lib/auth/lh/version.rb
 - lib/auth_lh/api.rb
+- lib/auth_lh/auth_management.rb
 - lib/auth_lh/external_app.rb
 - lib/auth_lh/role.rb
 - lib/auth_lh/role_management.rb