auth-lh 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cca18c0e2386b3fa95def7a4b56c52474ac4107f
-  data.tar.gz: edec67d69f231720bd7153e2a8c548cf43503ef9
+  metadata.gz: f171e353e2b73eeeadaa15fb0c6207af068730d7
+  data.tar.gz: d89c2f58a357075dc3a7213c1eef7d13d2b9c729
 SHA512:
-  metadata.gz: f1f20859a52438ec69634d8fa9baa331e1a4bb552933978fcfa34dc0c2946749df6e80b394b64df12a94f29212f764823f06e6e1ad2d1b669f6ebdb14b55d2db
-  data.tar.gz: a67356f990905e57beabc31900f3c643be078ac2fa712e004a903c1b90e1b6bf6e4d5ce7511ea6aae024b0c4531cb15b5900752cd26894c4933ea30f07540a05
+  metadata.gz: 8621503c58bf186a0f3488acfe820b1e478eac7d1269ca946082c79608852e2b5a915b02189807693fdf14e428951eafe975394eb80b87b277fcced9a3e6f865
+  data.tar.gz: b1d891c93c64cb245cd2666c34a275179ca2ac5c89f02ccae49e85fcda1a4a4dc8092420480306ab932e17878e692db4e13082fc3888b866664fc8cb4b1ba432

data/CHANGELOG.md

@@ -157,3 +157,7 @@
 ## v0.11.2
 
 * Added attributes to user extended
+
+## v0.12.0
+
+* Added role management, improved authentication module, api moved to its own class

data/lib/auth/lh/version.rb

@@ -1,5 +1,5 @@
 module Auth
   module Lh
-    VERSION = "0.11.2"
+    VERSION = "0.12.0"
   end
 end

data/lib/auth/lh.rb

@@ -1,8 +1,9 @@
-require 'auth_lh'
+require 'auth_lh/api'
 require 'auth_lh/authentication'
 require 'auth_lh/external_app'
 require 'auth_lh/external_app_extended'
 require 'auth_lh/role'
+require 'auth_lh/role_management'
 require 'auth_lh/session_response'
 require 'auth_lh/shop'
 require 'auth_lh/user'

data/lib/auth_lh/api.rb

@@ -0,0 +1,112 @@
+module AuthLh
+  class Api
+    def self.configure(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)
+      User.new(get_request("/api/users/#{login}"))
+    end
+
+    def self.update_user(login, attrs={})
+      User.new(put_request("/api/users/#{login}", attrs))
+    end
+
+    def self.get_users(filters={})
+      results = get_request('/api/users', filters)
+      results.map { |r| User.new(r) }
+    end
+
+    def self.get_users_extended(filters={})
+      results = get_request('/api/users/extended', filters)
+      results.map { |r| UserExtended.new(r) }
+    end
+
+    def self.get_external_apps
+      results = get_request('/api/external_apps')
+      results.map { |r| ExternalAppExtended.new(r) }
+    end
+
+    def self.get_roles
+      results = get_request('/api/roles')
+      results.map { |r| Role.new(r) }
+    end
+
+    def self.get_role(code)
+      Role.new(get_request("/api/roles/#{code}"))
+    end
+
+    def self.get_current_user(session_token, remote_ip, return_url=nil)
+      result = get_request '/api/current_user', {
+        app_code: @application_code,
+        session_token: session_token,
+        remote_ip: remote_ip,
+        return_url: return_url
+      }
+
+      SessionResponse.new(result)
+    end
+
+    def self.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)
+      if return_url.present?
+        "#{@endpoint}/login?return_url=#{CGI::escape(return_url)}"
+      else
+        "#{@endpoint}/login"
+      end
+    end
+
+    def self.logout_url(return_url=nil)
+      if return_url.present?
+        "#{@endpoint}/logout?return_url=#{CGI::escape(return_url)}"
+      else
+        "#{@endpoint}/logout"
+      end
+    end
+
+    def self.change_password_url(return_url=nil)
+      if return_url.present?
+        "#{@endpoint}/change_password?return_url=#{CGI::escape(return_url)}"
+      else
+        "#{@endpoint}/change_password"
+      end
+    end
+
+    def self.my_apps_url
+      "#{@endpoint}"
+    end
+
+    protected
+
+    def self.get_request(action, params={})
+      response = RestClient.get("#{@endpoint}#{action}", {params: params}.merge(auth_headers))
+
+      if response.body == 'null'
+        nil
+      else
+        JSON.parse(response.body)
+      end
+    end
+
+    def self.put_request(action, params={})
+      response = RestClient.put("#{@endpoint}#{action}", params, auth_headers)
+
+      if response.body == 'null'
+        nil
+      else
+        JSON.parse(response.body)
+      end
+    end
+
+    def self.auth_headers
+      { authorization: "Token token=\"#{@access_token}\"" }
+    end
+  end
+end

data/lib/auth_lh/authentication.rb

@@ -16,17 +16,47 @@ module AuthLh
       @auth_user = val
     end
 
+    def has_role?(r_code)
+      role_codes.include?(r_code.to_s)
+    end
+
+    def has_some_role?(r_codes)
+      r_codes.any? { |r_code|
+        role_codes.include?(r_code.to_s)
+      }
+    end
+
+    def has_all_roles?(r_codes)
+      r_codes.all? { |r_code|
+        role_codes.include?(r_code.to_s)
+      }
+    end
+
     module ClassMethods
       def all_external
-        AuthLh.get_users
+        @cached_users ||= AuthLh.get_users({ pagination: 'false' })
+      end
+
+      def all_external_with_role(role_code)
+        all_external.find_all { |x| x.has_role?(role_code) }
+      end
+
+      def all_external_with_some_role(role_codes)
+        all_external.find_all { |x|
+          role_codes.any? { |role_code| x.has_role?(role_code) }
+        }
       end
 
       def find_external(login)
         all_external.find { |x| x.login == login.to_s }
       end
 
+      def clear_cache!
+        @cached_users = nil
+      end
+
       def find_current_user(session_token, remote_ip, return_url=nil)
-        response = AuthLh.get_current_user(session_token, remote_ip, return_url)
+        response = AuthLh::Api.get_current_user(session_token, remote_ip, return_url)
 
         logged_user = response.user
         @destination_url = response.destination_url
@@ -44,20 +74,20 @@ module AuthLh
         if @destination_url.present?
           @destination_url
         else
-          AuthLh.login_url(return_url)
+          AuthLh::Api.login_url(return_url)
         end
       end
 
       def logout_url(return_url=nil)
-        AuthLh.logout_url(return_url)
+        AuthLh::Api.logout_url(return_url)
       end
 
       def change_password_url(return_url=nil)
-        AuthLh.change_password_url(return_url)
+        AuthLh::Api.change_password_url(return_url)
       end
 
       def my_apps_url
-        AuthLh.my_apps_url
+        AuthLh::Api.my_apps_url
       end
     end
   end

data/lib/auth_lh/role_management.rb

@@ -0,0 +1,38 @@
+module AuthLh
+  module RoleManagement
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    def auth_role
+      if @auth_role.nil?
+        @auth_role = self.class.find_external(code)
+      end
+
+      @auth_role
+    end
+
+    def auth_role=(val)
+      @auth_role = val
+    end
+
+    module ClassMethods
+      def all_external
+        unless @cache_auth_roles
+          @cached_roles = AuthLh::Api.get_roles
+        end
+
+        @cached_roles
+      end
+
+      def find_external(code)
+        all_external.find { |x| x.code == code.to_s }
+      end
+
+      def clear_cache!
+        @cached_roles = nil
+      end
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auth-lh
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Matias Hick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,11 +64,12 @@ files:
 - README.md
 - lib/auth/lh.rb
 - lib/auth/lh/version.rb
-- lib/auth_lh.rb
+- lib/auth_lh/api.rb
 - lib/auth_lh/authentication.rb
 - lib/auth_lh/external_app.rb
 - lib/auth_lh/external_app_extended.rb
 - lib/auth_lh/role.rb
+- lib/auth_lh/role_management.rb
 - lib/auth_lh/session_response.rb
 - lib/auth_lh/shop.rb
 - lib/auth_lh/user.rb

data/lib/auth_lh.rb

@@ -1,110 +0,0 @@
-module AuthLh
-  def self.configure(args={})
-    @endpoint = (args[:endpoint] || 'https://usuarios.lhconfort.com.ar')
-    @application_code = args[:application_code]
-    @access_token = args[:access_token]
-  end
-
-  def self.get_user(code_or_login)
-    User.new(get_request("/api/users/#{code_or_login}"))
-  end
-
-  def self.update_user(code_or_login, attrs={})
-    User.new(put_request("/api/users/#{code_or_login}", attrs))
-  end
-
-  def self.get_users(filters={})
-    results = get_request('/api/users', filters)
-    results.map { |r| User.new(r) }
-  end
-
-  def self.get_users_extended(filters={})
-    results = get_request('/api/users/extended', filters)
-    results.map { |r| UserExtended.new(r) }
-  end
-
-  def self.get_external_apps
-    results = get_request('/api/external_apps')
-    results.map { |r| ExternalAppExtended.new(r) }
-  end
-
-  def self.get_roles
-    results = get_request('/api/roles')
-    results.map { |r| Role.new(r) }
-  end
-
-  def self.get_role(code)
-    Role.new(get_request("/api/roles/#{code}"))
-  end
-
-  def self.get_current_user(session_token, remote_ip, return_url=nil)
-    result = get_request '/api/current_user', {
-      app_code: @application_code,
-      session_token: session_token,
-      remote_ip: remote_ip,
-      return_url: return_url
-    }
-
-    SessionResponse.new(result)
-  end
-
-  def self.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)
-    if return_url.present?
-      "#{@endpoint}/login?return_url=#{CGI::escape(return_url)}"
-    else
-      "#{@endpoint}/login"
-    end
-  end
-
-  def self.logout_url(return_url=nil)
-    if return_url.present?
-      "#{@endpoint}/logout?return_url=#{CGI::escape(return_url)}"
-    else
-      "#{@endpoint}/logout"
-    end
-  end
-
-  def self.change_password_url(return_url=nil)
-    if return_url.present?
-      "#{@endpoint}/change_password?return_url=#{CGI::escape(return_url)}"
-    else
-      "#{@endpoint}/change_password"
-    end
-  end
-
-  def self.my_apps_url
-    "#{@endpoint}"
-  end
-
-  protected
-
-  def self.get_request(action, params={})
-    response = RestClient.get("#{@endpoint}#{action}", {params: params}.merge(auth_headers))
-
-    if response.body == 'null'
-      nil
-    else
-      JSON.parse(response.body)
-    end
-  end
-
-  def self.put_request(action, params={})
-    response = RestClient.put("#{@endpoint}#{action}", params, auth_headers)
-
-    if response.body == 'null'
-      nil
-    else
-      JSON.parse(response.body)
-    end
-  end
-
-  def self.auth_headers
-    { authorization: "Token token=\"#{@access_token}\"" }
-  end
-end