utils.rb + test

lib/onelogin/api/models.rb

@@ -1,6 +1,6 @@
 require 'onelogin/api/models/app'
 require 'onelogin/api/models/auth_factor'
-require 'onelogin/api/models/connector_basic'
+require 'onelogin/api/models/connector'
 require 'onelogin/api/models/device'
 require 'onelogin/api/models/event'
 require 'onelogin/api/models/event_type'

lib/onelogin/api/models/app.rb

@@ -1,3 +1,6 @@
+require 'onelogin/api/util/utils.rb'
+require 'onelogin/api/models/base.rb'
+
 module OneLogin
   module Api
     module Models
@@ -6,15 +9,42 @@ class App
 
         attr_accessor :id, :name, :icon, :provisioned
         attr_accessor :extension, :login_id, :personal
+        attr_accessor :connector, :visible, :provisioning
+        attr_accessor :provisioning_status
 
         def initialize(data)
-          @id = data['id']
-          @name = data['name']
-          @icon = data['icon']
-          @provisioned = data['provisioned']
-          @extension = data['extension']
-          @login_id = data['login_id']
-          @personal = data['personal']
+          @id = str2int(data['id', nil])
+          @name = data['name', '']
+          if data.keys.include?('icon') 
+            @icon = data['icon', nil]
+          else
+            @icon = data['icon_url', nil]  
+          @connector_id = str2int(data['connector_id', nil])
+          end
+          if data.keys.include?('extension')
+            @extension = str2bool(data['extension', nil])
+          end
+          if data.keys.include?('visible')
+            @visible = str2bool(data['visible', nil])
+          end
+          if data.keys.include?('login_id')
+            @login_id = str2bool(data['login_id', nil])
+          end  
+          if data.keys.include?('personal')
+            @personal = str2bool(data['personal', nil])
+          end
+          if data.keys.include?('provisioned')
+            @provisioned = str2bool(data['provisioned', nil]) 
+          end     
+          if data.keys.include?('provisioning')
+            @provisioning = str2bool(data['provisioning', nil])
+          end
+          if data.keys.include?('provisioning_status')
+            @provisioning_status = str2bool(data['provisioning_status', nil])  
+            @provisioning_state = str2bool(data['provisioning_state', nil]) 
+            @provisioning_enabled = str2bool(data['provisioning_enabled', nil]) 
+          end            
+
         end
       end
     end

lib/onelogin/api/models/assigned_base.rb

@@ -0,0 +1,29 @@
+require 'onelogin/api/util/utils.rb'
+require 'onelogin/api/models/base.rb'
+
+module OneLogin
+  module Api
+    module Models
+
+      class AssignedBase
+        include Base
+
+        attr_accessor :id, :name, :email, :username
+        attr_accessor :assigned, :added_by
+
+        def initialize(data)
+            @id = str2int(data['id',nil])
+            @name = str2int(data['name',nil])
+            @email = str2int(data['email',nil])
+            @username= str2int(data['username',nil])
+            @assigned = str2int(data['assigned',nil])
+            @added_by = str2int(data['added_by',nil])
+        end
+
+        def get_added_by
+            return @added_by
+        end
+      end  
+    end
+end
+end

lib/onelogin/api/models/brand.rb

@@ -0,0 +1,37 @@
+require 'onelogin/api/util/utils.rb'
+require 'onelogin/api/models/base.rb'
+
+module OneLogin
+    module Api
+      module Models
+
+        class Brand Base
+            attr_accessor :id, :name, :enabled, :custom_support_enabled, :custom_color,
+                          :@custom_accent_color, :custom_masking_color, :custom_masking_opacity,
+                          :enable_custom_label_for_login_screen, :enable_custom_label_for_login_screen,
+                          :login_instruction, :login_instruction_title, :mfa_enrollment_message,
+                          :hide_onelogin_footer, :background, :logo
+
+            def initialize(data)
+
+                @id = str2ing(data['id', nil])
+                @name = data['name']
+                @enabled = str2bool(data['enabled', False])
+                @custom_support_enabled = data['custom_support_enabled', nil]
+                @custom_color = data['custom_color', nil]
+                @custom_accent_color = data['custom_accent_color', nil]
+                @custom_masking_color = data['custom_masking_color', nil]
+                @custom_masking_opacity = str2int(data['custom_masking_opacity', nil])
+                @enable_custom_label_for_login_screen = str2bool(data['enable_custom_label_for_login_screen', nil])
+                @custom_label_text_for_login_screen = data['custom_label_text_for_login_screen', nil]
+                @login_instruction = data['login_instruction', nil]
+                @login_instruction_title = data['login_instruction_title', nil]
+                @mfa_enrollment_message = data['mfa_enrollment_message', nil]
+                @hide_onelogin_footer = str2bool(data['hide_onelogin_footer', nil])
+                @background = data['background', nil]
+                @logo = data['logo', nil]
+            end 
+        end
+    end
+end
+end    

lib/onelogin/api/models/connector_basic.rb → lib/onelogin/api/models/connector.rb

@@ -1,3 +1,5 @@
+require 'onelogin/api/util/utils.rb'
+
 module OneLogin
   module Api
     module Models
@@ -8,11 +10,12 @@ class ConnectorBasic
         attr_accessor :icon_url, :allows_new_parameters
 
         def initialize(data)
-          @id = data['id']
+
+          @id = str2int(data['id'])
           @name = data['name']
           @icon_url = data['icon_url']
-          @auth_method = data['auth_method']
-          @allows_new_parameters = data['allows_new_parameters']
+          @auth_method = str2int(data['auth_method'])
+          @allows_new_parameters = str2bool(data['allows_new_parameters'])
         end
       end
     end

lib/onelogin/api/models/device.rb

@@ -1,3 +1,4 @@
+require 'onelogin/api/util/utils.rb'
 module OneLogin
   module Api
     module Models

lib/onelogin/api/models/user.rb

@@ -1,8 +1,11 @@
+require 'onelogin/api/util/utils.rb'
+require 'onelogin/api/models/base.rb'
+
 module OneLogin
   module Api
     module Models
 
-      class User
+      class User < Base
 
         attr_accessor :id, :external_id, :email, :username, :firstname, :lastname, :distinguished_name,
                       :phone, :company, :department, :status, :state, :member_of, :samaccountname, :userprincipalname,
@@ -11,7 +14,7 @@ class User
                       :password_changed_at, :invitation_sent_at, :invalid_login_attempts, :last_login, :locked_until
 
         def initialize(data)
-          @id = data['id']
+          @id = str2int(data['id', nil])
           @external_id = data['external_id']
           @email = data['email'].to_s
           @username = data['username'].to_s
@@ -22,29 +25,35 @@ def initialize(data)
           @company = data['company'].to_s
           @department = data['department'].to_s
           @title = data['title'].to_s
-          @status = data['status']
+          @status = str2int(data['status', nil])
           @state = data['state']
           @member_of = data['member_of'].to_s
           @samaccountname = data['samaccountname'].to_s
           @userprincipalname = data['userprincipalname'].to_s
           @group_id = data['group_id']? data['group_id'].to_i : nil
+          @role_ids = []
+          if data.keys.include?('role_ids')
+            @role_ids = data['role_ids', []] 
+          else
+            @role_ids = data['role_id', []]
           @role_ids = data['role_id']? data['role_id'] : []
           @custom_attributes = data['custom_attributes'] ? data['custom_attributes'] : []
           @openid_name = data['openid_name'].to_s
           @locale_code = data['locale_code'].to_s
+          #@notes = data['notes'] : nil
           @comment = data['comment'].to_s
-          @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
-          @password_changed_at = data['password_changed_at']? Time.iso8601(data['password_changed_at']) : nil
-          @invitation_sent_at = data['invitation_sent_at']? Time.iso8601(data['invitation_sent_at']) : nil
-          @invalid_login_attempts = data['invalid_login_attempts']
-          @last_login = data['last_login']? Time.iso8601(data['last_login']) : nil
-          @locked_until = data['locked_until']? Time.iso8601(data['locked_until']) : nil
+          @directory_id = str2int(data['directory_id', nil])
+          @manager_ad_id = str2int(data['manager_ad_id', nil])
+          @trusted_idp_id = str2int(data['trusted_idp_id', nil])
+          @manager_user_id = data['manager_user_id', nil]
+          @activated_at = data['activated_at']? str2date(data['activated_at']) : nil
+          @created_at = data['created_at']? str2date(data['created_at']) : nil
+          @updated_at = data['updated_at']? str2date(data['updated_at']) : nil
+          @password_changed_at = data['password_changed_at']? str2date(data['password_changed_at']) : nil
+          @invitation_sent_at = data['invitation_sent_at']? str2date(data['invitation_sent_at']) : nil
+          @invalid_login_attempts = str2int(data['invalid_login_attempts', nil])
+          @last_login = data['last_login']? str2date(data['last_login']) : nil
+          @locked_until = data['locked_until']? str2date(data['locked_until']) : nil
         end
 
         def get_role_ids
@@ -102,6 +111,13 @@ def get_custom_attributes
           @custom_attributes
         end
 
+        def get_custom_atributes(name)
+          if name @custom_attributes.keys.include?('name')
+            return @custom_attributes[name]
+          end
+          return nil
+        end
+
         def get_user_params
           return {
             "external_id"=> self.external_id,
@@ -122,6 +138,7 @@ def get_user_params
             "userprincipalname"=> self.userprincipalname,
             "group_id"=> self.group_id,
             "locale_code"=> self.locale_code,
+            #"notes" => self.notes
             "openid_name"=> self.openid_name,
             "directory_id"=> self.directory_id,
             "manager_ad_id"=> self.manager_ad_id,
@@ -133,3 +150,4 @@ def get_user_params
     end
   end
 end
+end

lib/onelogin/api/util.rb

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