auth-lh 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9ccb8aa0e85dd54611331dedd7b7e51631add40
-  data.tar.gz: bfd6376a74440673409e69ad4e7e0b9c78d8ef8f
+  metadata.gz: 20c4858e61f37e391405761067381bba5eae7def
+  data.tar.gz: 15a5c9964e58316cd4a9721583163506e92661a4
 SHA512:
-  metadata.gz: f69a13bc0709097f39c175fb940969a020f1415479d604a98affdaab4eb75d51211be882bd58bf315085f52deb5eb3396515e8d6b6355f75b096bc1e6081f3e2
-  data.tar.gz: 2847a52f616eae25bacecf4185a2323ee1e0fb7b7edc59cd96c50155db1faea7aae34d5b904a37eb92751fb09fa88eb87c022386ef17ae9329a1309e7cb75f18
+  metadata.gz: ae4ebd327dee06bbc6fac8afd7cf22ab97d18a26ffe24b22dfa1b78248f8832a3033e673117ce787b70ab463caef0922a64363e2f39edb1c74f575d454a5265f
+  data.tar.gz: 903842eb9ac63dc87c15a82d1887ffb46943a58d7e9644aba403a8b70e5d4eb8e6e9a61f2d296f384d69f88e010eda8391bd18214da5a494f04cfe61e604f33f

data/CHANGELOG.md

@@ -85,3 +85,7 @@
 ## v0.3.2
 
 * Added new fields to entities
+
+## v0.4.0
+
+* Improved auth interface

data/lib/auth/lh/version.rb

@@ -1,5 +1,5 @@
 module Auth
   module Lh
-    VERSION = "0.3.2"
+    VERSION = "0.4.0"
   end
 end

data/lib/auth/lh.rb

@@ -1,7 +1,6 @@
 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'

data/lib/auth_lh/authentication.rb

@@ -25,16 +25,11 @@ module AuthLh
         all_external.find { |x| x.login == login.to_s }
       end
 
-      def find_current_user(session_token, remote_ip)
-        response = AuthLh.get_current_user(session_token, remote_ip)
+      def find_current_user(session_token, remote_ip, return_url=nil)
+        response = AuthLh.get_current_user(session_token, remote_ip, return_url)
 
-        if response.nil?
-          logged_user = nil
-          login_error = nil
-        else
-          logged_user = response.user
-          login_error = response.reason
-        end
+        logged_user = response.user
+        @login_url = response.login_url
 
         if logged_user
           user = find_or_create_by(login: logged_user.login)
@@ -45,20 +40,20 @@ module AuthLh
         end
       end
 
-      def login_url
-        if @login_error
-          "#{AuthLh.login_url}&reason=#{@login_error}"
-        else
-          AuthLh.login_url
-        end
+      def login_url(return_url=nil)
+        AuthLh.login_url(return_url)
+      end
+
+      def logout_url(return_url=nil)
+        AuthLh.logout_url(return_url)
       end
 
-      def logout_url
-        AuthLh.logout_url
+      def change_password_url(return_url=nil)
+        AuthLh.change_password_url(return_url)
       end
 
-      def change_password_url
-        AuthLh.change_password_url
+      def my_apps_url
+        AuthLh.my_apps_url
       end
     end
   end

data/lib/auth_lh/session_response.rb

@@ -1,6 +1,6 @@
 module AuthLh
   class SessionResponse
-    attr_accessor :user, :success, :reason
+    attr_accessor :user, :login_url
 
     def initialize(attributes={})
       attributes.each do |k,v|

data/lib/auth_lh.rb

@@ -1,7 +1,6 @@
 module AuthLh
   def self.configure(args={})
-    @endpoint = (args[:endpoint] || 'https://auth.lhconfort.com.ar')
-    @return_url = args[:return_url]
+    @endpoint = (args[:endpoint] || 'https://usuarios.lhconfort.com.ar')
     @application_code = args[:application_code]
     @access_token = args[:access_token]
   end
@@ -20,16 +19,6 @@ module AuthLh
     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
-    }
-
-    SessionResponse.new(result)
-  end
-
   def self.get_external_apps
     results = get_request('/api/external_apps')
     results.map { |r| ExternalApp.new(r) }
@@ -44,41 +33,57 @@ module AuthLh
     Role.new(get_request("/api/roles/#{code}"))
   end
 
-  def self.login_url
-    login_attempt = create_login_attempt
-    "#{@endpoint}/login?attempt=#{login_attempt.token}"
+  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.logout_url
-    "#{@endpoint}/logout?return_url=#{CGI::escape(@return_url)}"
+  def self.get_current_shop(ip_address=nil)
+    attrs = { ip: ip_address }
+    get_request('/api/whatsmyshop', attrs)['shop_codes']
   end
 
-  def self.change_password_url
-    "#{@endpoint}/change_password?return_url=#{CGI::escape(@return_url)}"
+  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.whatsmyshop(ip_address=nil)
-    attrs = { ip: ip_address }
-    get_request('/api/whatsmyshop', attrs)['shop_codes']
+  def self.logout_url(return_url=nil)
+    if return_url.present?
+      "#{@endpoint}/logout?return_url=#{CGI::escape(return_url)}"
+    else
+      "#{@endpoint}/logout"
+    end
   end
 
-  protected
+  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.create_login_attempt
-    LoginAttempt.new(post_request('/api/login_attempts', {
-      return_url: @return_url
-    }))
+  def self.my_apps_url
+    "#{@endpoint}"
   end
 
+  protected
+
   def self.get_request(action, params={})
     response = RestClient.get("#{@endpoint}#{action}", {params: params}.merge(auth_headers))
     JSON.parse(response.body)
   end
 
-  def self.post_request(action, params={})
-    JSON.parse(RestClient.post("#{@endpoint}#{action}", params, auth_headers))
-  end
-
   def self.auth_headers
     { authorization: "Token token=\"#{@access_token}\"" }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auth-lh
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Matias Hick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,7 +66,6 @@ files:
 - lib/auth/lh.rb
 - 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

data/lib/auth_lh/login_attempt.rb

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