onelogin 1.3.0 → 1.3.1

data/lib/onelogin/api/cursor.rb

@@ -24,6 +24,7 @@ class Cursor
     @headers = options[:headers] || {}
     @params = options[:params] || {}
     @max_results = options[:max_results]
+    @container = options[:container] || 'data'
 
     @collection = []
     @after_cursor = options.fetch(:after_cursor, nil)
@@ -64,10 +65,16 @@ class Cursor
 
     if json.nil?
       raise OneLogin::Api::ApiException.new("Response could not be parsed", 500)
-    elsif !json.key?("data") && json["status"]["error"] == true
+    elsif !json.has_key?(@container) && json.has_key?('status') && json["status"]["error"] == true
       raise OneLogin::Api::ApiException.new(extract_error_message_from_response(response), json["status"]["code"])
+    elsif !json.has_key?(@container) && json.has_key?('statusCode')
+      raise OneLogin::Api::ApiException.new(extract_error_message_from_response(response), json["statusCode"])
     else
-      results = json['data'].flatten
+
+      results = json[@container]
+      if @container == "data"
+        results = results.flatten
+      end
 
       @collection += if results_remaining < results.size
         results.slice(0, results_remaining)
@@ -81,9 +88,13 @@ class Cursor
   end
 
   def after_cursor(json)
-    return unless json['pagination']
-
-    json['pagination'].fetch('after_cursor', nil)
+    value = nil
+    if json.has_key?('pagination')
+      value = json['pagination'].fetch('after_cursor', nil)
+    elsif json.has_key?('afterCursor')
+      value = json['afterCursor']
+    end
+    value
   end
 
   def results_remaining

data/lib/onelogin/api/models.rb

@@ -8,11 +8,13 @@ require 'onelogin/api/models/group'
 require 'onelogin/api/models/mfa'
 require 'onelogin/api/models/onelogin_token'
 require 'onelogin/api/models/otp_device'
+require 'onelogin/api/models/privilege'
 require 'onelogin/api/models/rate_limit'
 require 'onelogin/api/models/role'
 require 'onelogin/api/models/saml_endpoint_response'
 require 'onelogin/api/models/session_token_info'
 require 'onelogin/api/models/session_token_mfa_info'
+require 'onelogin/api/models/statement'
 require 'onelogin/api/models/user_data'
 require 'onelogin/api/models/user_metadata'
 require 'onelogin/api/models/user'

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

@@ -0,0 +1,51 @@
+require 'onelogin/api/models/statement'
+
+module OneLogin
+  module Api
+    module Models
+
+      class Privilege
+
+        attr_accessor :id, :name, :version, :statements
+
+        def initialize(*args)
+          if args.length == 1
+            self.from_data(args[0])
+          else
+            self.from_values(args[0],args[1], args[2], args[3])
+          end
+        end
+
+        def from_data(data)
+          @id = data['id']
+          @name = data['name']
+          @version = data['privilege']['Version']
+          statements_data = data['privilege']['Statement']
+          @statements = []
+          for statement_data in statements_data
+             @statements << Statement.new(statement_data)
+          end
+        end
+
+        def from_values(id, name, version, statements)
+          @id = id
+          @name = name
+          @version = version
+          @statements = []
+          for statement in statements
+            if statement.instance_of?(Statement)
+              @statements << statement
+            elsif statement.instance_of?(Hash) && statement.has_key?('Effect') && statement.has_key?('Action') && statement.has_key?('Scope')
+              @statements << Statement.new(statement['Effect'], statement['Action'], statement['Scope'])
+            end
+          end
+        end
+
+        def get_valid_actions
+          return 
+            Constants.VALID_ACTIONS
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module OneLogin
+  module Api
+    module Models
+
+      class Statement
+
+        attr_accessor :effect, :actions, :scopes
+
+        def initialize(*args)
+          if args.length == 1
+            self.from_data(args[0])
+          else
+            self.from_values(args[0], args[1], args[2])
+          end
+        end
+
+        def from_data(data)
+          @effect = data['Effect']? data['Effect'] : "Allow"
+          @actions = data['Action']? data['Action'] : []
+          @scopes = data['Scope']? data['Scope'] : []
+        end
+
+        def from_values(effect, actions, scopes)
+          @effect = effect
+          @actions = actions
+          @scopes = scopes
+        end
+
+        def get_valid_actions
+          return 
+            Constants.VALID_ACTIONS
+        end
+      end
+    end
+  end
+end

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

@@ -67,6 +67,92 @@ module OneLogin
 
         # Embed Apps URL
         EMBED_APP_URL = "https://api.onelogin.com/client/apps/embed2"
+
+        # Privileges URLS
+        LIST_PRIVILEGES_URL = "https://api.%s.onelogin.com/api/1/privileges"
+        CREATE_PRIVILEGE_URL = "https://api.%s.onelogin.com/api/1/privileges"
+        UPDATE_PRIVILEGE_URL = "https://api.%s.onelogin.com/api/1/privileges/%s"
+        GET_PRIVILEGE_URL = "https://api.%s.onelogin.com/api/1/privileges/%s"
+        DELETE_PRIVILEGE_URL = "https://api.%s.onelogin.com/api/1/privileges/%s"
+        GET_ROLES_ASSIGNED_TO_PRIVILEGE_URL = "https://api.%s.onelogin.com/api/1/privileges/%s/roles"
+        ASSIGN_ROLES_TO_PRIVILEGE_URL = "https://api.%s.onelogin.com/api/1/privileges/%s/roles"
+        REMOVE_ROLE_FROM_PRIVILEGE_URL = "https://api.%s.onelogin.com/api/1/privileges/%s/roles/%s"
+        GET_USERS_ASSIGNED_TO_PRIVILEGE_URL = "https://api.%s.onelogin.com/api/1/privileges/%s/users"
+        ASSIGN_USERS_TO_PRIVILEGE_URL = "https://api.%s.onelogin.com/api/1/privileges/%s/users"
+        REMOVE_USER_FROM_PRIVILEGE_URL = "https://api.%s.onelogin.com/api/1/privileges/%s/users/%s"
+        VALID_ACTIONS = [
+          "apps:List",
+          "apps:Get",
+          "apps:Create",
+          "apps:Update",
+          "apps:Delete",
+          "apps:ManageRoles",
+          "apps:ManageUsers",
+          "directories:List",
+          "directories:Get",
+          "directories:Create",
+          "directories:Update",
+          "directories:Delete",
+          "directories:SyncUsers",
+          "directories:RefreshSchema",
+          "events:List",
+          "events:Get",
+          "mappings:List",
+          "mappings:Get",
+          "mappings:Create",
+          "mappings:Update",
+          "mappings:Delete",
+          "mappings:ReapplyAll",
+          "policies:List",
+          "policies:user:Get",
+          "policies:user:Create",
+          "policies:user:Update",
+          "policies:user:Delete",
+          "policies:app:Get",
+          "policies:app:Create",
+          "policies:app:Update",
+          "policies:app:Delete",
+          "privileges:List",
+          "privileges:Get",
+          "privileges:Create",
+          "privileges:Update",
+          "privileges:Delete",
+          "privileges:ListUsers",
+          "privileges:ListRoles",
+          "privileges:ManageUsers",
+          "privileges:ManageRoles",
+          "reports:List",
+          "reports:Get",
+          "reports:Create",
+          "reports:Update",
+          "reports:Delete",
+          "reports:Run",
+          "roles:List",
+          "roles:Get",
+          "roles:Create",
+          "roles:Update",
+          "roles:Delete",
+          "roles:ManageUsers",
+          "roles:ManageApps",
+          "trustedidp:List",
+          "trustedidp:Get",
+          "trustedidp:Create",
+          "trustedidp:Update",
+          "trustedidp:Delete",
+          "users:List",
+          "users:Get",
+          "users:Create",
+          "users:Update",
+          "users:Delete",
+          "users:Unlock",
+          "users:ResetPassword",
+          "users:ForceLogout",
+          "users:Invite",
+          "users:ReapplyMappings",
+          "users:ManageRoles",
+          "users:ManageApps",
+          "users:GenerateTempMfaToken"
+        ]
       end
     end
   end

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

@@ -5,18 +5,24 @@ module OneLogin
         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']
+          if content
+            if 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
-              else
-                message = status['message']
+              elsif status.has_key?('type')
+                message = status['type']
               end
-            elsif status.has_key?('type')
-              message = status['type']
+            elsif content.has_key?('message')
+              message = content['message']
+            elsif content.has_key?('name')
+              message = content['name']
             end
           end
           message
@@ -36,6 +42,14 @@ module OneLogin
           attribute
         end
 
+        def extract_status_code_from_response(response)
+          status_code = ''
+          content = JSON.parse(response.body)
+          if content && content.has_key?('statusCode')
+            status_code = content['statusCode']
+          end
+          status_code
+        end
       end
     end
   end

data/lib/onelogin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onelogin
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - OneLogin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -228,11 +228,13 @@ files:
 - lib/onelogin/api/models/mfa.rb
 - lib/onelogin/api/models/onelogin_token.rb
 - lib/onelogin/api/models/otp_device.rb
+- lib/onelogin/api/models/privilege.rb
 - lib/onelogin/api/models/rate_limit.rb
 - lib/onelogin/api/models/role.rb
 - lib/onelogin/api/models/saml_endpoint_response.rb
 - lib/onelogin/api/models/session_token_info.rb
 - lib/onelogin/api/models/session_token_mfa_info.rb
+- lib/onelogin/api/models/statement.rb
 - lib/onelogin/api/models/user.rb
 - lib/onelogin/api/models/user_data.rb
 - lib/onelogin/api/models/user_metadata.rb
@@ -263,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: http://www.rubygems.org/gems/onelogin-ruby-sdk
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: OneLogin's Ruby SDK.