auth-lh 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48376fcc85242fcfd3079c282e64b429d0ddc8cd
-  data.tar.gz: 6b6cb95697decb7b272e04ad98941c94472e5645
+  metadata.gz: dd7e856739f109695f9c99a36b55663fe99be636
+  data.tar.gz: d378af2ef8091f2b6561fb9f81b5a5466fa0d32b
 SHA512:
-  metadata.gz: 599864c095c43e7bcc0568e0acf4c88edb9f90adc36ec65b90393fdd08d288d9843995fdfd27c4f3d9fdca9e6774400199b6189b05f0dd2fea6ce228e3d07c01
-  data.tar.gz: 50b0cb09fc6387118b0e731dd4a4945fde6d3c5946dedbd8ece55b10e4f8fdcf27f0a1933cdf207121629e09d2d4a1e7d20c721a51914b44af9402ecb0ec0d0d
+  metadata.gz: ae70f8c99b839801959bc522e11ae90d0d8a2f0b46396da6a8ca8cb4d2fb632e58e4ccc40a31ea347ad755ea5053656ee1e24679ff2b48372d92143951b58de8
+  data.tar.gz: d13e489626c0845ac357f83b9f3923f0bc9e7250e0eee87f1533cf586b76165d7154aed81be33bcdb40be0e30e9b68eff75425d0234de813d9fbbf74b6e1aba1

data/CHANGELOG.md

@@ -49,3 +49,7 @@
 ## v0.1.0
 
 * Authentication methods put into module
+
+## v0.1.1
+
+* API Reorganization

data/lib/auth/lh/version.rb

@@ -1,5 +1,5 @@
 module Auth
   module Lh
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/auth/lh.rb

@@ -2,8 +2,10 @@ require 'auth_lh'
 require 'auth_lh/authentication'
 require 'auth_lh/external_app'
 require 'auth_lh/login_attempt'
+require 'auth_lh/role'
 require 'auth_lh/session_response'
 require 'auth_lh/user'
+require 'auth_lh/user_extended'
 
 require 'auth/lh/version'
 

data/lib/auth_lh/authentication.rb

@@ -29,9 +29,9 @@ module AuthLh
         all_external.find { |x| x.login == login.to_s }
       end
 
-      def find_logged_user(session_token, remote_ip)
+      def find_current_user(session_token, remote_ip)
         if (session_token.present? && (@session_token != session_token))
-          response = AuthLh.logged_user(session_token, remote_ip)
+          response = AuthLh.get_current_user(session_token, remote_ip)
 
           if response.nil?
             @cached_logged_user = nil

data/lib/auth_lh/role.rb

@@ -0,0 +1,11 @@
+module AuthLh
+  class Role
+    attr_accessor :code, :name
+
+    def initialize(attributes={})
+      attributes.each do |k,v|
+        self.send("#{k}=", v)
+      end
+    end
+  end
+end

data/lib/auth_lh/user.rb

@@ -1,8 +1,7 @@
 module AuthLh
   class User
-    attr_accessor :code, :email, :jabber, :name, :login, :password_digest,
-      :password_expired, :enabled, :is_admin, :shop_code, :allow_remote_access,
-      :last_activity, :app_codes
+    attr_accessor :code, :email, :jabber, :name, :login,
+      :shop_code, :enabled, :role_codes
 
     def initialize(attributes={})
       attributes.each do |k,v|

data/lib/auth_lh/user_extended.rb

@@ -0,0 +1,14 @@
+module AuthLh
+  class UserExtended
+    attr_accessor :code, :email, :jabber, :name, :login, :password_digest,
+      :password_expired, :enabled, :is_admin, :shop_code, :allow_remote_access,
+      :session_timeout, :app_codes, :role_codes
+
+    def initialize(attributes={})
+      attributes.each do |k,v|
+        self.send("#{k}=", v)
+      end
+    end
+  end
+end
+

data/lib/auth_lh.rb

@@ -6,8 +6,22 @@ module AuthLh
     @access_token = args[:access_token]
   end
 
-  def self.logged_user(session_token, remote_ip)
-    result = get_request '/logged_user', {
+  def self.get_user(code_or_login)
+    User.new(get_request("/api/users/#{code_or_login}"))
+  end
+
+  def self.get_users(filters={})
+    results = get_request('/api/users', filters)
+    results.map { |r| User.new(r) }
+  end
+
+  def self.get_users_extended
+    results = get_request('/api/users/extended')
+    results.map { |r| UserExtended.new(r) }
+  end
+
+  def self.get_current_user(session_token, remote_ip)
+    result = get_request '/api/current_user', {
       app_code: @application_code,
       session_token: session_token,
       remote_ip: remote_ip
@@ -16,6 +30,16 @@ module AuthLh
     SessionResponse.new(result)
   end
 
+  def self.get_external_apps
+    results = get_request('/api/external_apps')
+    results.map { |r| ExternalApp.new(r) }
+  end
+
+  def self.get_roles
+    results = get_request('/api/roles')
+    results.map { |r| Role.new(r) }
+  end
+
   def self.login_url
     login_attempt = create_login_attempt
     "#{@endpoint}/login?attempt=#{login_attempt.token}"
@@ -25,39 +49,12 @@ module AuthLh
     "#{@endpoint}/logout?return=#{CGI::escape(@return_url)}"
   end
 
-  def self.get_user(code_or_login)
-    User.new(get_request("/api/users/#{code_or_login}"))
-  end
-
-  def self.get_users(filters={})
-    results = get_request("/api/users", filters)
-    results.map { |r| User.new(r) }
-  end
-
-  def self.get_all_users
-    results = get_request("/api/users/all")
-    results.map { |r| User.new(r) }
-  end
-
-  def self.get_external_apps
-    results = get_request("/api/external_apps")
-    results.map { |r| ExternalApp.new(r) }
-  end
-
-  def self.get_external_app(code_or_name)
-    ExternalApp.new(get_request("/api/external_apps/#{code_or_name}"))
-  end
-
   protected
 
   def self.create_login_attempt
-    params = { app_code: @application_code }
-
-    if @return_url
-      params[:return_url] = @return_url
-    end
-
-    LoginAttempt.new(post_request('/login_attempts', params))
+    LoginAttempt.new(post_request('/api/login_attempts', {
+      return_url: @return_url
+    }))
   end
 
   def self.get_request(action, params={})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auth-lh
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Matias Hick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2014-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,8 +68,10 @@ files:
 - lib/auth_lh/authentication.rb
 - lib/auth_lh/external_app.rb
 - lib/auth_lh/login_attempt.rb
+- lib/auth_lh/role.rb
 - lib/auth_lh/session_response.rb
 - lib/auth_lh/user.rb
+- lib/auth_lh/user_extended.rb
 homepage: https://github.com/unformattmh/auth-lh
 licenses:
 - MIT