onelogin 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35fa6e59d712be2d32a0f0226cb26748c38c5aef
-  data.tar.gz: 4bf1cd249892f17c680acc337ea57168582d9e90
+  metadata.gz: 7fca4bd8901e5234c12acd2fcbf85179634aeb25
+  data.tar.gz: 8b7e7cb38fac5a432812cd12705c55e4539f4fac
 SHA512:
-  metadata.gz: edf073e14e440e6939e24088ca13876fa2724a9a7a4c277ed7c5d731ab913285a238beac455010fe7afeb8b7570b748d677e1db8ac74cb77d23ba3a213933025
-  data.tar.gz: d63150971c087549b2cd679c527475fcbb9e47c7b5b845da299d79afef349e44c4f5caaee7f01a2de0973488fd41ff89f8249c9c56fcc1759ce74e1bdf80e65c
+  metadata.gz: 671935da852605381ade21ea1ee8dffb13f788a6ee50af30842a7e4edc5edba97b30a112280f69a9ec817c73b20f6e65eec189e95cc1b3c23c47a9d86a25bc3c
+  data.tar.gz: bc7473a57abbbcb9fd20637c589d32f57e27f29089dd1af4e9d641193c019c14267c331ea6aad91c8a1d0368029a9eebfd0c84928d5d177bc5ae39f400a2b1c7

data/README.md

@@ -41,6 +41,7 @@ If you don't have an account you can [sign up for a free developer account here]
 |client_secret|Required: A valid OneLogin API client_secret|
 |region| Optional: `us` or `eu`. Defaults to `us`   |
 |max_results| Optional: Defaults to 1000  |
+|timeout| Optional: Defaults to 60 (requires httparty > 0.16.2) |
 
 ```ruby
 require 'onelogin'

data/examples/all-users-to-csv.rb

@@ -12,7 +12,8 @@ require 'onelogin'
 client = OneLogin::Api::Client.new(
     client_id: 'ONELOGIN_CLIENT_ID',
     client_secret:'ONELOGIN_CLIENT_SECRET',
-    region: 'us'
+    region: 'us',
+    max_results: 50000
 )
 
 attribute_names = ['id', 'external_id', 'email', 'username', 'firstname', 'lastname', 'distinguished_name',

data/examples/last-app-user-login-to-csv.rb

@@ -34,7 +34,8 @@ end.parse!
 client = OneLogin::Api::Client.new(
   client_id: 'ONELOGIN_CLIENT_ID_GOES_HERE',
   client_secret: 'ONELOGIN_CLIENT_SECRET_GOES_HERE',
-  region: 'us'
+  region: 'us',
+  max_results: 50000
 )
 
 counter = 0

data/lib/onelogin/api/apiexception.rb

@@ -0,0 +1,10 @@
+module OneLogin
+  module Api
+    class ApiException < Exception
+      def initialize(message, code)
+        super(message)
+        @code = code
+      end
+    end
+  end
+end

data/lib/onelogin/api/client.rb

@@ -1,6 +1,7 @@
 require 'onelogin/version'
-require 'onelogin/api/util'
+require 'onelogin/api/apiexception'
 require 'onelogin/api/cursor'
+require 'onelogin/api/util'
 require 'json'
 require 'httparty'
 require 'nokogiri'
@@ -38,6 +39,10 @@ module OneLogin
         @region = options[:region] || 'us'
         @max_results = options[:max_results] || 1000
 
+        if options[:timeout] and defined? self.class.default_timeout
+          self.class.default_timeout options[:timeout]
+        end
+
         if options[:proxy_host]
           self.class.http_proxy options[:proxy_host], options[:proxy_port], options[:proxy_user], options[:proxy_pass]
         end
@@ -59,40 +64,6 @@ module OneLogin
         @error_attribute = nil
       end
 
-      def extract_error_message_from_response(response)
-        message = ''
-        content = JSON.parse(response.body)
-        if content && content.has_key?('status')
-          status = content['status']
-          if status.has_key?('message')
-            if status['message'].instance_of?(Hash)
-              if status['message'].has_key?('description')
-                message = status['message']['description']
-              end
-            else
-              message = status['message']
-            end
-          elsif status.has_key?('type')
-            message = status['type']
-          end
-        end
-        message
-      end
-
-      def extract_error_attribute_from_response(response)
-        attribute = nil
-        content = JSON.parse(response.body)
-        if content && content.has_key?('status')
-          status = content['status']
-          if status.has_key?('message') && status['message'].instance_of?(Hash)
-            if status['message'].has_key?('attribute')
-              attribute = status['message']['attribute']
-            end
-          end
-        end
-        attribute
-      end
-
       def expired?
         Time.now.utc > @expiration
       end
@@ -202,11 +173,16 @@ module OneLogin
 
           if response.code == 200
             json_data = JSON.parse(response.body)
-            token = OneLogin::Api::Models::OneLoginToken.new(json_data)
-            @access_token = token.access_token
-            @refresh_token = token.refresh_token
-            @expiration = token.created_at + token.expires_in
-            return token
+            if json_data.has_key?('status')
+              @error = json_data['status']['code'].to_s
+              @error_description = extract_error_message_from_response(response)
+            else
+              token = OneLogin::Api::Models::OneLoginToken.new(json_data)
+              @access_token = token.access_token
+              @refresh_token = token.refresh_token
+              @expiration = token.created_at + token.expires_in
+              return token
+            end
           else
             @error = response.code.to_s
             @error_description = extract_error_message_from_response(response)
@@ -244,11 +220,16 @@ module OneLogin
 
           if response.code == 200
             json_data = JSON.parse(response.body)
-            token = OneLogin::Api::Models::OneLoginToken.new(json_data)
-            @access_token = token.access_token
-            @refresh_token = token.refresh_token
-            @expiration = token.created_at + token.expires_in
-            return token
+            if json_data.has_key?('status')
+              @error = json_data['status']['code'].to_s
+              @error_description = extract_error_message_from_response(response)
+            else
+              token = OneLogin::Api::Models::OneLoginToken.new(json_data)
+              @access_token = token.access_token
+              @refresh_token = token.refresh_token
+              @expiration = token.created_at + token.expires_in
+              return token
+            end
           else
             @error = response.code.to_s
             @error_description = extract_error_message_from_response(response)
@@ -1140,13 +1121,13 @@ module OneLogin
         prepare_token
 
         begin
-        options = {
-          model: OneLogin::Api::Models::EventType,
-          headers: authorized_headers,
-          max_results: @max_results
-        }
+          options = {
+            model: OneLogin::Api::Models::EventType,
+            headers: authorized_headers,
+            max_results: @max_results
+          }
 
-        return Cursor.new(self.class, url_for(GET_EVENT_TYPES_URL), options)
+          return Cursor.new(self.class, url_for(GET_EVENT_TYPES_URL), options)
 
         rescue Exception => e
           @error = '500'
@@ -1168,14 +1149,14 @@ module OneLogin
         prepare_token
 
         begin
-        options = {
-          model: OneLogin::Api::Models::Event,
-          headers: authorized_headers,
-          max_results: @max_results,
-          params: params
-        }
+          options = {
+            model: OneLogin::Api::Models::Event,
+            headers: authorized_headers,
+            max_results: @max_results,
+            params: params
+          }
 
-        return Cursor.new(self.class, url_for(GET_EVENTS_URL), options)
+          return Cursor.new(self.class, url_for(GET_EVENTS_URL), options)
 
         rescue Exception => e
           @error = '500'

data/lib/onelogin/api/cursor.rb

@@ -1,3 +1,6 @@
+require 'onelogin/api/apiexception'
+require 'onelogin/api/util'
+
 # Cursor
 #
 # Used for paginating requests to the OneLogin API
@@ -5,6 +8,7 @@
 # Returns an enumerable object
 class Cursor
   include Enumerable
+  include OneLogin::Api::Util
 
   # Create a new instance of the Cursor.
   #
@@ -58,16 +62,22 @@ class Cursor
 
     json = response.parsed_response
 
-    results = json['data'].flatten
-
-    @collection += if results_remaining < results.size
-      results.slice(0, results_remaining)
+    if json.nil?
+      raise OneLogin::Api::ApiException.new("Response could not be parsed", 500)
+    elsif !json.key?("data") && json["status"]["error"] == true
+      raise OneLogin::Api::ApiException.new(extract_error_message_from_response(response), json["status"]["code"])
     else
-      results
-    end
+      results = json['data'].flatten
 
-    @after_cursor = after_cursor(json)
-    @last_cursor_empty = @after_cursor.nil?
+      @collection += if results_remaining < results.size
+        results.slice(0, results_remaining)
+      else
+        results
+      end
+
+      @after_cursor = after_cursor(json)
+      @last_cursor_empty = @after_cursor.nil?
+    end
   end
 
   def after_cursor(json)

data/lib/onelogin/api/models/user.rb

@@ -7,7 +7,7 @@ module OneLogin
         attr_accessor :id, :external_id, :email, :username, :firstname, :lastname, :distinguished_name,
                       :phone, :company, :department, :status, :state, :member_of, :samaccountname, :userprincipalname,
                       :group_id, :role_ids, :custom_attributes, :openid_name, :locale_code, :comment, :directory_id,
-                      :title, :manager_ad_id, :trusted_idp_id, :activated_at, :created_at, :updated_at,
+                      :title, :manager_ad_id, :trusted_idp_id, :manager_user_id, :activated_at, :created_at, :updated_at,
                       :password_changed_at, :invitation_sent_at, :invalid_login_attempts, :last_login, :locked_until
 
         def initialize(data)
@@ -36,6 +36,7 @@ module OneLogin
           @directory_id = data['directory_id']
           @manager_ad_id = data['manager_ad_id']
           @trusted_idp_id = data['trusted_idp_id']
+          @manager_user_id = data['manager_user_id']
           @activated_at = data['activated_at']? Time.iso8601(data['activated_at']) : nil
           @created_at = data['created_at']? Time.iso8601(data['created_at']) : nil
           @updated_at = data['updated_at']? Time.iso8601(data['updated_at']) : nil
@@ -77,6 +78,7 @@ module OneLogin
           user_data.directory_id = @directory_id
           user_data.manager_ad_id = @manager_ad_id
           user_data.trusted_idp_id = @trusted_idp_id
+          user_data.manager_user_id = @manager_user_id
           return user_data
         end
 
@@ -123,7 +125,8 @@ module OneLogin
             "openid_name"=> self.openid_name,
             "directory_id"=> self.directory_id,
             "manager_ad_id"=> self.manager_ad_id,
-            "trusted_idp_id"=> self.trusted_idp_id
+            "trusted_idp_id"=> self.trusted_idp_id,
+            "manager_user_id"=> self.manager_user_id
           }
         end
       end

data/lib/onelogin/api/models/user_data.rb

@@ -6,7 +6,7 @@ module OneLogin
 
         attr_accessor :id, :external_id, :email, :username, :firstname, :lastname, :distinguished_name,
                       :phone, :company, :department, :status, :state, :member_of, :samaccountname, :userprincipalname,
-                      :title, :openid_name, :locale_code, :directory_id, :manager_ad_id, :trusted_idp_id
+                      :title, :openid_name, :locale_code, :directory_id, :manager_ad_id, :trusted_idp_id, :manager_user_id
       end
     end
   end

data/lib/onelogin/api/util.rb

@@ -1,11 +1,13 @@
 require 'onelogin/api/util/constants'
 require 'onelogin/api/util/url_builder'
+require 'onelogin/api/util/parser'
 
 module OneLogin
   module Api
     module Util
       include OneLogin::Api::Util::Constants
       include OneLogin::Api::Util::UrlBuilder
+      include OneLogin::Api::Util::Parser
     end
   end
 end

data/lib/onelogin/api/util/parser.rb

@@ -0,0 +1,42 @@
+module OneLogin
+  module Api
+    module Util
+      module Parser
+        def extract_error_message_from_response(response)
+          message = ''
+          content = JSON.parse(response.body)
+          if content && content.has_key?('status')
+            status = content['status']
+            if status.has_key?('message')
+              if status['message'].instance_of?(Hash)
+                if status['message'].has_key?('description')
+                  message = status['message']['description']
+                end
+              else
+                message = status['message']
+              end
+            elsif status.has_key?('type')
+              message = status['type']
+            end
+          end
+          message
+        end
+
+        def extract_error_attribute_from_response(response)
+          attribute = nil
+          content = JSON.parse(response.body)
+          if content && content.has_key?('status')
+            status = content['status']
+            if status.has_key?('message') && status['message'].instance_of?(Hash)
+              if status['message'].has_key?('attribute')
+                attribute = status['message']['attribute']
+              end
+            end
+          end
+          attribute
+        end
+
+      end
+    end
+  end
+end

data/lib/onelogin/version.rb

@@ -1,3 +1,3 @@
 module OneLogin
-  VERSION = "1.2.3"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onelogin
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - OneLogin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -213,6 +213,7 @@ files:
 - examples/rails-custom-login-page/vendor/.keep
 - lib/onelogin.rb
 - lib/onelogin/api.rb
+- lib/onelogin/api/apiexception.rb
 - lib/onelogin/api/client.rb
 - lib/onelogin/api/cursor.rb
 - lib/onelogin/api/models.rb
@@ -237,6 +238,7 @@ files:
 - lib/onelogin/api/models/user_metadata.rb
 - lib/onelogin/api/util.rb
 - lib/onelogin/api/util/constants.rb
+- lib/onelogin/api/util/parser.rb
 - lib/onelogin/api/util/url_builder.rb
 - lib/onelogin/version.rb
 - onelogin.gemspec
@@ -261,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: http://www.rubygems.org/gems/onelogin-ruby-sdk
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: OneLogin's Ruby SDK.