ruby-jss 0.10.2 → 0.11.0a5

data/lib/jss/api_object/mobile_device.rb

@@ -39,14 +39,14 @@ module JSS
   # This class represents a Mobile Device stored in the JSS.
   #
   # ---
-  # ===Adding devices to the JSS
+  # === Adding devices to the JSS
   #
   # This class cannot be used to add new mobile devices to the JSS. That can only be done
   # via the enrollment process.  See JSS::MobileDeviceInvitation for sending
   # an enrollment invite to a device.
   #
   # ---
-  # ===Editing values
+  # === Editing values
   #
   # Only a few values can be changed via the API, using these methods, q.v:
   # - #asset_tag=  String
@@ -57,35 +57,32 @@ module JSS
   # After modfying any values, #save must be called to save changes to the JSS.
   #
   # ---
-  # ===MDM Commands
+  # === MDM Commands
   #
-  # The following methods can be used to send an APNS command to the device represented by an
-  # instance of JSS::MobileDevice, equivalent to clicking one of the buttons on
-  # the Management Commands section of the Management tab of the Mobile Device details page in the JSS UI.
+  # See the {JSS::MDM} mixin module for Class and Instance methods for
+  # sending MDM commands to mobiledevices.
   #
-  # The methods supported are:
-  # - blank_push  (aliases blank, noop, send_blank_push)
-  # - update_inventory (alias recon)
-  # - device_lock (aliases lock, lock_device)
-  # - erase_device (aliases wipe)
-  # - clear_passcode
-  # - unmanage_device (alias unmanage)
-  #
-  # Each returns true if the command as sent.
-  #
-  # @see JSS::APIObject
+  # To send MDM commands without fetching mobiledevice instances, use the class
+  # methods, which can take multiple identifiers at once.
   #
+  # NOTE: If the {#name=} method is used to change the name of a supervized device,
+  # the DeviceName MDM command will be sent to the device when
+  # the changes are sent to the server via {#save} or {#update}
   #
   class MobileDevice < JSS::APIObject
 
     # Mix-Ins
     #####################################
 
+    include JSS::Creatable
     include JSS::Updatable
     include JSS::Locatable
     include JSS::Purchasable
     include JSS::Uploadable
     include JSS::Extendable
+    include JSS::Sitable
+    include JSS::MDM
+    include JSS::ManagementHistory
 
     extend JSS::Matchable
 
@@ -102,6 +99,9 @@ module JSS
     # It's also used in various error messages
     RSRC_OBJECT_KEY = :mobile_device
 
+    # Where is the Site data in the API JSON?
+    SITE_SUBSET = :general
+
     # these keys, as well as :id and :name,  are present in valid API JSON data for this class
     VALID_DATA_KEYS = %i[device_name capacity tethered].freeze
 
@@ -120,232 +120,191 @@ module JSS
     # This is the class for relevant Extension Attributes
     EXT_ATTRIB_CLASS = JSS::MobileDeviceExtensionAttribute
 
-    # the rsrc for mobile dev commands
-    MDM_RSRC = 'mobiledevicecommands/command'.freeze
-
-    # The MDM commands sendable via the api
-    # and alternative versions
-    #
-    MDM_COMMANDS = {
-      blank_push: 'BlankPush',
-      send_blank_push: 'BlankPush',
-      blank: 'BlankPush',
-      noop: 'BlankPush',
-
-      settings: 'Settings',
-
-      update_inventory: 'UpdateInventory',
-      recon: 'UpdateInventory',
-
-      device_lock: 'DeviceLock',
-      lock: 'DeviceLock',
-      lock_device: 'DeviceLock',
-
-      erase_device: 'EraseDevice',
-      erase: 'EraseDevice',
-      wipe: 'EraseDevice',
-
-      clear_passcode: 'ClearPasscode',
-
-      clear_restrictions_password: 'ClearRestrictionsPassword',
-
-      enable_data_roaming: 'SettingsEnableDataRoaming',
-      disable_data_roaming: 'SettingsDisableDataRoaming',
-
-      enable_voice_roaming: 'SettingsEnableVoiceRoaming',
-      disable_voice_roaming: 'SettingsDisableVoiceRoaming',
-
-      enable_app_analytics: 'SettingsEnableAppAnalytics',
-      disable_app_analytics: 'SettingsDisableAppAnalytics',
-
-      enable_diagnostic_submission: 'SettingsEnableDiagnosticSubmission',
-      disable_diagnostic_submission: 'SettingsDisableDiagnosticSubmission',
-
-      # wallpaper: 'Wallpaper',
-
-      device_name: 'DeviceName',
-
-      shutdown_device: 'ShutDownDevice',
-      shutdown: 'ShutDownDevice',
-
-      restart_device: 'RestartDevice',
-      restart: 'RestartDevice',
-
-      # passcode_lock_grace_period: 'PasscodeLockGracePeriod',
-
-      unmanage_device: 'UnmanageDevice',
-      unmanage: 'UnmanageDevice'
-
-    }.freeze
-
-    # These MDM commands need extra data.
-    MDM_COMMANDS_REQUIRING_DATA = %w[DeviceLock DeviceName Wallpaper].freeze
-
-    # The History resource
-    HISTORY_RSRC = 'mobiledevicehistory'.freeze
-
-    # Available history subsets
-    HISTORY_SUBSETS = %i[management_commands user_location audits applications ebooks].freeze
+    # What kind of devices are we for MDM purposes?
+    MDM_COMMAND_TARGET = :mobiledevices
 
     # the object type for this object in
     # the object history table.
     # See {APIObject#add_object_history_entry}
     OBJECT_HISTORY_OBJECT_TYPE = 21
 
-
     # Class Methods
     #####################################
 
     # @return [Array<String>] all mobiledevice serial_numbers
     def self.all_serial_numbers(refresh = false, api: JSS.api)
-      all(refresh, api: API).map { |i| i[:serial_number] }
+      all(refresh, api: api).map { |i| i[:serial_number] }
     end
 
     # @return [Array<String>] all mobiledevice phone numbers
     def self.all_phone_numbers(refresh = false, api: JSS.api)
-      all(refresh, api: API).map { |i| i[:phone_number] }.reject(&:empty?)
+      all(refresh, api: api).map { |i| i[:phone_number] }.reject(&:empty?)
     end
 
     # @return [Array<String>] all mobiledevice wifi mac addrs
     def self.all_wifi_mac_addresses(refresh = false, api: JSS.api)
-      all(refresh, api: API).map { |i| i[:wifi_mac_address] }
+      all(refresh, api: api).map { |i| i[:wifi_mac_address] }
     end
 
     # @return [Array<String>] all mobiledevice wifi mac addrs
     def self.all_mac_addresses(refresh = false, api: JSS.api)
-      all_wifi_mac_addresses(refresh, api: API)
+      all_wifi_mac_addresses(refresh, api: api)
     end
 
     # @return [Array<String>] all mobiledevice udids
     def self.all_udids(refresh = false, api: JSS.api)
-      all(refresh, api: API).map { |i| i[:udid] }
+      all(refresh, api: api).map { |i| i[:udid] }
     end
 
     # @return [Array<Hash>] the list of all managed mobile devices
     def self.all_managed(refresh = false, api: JSS.api)
-      all(refresh, api: API).select { |d| d[:managed] }
+      all(refresh, api: api).select { |d| d[:managed] }
     end
 
     # @return [Array<Hash>] the list of all unmanaged mobile devices
     def self.all_unmanaged(refresh = false, api: JSS.api)
-      all(refresh, api: API).reject { |d| d[:managed] }
+      all(refresh, api: api).reject { |d| d[:managed] }
+    end
+
+    # @return [Array<Hash>] the list of all supervised mobile devices
+    def self.all_supervised(refresh = false, api: JSS.api)
+      all(refresh, api: api).select { |d| d[:supervised] }
+    end
+
+    # @return [Array<Hash>] the list of all unsupervised mobile devices
+    def self.all_unsupervised(refresh = false, api: JSS.api)
+      all(refresh, api: api).reject { |d| d[:supervised] }
     end
 
     # @return [Array<Hash>] the list of all iPhones
     def self.all_iphones(refresh = false, api: JSS.api)
-      all(refresh, api: API).select { |d| d[:model].start_with? 'iPhone' }
+      all(refresh, api: api).select { |d| d[:model].start_with? 'iPhone' }
     end
 
     # @return [Array<Hash>] the list of all iPads
     def self.all_ipads(refresh = false, api: JSS.api)
-      all(refresh, api: API).select { |d| d[:model].start_with? 'iPad' }
+      all(refresh, api: api).select { |d| d[:model].start_with? 'iPad' }
     end
 
     # @return [Array<Hash>] the list of all iPads
     def self.all_apple_tvs(refresh = false, api: JSS.api)
-      all(refresh, api: API).select { |d| d[:model_identifier].start_with? 'AppleTV' }
+      all(refresh, api: api).select { |d| d[:model_identifier].start_with? 'AppleTV' }
     end
 
-    # Send an MDM command to one or more mobile devices by id or name
-    #
-    #
-    # @param targets[String,Integer,Array<String,Integer>]
-    #   the name or id of the mobile devices to receive the command, or
-    #   an array of such names or ids, or a comma-separated string
-    #   of them.
-    # @param command[Symbol] the command to send, one of the keys
-    #   of MDM_COMMANDS
-    #
-    # @param data[String] Some commands require extra data.
-    #
-    # @param api[JSS::APIConnection] the APi to query. Defaults to the
-    #   currently active API, see {JSS::APIConnection}
-    #
-    # @return [String] The uuid of the MDM command sent, if applicable
-    #  (blank pushes do not generate uuids)
-    #
-    def self.send_mdm_command(targets, command, data = nil, api: JSS.api)
-      raise JSS::NoSuchItemError, "Unknown command '#{command}'" unless MDM_COMMANDS.keys.include? command
+    # Attributes
+    #####################################
 
-      command = MDM_COMMANDS[command]
-      cmd_rsrc = "#{MDM_RSRC}/#{command}"
+    ############
+    # The values returned in the General subset are stored as direct attributes
 
-      if MDM_COMMANDS_REQUIRING_DATA.include? command
-        raise "MDM command '#{command}' requires additional data." unless data
-        cmd_rsrc << "/#{data}"
-      end
+    # identifiers
+    ###########################
 
-      targets = JSS.to_s_and_a(targets.to_s)[:arrayform] unless targets.is_a? Array
+    # @return [String]
+    attr_reader :serial_number
+    alias sn serial_number
+    alias serialnumber serial_number
 
-      # make sure its an array of ids
-      targets.map! do |md|
-        if all_ids(api: api).include? md.to_i
-          md.to_i
-        elsif all_names(api: api).include? md
-          map_all_ids_to(:name, api: api.invert[md])
-        else
-          raise JSS::NoSuchItemError, "No mobile device found matching '#{md}'"
-        end # if
-      end # map!
+    # @return [String]
+    attr_reader :udid
 
-      cmd_rsrc << "/id/#{targets.join ','}"
+    # @return [String]
+    attr_reader :asset_tag
 
-      result = api.post_rsrc cmd_rsrc, nil
-      result =~ %r{<uuid>(.*)</uuid>}
-      Regexp.last_match(1)
-    end
+    # @return [String]
+    attr_reader :display_name
 
-    def self.management_history(identifier, subset = nil, api: JSS.api)
-      id = nil
-      if identifier.is_a? Integer
-        id = identifier
-      else
-        key = case identifier
-        when *all_names(api: api) then :name
-        when *all_serial_numbers(api: api) then :serial_number
-        when *all_mac_addresses(api: api) then :mac_address
-        when *all_udids(api: api) then :udid
-        end
-        id = map_all_ids_to(key, api: api).invert[identifier]
-      end # if identifier.is_a? Integer
-
-      raise JSS::NoSuchItemError, "No MobileDevice found matching #{identifier}" unless id && all_ids(api: api).include?(id)
-
-      rsrc = "#{HISTORY_RSRC}/id/#{id}"
-
-      if subset
-        raise "subset must be one of: :#{HISTORY_SUBSETS.join ', :'}" unless HISTORY_SUBSETS.include? subset
-        rsrc << "/subset/#{subset}"
-      end
+    # @return [String]
+    attr_reader :device_name
 
-      hist = api.get_rsrc(rsrc)[:mobile_device_history]
-      subset ? hist[subset] : hist
-    end
+    # @return [String] An Apple TV identifier
+    attr_reader :device_id
 
-    # Attributes
-    #####################################
+    # @return [String]
+    attr_reader :exchange_activesync_device_identifier
 
-    ############
-    # The values returned in the General and Location subset are stored as direct attributes
-    # Here are the  Location values
+    # settings
+    ###########################
+
+    # @return [Boolean] is this device managed?
+    attr_reader :managed
+    alias managed? managed
+
+    # @return [Boolean] is this device supervised?
+    attr_reader :supervised
+    alias supervised? supervised
+
+    # @return [String] the device_ownership_level
+    attr_reader :device_ownership_level
+
+    # @return [String] the tether state of the device
+    attr_reader :tethered
+
+    # @return [Boolean] is this device shared?
+    attr_reader :shared
+
+    # @return [Boolean] is this device ble_capable?
+    attr_reader :ble_capable
 
     # @return [String] the airplay passwd on devices that can receive AirPlay (i.e. apple tvs)
     attr_reader :airplay_password
 
-    # @return [String] the asset tag
-    attr_reader :asset_tag
+    # @return [String] the languages
+    attr_reader :languages
+
+    # @return [String] the locales
+    attr_reader :locales
+
+    # software
+    ###########################
+
+    # @return [String] the model firmware
+    attr_reader :modem_firmware
+
+    # @return [String] the OS version
+    attr_reader :os_version
+
+    # @return [String] the OS build
+    attr_reader :os_build
+
+    # @return [String] the OS type
+    attr_reader :os_type
+
+    # hardware
+    ###########################
+
+    # @return [String] the display name of the model
+    attr_reader :model
+
+    # @return [String] the display name of the model
+    attr_reader :model_number
+
+    # @return [String] the display name of the model
+    attr_reader :model_display
+
+    # @return [String] the model identifier
+    attr_reader :model_identifier
+
+    # usage
+    ##########################
 
     # @return [Intger] how much space available on the device?
     attr_reader :available_mb
+    alias available available_mb
 
     # @return [Integer] total storage on the device
     attr_reader :capacity_mb
+    alias capacity capacity_mb
 
     # @return [Integer] how much of the capacity is in use?
     attr_reader :percentage_used
 
     # @return [Integer] what percentage of the battery is remaining
     attr_reader :battery_level
+    alias battery_percent battery_level
+
+    # network
+    ##########################
 
     # @return [String] the bluetooth mac addr
     attr_reader :bluetooth_mac_address
@@ -353,26 +312,23 @@ module JSS
     # @return [String] the wifi mac addr
     attr_reader :wifi_mac_address
 
-    # @return [Hash] !{:name=>"xxx", :id=>nnn} the computer associated with this device
-    attr_reader :computer
+    # @return [String] the IP addr
+    attr_reader :ip_address
 
-    # @return [String] what is this??
-    attr_reader :device_id
+    # @return [String] the phone number of the device's SIM card
+    attr_reader :sim_phone_number
+    alias device_phone_number sim_phone_number
 
-    # @return [String] the API's device_name and display_name are not used.
-    attr_reader :name
+    # timestamps
+    ##########################
 
     # @return [Time] uses the value from the API's initial_entry_date_epoch
     attr_reader :initial_entry_date
 
-    # @return [String] the IP addr
-    attr_reader :ip_address
-
-    # @return [String] the language setting
-    attr_reader :languages
-
     # @return [Time] uses the value from the API's last_backup_time_epoch
     attr_reader :last_backup_time
+    alias last_backup_date last_backup_time
+    alias last_backup last_backup_time
 
     # @return [Time] uses the value from the API's last_inventory_update_utc
     attr_reader :last_inventory_update
@@ -380,50 +336,12 @@ module JSS
     # @return [Time] the last time this device enrolled in Jamf
     attr_reader :last_enrollment
 
-    # @return [String] the locales
-    attr_reader :locales
-
-    # @return [Boolean] is this device managed?
-    attr_reader :managed
-
-    # @return [Boolean] is this device supervised?
-    attr_reader :supervised
-
-    # @return [String] the display name of the model
-    attr_reader :model_display
-    alias model model_display
-
-    # @return [String] the model identifier
-    attr_reader :model_identifier
+    # @return [Time] last_cloud_backup_date
+    attr_reader :last_cloud_backup_date
 
-    # @return [String] the model firmware
-    attr_reader :modem_firmware
-
-    # @return [String] the OS version
-    attr_reader :os_version
-
-    # @return [String] the OS build
-    attr_reader :os_build
-
-    # @return [String] the phone number of the device's SIM card
-    attr_reader :phone_number
+    # subsets
 
-    # @return [String] the serial numbee
-    attr_reader :serial_number
-
-    # @return [String] the site associated with this device
-    attr_reader :site
-
-    # @return [Boolean] Is this device supervised?
-    attr_reader :supervised
-
-    # @return [String] the tether state of the device
-    attr_reader :tethered
-
-    # @return [String] the udid
-    attr_reader :udid
-
-    # @return [Array<Hash>] the applications on the devices
+    # @return [Array<Hash>] the applications on the device
     attr_reader :applications
 
     # @return [Array<Hash>]
@@ -494,449 +412,124 @@ module JSS
     # - :file_level_encryption_capable=>true
     attr_reader :security
 
-    #####################################
     # Instance Methods
     #####################################
 
-    #
     # @see APIObject#initialize
     #
+    # When creating new records with .make,
+    # udid:, serial_number:, and asset_tag: can be provided in
+    # the args.
+    #
     def initialize(args = {})
       super args
-
-      gen = @init_data[:general]
-      @airplay_password = gen[:airplay_password]
-      @asset_tag = gen[:asset_tag]
-      @available_mb = gen[:available_mb]
-      @battery_level = gen[:battery_level]
-      @bluetooth_mac_address = gen[:bluetooth_mac_address]
-      @capacity_mb = gen[:capacity_mb]
-      @computer = gen[:computer]
-      @device_id = gen[:device_id]
-      @device_name = gen[:device_name]
-      @display_name = gen[:display_name]
-      @initial_entry_date = JSS.epoch_to_time gen[:initial_entry_date_epoch]
-      @ip_address = gen[:ip_address]
-      @languages = gen[:languages]
-      @last_backup_time = JSS.epoch_to_time gen[:last_backup_time_epoch]
-      @last_inventory_update = JSS.epoch_to_time gen[:last_inventory_update_epoch]
-      @last_enrollment = JSS.epoch_to_time gen[:last_enrollment_epoch]
-      @locales = gen[:locales]
-      @managed = gen[:managed]
-      @supervised = gen[:supervised]
-      @model_display = gen[:model_display]
-      @model_identifier = gen[:model_identifier]
-      @modem_firmware = gen[:modem_firmware]
-      @os_build = gen[:os_build]
-      @os_version = gen[:os_version]
-      @percentage_used = gen[:percentage_used]
-      @phone_number = gen[:phone_number]
-      @serial_number = gen[:serial_number]
-      @site = JSS::APIObject.get_name(gen[:site])
-      @supervised = gen[:supervised]
-      @tethered = gen[:tethered]
-      @udid = gen[:udid]
-      @wifi_mac_address = gen[:wifi_mac_address]
-
-      @mobile_device_groups = @init_data[:mobile_device_groups]
-      @network = @init_data[:network]
-      @extension_attributes = @init_data[:extension_attributes]
-      @certificates = @init_data[:certificates]
-      @configuration_profiles = @init_data[:configuration_profiles]
-      @provisioning_profiles = @init_data[:provisioning_profiles]
-      @security = @init_data[:security]
-      @applications = @init_data[:applications]
-    end # initialize
-
-    # Send a blank_push MDM command
-    #
-    # @see MobileDevice.send_mdm_command
-    #
-    # @return [String] The command uuid
-    #
-    def blank_push
-      self.class.send_mdm_command @id, :blank_push, api: @api
-    end #
-
-    # Send an update_inventory MDM command
-    #
-    # @see MobileDevice.send_mdm_command
-    #
-    # @return [String] The command uuid
-    #
-    def update_inventory
-      self.class.send_mdm_command @id, :update_inventory, api: @api
-    end
-
-    # Send a device_lock MDM command
-    #
-    # @param message[String] The message to display on the lock screen.
-    #
-    # @see MobileDevice.send_mdm_command
-    #
-    # @return [String] The command uuid
-    #
-    def device_lock(message)
-      self.class.send_mdm_command @id, :device_lock, message, api: @api
-    end
-
-    # Send an erase_device MDM command
-    #
-    # @see MobileDevice.send_mdm_command
-    #
-    # @return [String] The command uuid
-    #
-    def erase_device
-      self.class.send_mdm_command @id, :erase_device, api: @api
-    end
-
-    # Send a clear_passcode MDM command
-    #
-    # @see MobileDevice.send_mdm_command
-    #
-    # @return [String] The command uuid
-    #
-    def clear_passcode
-      self.class.send_mdm_command @id, :clear_passcode, api: @api
-    end
-
-    # Send a unmanage_device MDM command
-    #
-    # @see MobileDevice.send_mdm_command
-    #
-    # @return [String] The command uuid
-    #
-    def unmanage_device
-      @managed = false if self.class.send_mdm_command(@id, :unmanage_device, api: @api)
-    end
-
-    # Send a ClearRestrictionsPassword MDM command
-    #
-    # @see MobileDevice.send_mdm_command
-    #
-    # @return [String] The command uuid
-    #
-    def clear_restrictions_password
-      self.class.send_mdm_command @id, :clear_restrictions_password, api: @api
-    end
-
-    # Send a SettingsEnableDataRoaming MDM command
-    #
-    # @see MobileDevice.send_mdm_command
-    #
-    # @return [String] The command uuid
-    #
-    def enable_data_roaming
-      self.class.send_mdm_command @id, :enable_data_roaming, api: @api
-    end
-
-    # Send a disable_data_roaming MDM command
-    #
-    # @see MobileDevice.send_mdm_command
-    #
-    # @return [String] The command uuid
-    #
-    def disable_data_roaming
-      self.class.send_mdm_command @id, :disable_data_roaming, api: @api
-    end
-
-    # Send a enable_voice_roaming MDM command
-    #
-    # @see MobileDevice.send_mdm_command
-    #
-    # @return [String] The command uuid
-    #
-    def enable_voice_roaming
-      self.class.send_mdm_command @id, :enable_voice_roaming, api: @api
-    end
-
-    # Send a disable_voice_roaming MDM command
-    #
-    # @see MobileDevice.send_mdm_command
-    #
-    # @return [String] The command uuid
-    #
-    def disable_voice_roaming
-      self.class.send_mdm_command @id, :disable_voice_roaming, api: @api
-    end
-
-    # Send a enable_app_analytics MDM command
-    #
-    # @see MobileDevice.send_mdm_command
-    #
-    # @return [String] The command uuid
-    #
-    def enable_app_analytics
-      self.class.send_mdm_command @id, :enable_app_analytics, api: @api
-    end
-
-    # Send a disable_app_analytics MDM command
-    #
-    # @see MobileDevice.send_mdm_command
-    #
-    # @return [String] The command uuid
-    #
-    def disable_app_analytics
-      self.class.send_mdm_command @id, :disable_app_analytics, api: @api
-    end
-
-    # Send a enable_diagnostic_submission MDM command
-    #
-    # @see MobileDevice.send_mdm_command
-    #
-    # @return [String] The command uuid
-    #
-    def enable_diagnostic_submission
-      self.class.send_mdm_command @id, :enable_diagnostic_submission, api: @api
-    end
-
-    # Send a disable_diagnostic_submission MDM command
-    #
-    # @see MobileDevice.send_mdm_command
-    #
-    # @return [String] The command uuid
-    #
-    def disable_diagnostic_submission
-      self.class.send_mdm_command @id, :disable_diagnostic_submission, api: @api
-    end
-
-    # Send a device_name MDM command
-    #
-    # @param new_name[String] The name for the device
-    #
-    # @see MobileDevice.send_mdm_command
-    #
-    # @return [String] The command uuid
-    #
-    def device_name(new_name)
-      self.class.send_mdm_command @id, :device_name, new_name, api: @api
-    end
-
-    # Send a shutdown device MDM command
-    #
-    # @see MobileDevice.send_mdm_command
-    #
-    # @return [String] The command uuid
-    #
-    def shutdown
-      self.class.send_mdm_command @id, :shutdown, api: @api
-    end
-
-    # Send a restart device MDM command
-    #
-    # @see MobileDevice.send_mdm_command
-    #
-    # @return [String] The command uuid
-    #
-    def restart
-      self.class.send_mdm_command @id, :restart, api: @api
-    end
-
-    # The full management History data for this Mobile Device
-    #
-    # @return [Hash] Keys are:
-    #   general: Hash of identifiers
-    #   user_location: see user_location_history
-    #   management_commands: see management_command_history
-    #   audits:  see audit_history
-    #   applications: see managed_app_history
-    #   ebooks: see managed
-    #
-    def management_history
-      self.class.management_history @id, api: @api
-    end
-
-    # The user_location subset of the full history
-    #
-    # @return [Array<Hash>] Each hash contains user and location data
-    #   and the timestamp as a JSS epoch value or string.
-    #   use JSS.epoch_to_time or JSS.parse_time to convert them to Time
-    #   objects
-    #
-    def user_location_history
-      self.class.management_history @id, :user_location, api: @api
-    end
-
-    # The management_commands subset of the full history
-    #
-    # @return [Hash] A hash of :completed, :pending, and :failed
-    #   mdm commands, each being an array of hashes.
-    #   see #completed_mdm_commands, #pending_mdm_commands and
-    #   #failed_mdm_commands
-    #
-    def management_command_history
-      self.class.management_history @id, :management_commands, api: @api
-    end
-    alias mdm_command_history management_command_history
-
-    # The history of completed mdm commands.
-    #
-    # @return [Array<Hash>] Each hash contains a command name and
-    #   and the timestamp as a JSS epoch value or string.
-    #   use JSS.epoch_to_time or JSS.parse_time to convert them to Time
-    #   objects
-    #
-    def completed_mdm_commands
-      management_command_history[:completed]
-    end
-
-    # The currently pending mdm commands.
-    #
-    # @return [Array<Hash>] Each hash contains a command name and a :status
-    #   and a a timestamp as a JSS epoch value or string.
-    #   use JSS.epoch_to_time or JSS.parse_time to convert them to Time
-    #   objects
-    #
-    def pending_mdm_commands
-      management_command_history[:pending]
-    end
-
-    # The history of failed mdm commands.
-    #
-    # @return [Array<Hash>] Each hash contains a command name and an :error
-    #   message and timestamps for issuance and failure as JSS epoch values
-    #   or strings. use JSS.epoch_to_time or JSS.parse_time to convert them to
-    #   Time objects
-    #
-    def failed_mdm_commands
-      management_command_history[:failed]
-    end
-
-    # The applications subset of the full history
-    #
-    # @return [Hash] Keys are :installed, :pending, and :failed
-    #   See #installed_managed_apps, #pending_managed_apps and
-    #   #failed_managed_apps
-    #
-    def managed_app_history
-      self.class.management_history @id, :applications, api: @api
-    end
-
-    # The apps that have been installed via MDM
-    #
-    # @param from[Symbol] :in_house, :app_store, :other, or :all.
-    #   Defaults to :all
-    #
-    # @return [Hash{Array<Hash>}] When from = :all, all three sources.
-    #
-    # @return [Array<Hash>] When from = :in_house, :app_store, or :other
-    #   the managed apps that have been installed from that source.
-    #   Each Hash includes these keys:
-    #     name:
-    #     version:
-    #     short_version:
-    #     management_status:
-    #     bundle_size:
-    #     dynamic_size:
-    #
-    def installed_managed_apps(from = :all)
-      all = managed_app_history[:installed]
-      case from
-      when :all
-        all
-      when :in_house
-        all[:in_house_from_mobile_device_app_catalog]
-      when :app_store
-        all[:app_store_from_mobile_device_app_catalog]
-      when :other
-        all[:other]
+      if @in_jss
+
+        gen = @init_data[:general]
+
+        # identifiers
+        @serial_number = gen[:serial_number]
+        @udid = gen[:udid]
+        @asset_tag = gen[:asset_tag]
+        @device_id = gen[:device_id]
+        @device_name = gen[:device_name]
+        @display_name = gen[:display_name]
+        @exchange_activesync_device_identifier = gen[:exchange_activesync_device_identifier]
+
+        # settings
+        @managed = gen[:managed]
+        @supervised = gen[:supervised]
+        @device_ownership_level = gen[:device_ownership_level]
+        @tethered = gen[:tethered]
+        @shared = gen[:shared]
+        @ble_capable = gen[:ble_capable]
+
+        @airplay_password = gen[:airplay_password]
+        @languages = gen[:languages]
+        @locales = gen[:locales]
+
+        # software
+        @os_type = gen[:os_type]
+        @os_build = gen[:os_build]
+        @os_version = gen[:os_version]
+        @modem_firmware = gen[:modem_firmware]
+
+        # hardware
+        @model = gen[:model]
+        @model_number = gen[:model_number]
+        @model_identifier = gen[:model_identifier]
+        @model_display = gen[:model_display]
+
+        # usage
+        @capacity_mb = gen[:capacity_mb]
+        @available_mb = gen[:available_mb]
+        @percentage_used = gen[:percentage_used]
+        @battery_level = gen[:battery_level]
+
+        # network
+        @bluetooth_mac_address = gen[:bluetooth_mac_address]
+        @wifi_mac_address = gen[:wifi_mac_address]
+        @sim_phone_number = gen[:phone_number]
+        @ip_address = gen[:ip_address]
+
+        # timestamps
+        @initial_entry_date = JSS.epoch_to_time gen[:initial_entry_date_epoch]
+        @last_backup_time = JSS.epoch_to_time gen[:last_backup_time_epoch]
+        @last_cloud_backup_date = JSS.epoch_to_time gen[:last_cloud_backup_date_epoch]
+        @last_inventory_update = JSS.epoch_to_time gen[:last_inventory_update_epoch]
+        @last_enrollment = JSS.epoch_to_time gen[:last_enrollment_epoch]
+
+        # subsets
+        @mobile_device_groups = @init_data[:mobile_device_groups]
+        @network = @init_data[:network]
+        @extension_attributes = @init_data[:extension_attributes]
+        @certificates = @init_data[:certificates]
+        @configuration_profiles = @init_data[:configuration_profiles]
+        @provisioning_profiles = @init_data[:provisioning_profiles]
+        @security = @init_data[:security]
+        @applications = @init_data[:applications]
       else
-        raise JSS::InvalidDataError, "Unknown mobiledevice app source: '#{from}'"
+        @udid = args[:udid]
+        @serial_number = args[:serial_number]
+        @asset_tag = args[:asset_tag]
       end
-    end
+    end # initialize
 
-    # An array of pending managed app installs.
-    #
-    # @return [Array<Hash>] Hashes for each pending app install
-    #
-    def pending_managed_apps
-      managed_app_history[:pending]
+    def name=(new_name)
+      super
+      @needs_mdm_name_change = true if managed? && supervised?
     end
 
-    # An array of data about failed managed app installs
-    #
-    # @return [Array<Hash>] The name: and version: of each failed app install.
     #
-    def failed_managed_apps
-      managed_app_history[:failed]
+    def serial_number=(new_val)
+      return nil if new_val == @serial_number
+      @serial_number =  new_val.empty? ? new_val : JSS::Validate.unique_identifier(self.class, :serial_number, new_val, api: api)
+      @need_to_update = true
     end
 
-    # The audits subset of the full history
-    # The history of 'auditable' events.
     #
-    # @return [Array<Hash>] One hash per event
-    #
-    def audit_history
-      self.class.management_history @id, :audits, api: @api
+    def udid=(new_val)
+      return nil if new_val == @udid
+      @udid = new_val.empty? ? new_val : JSS::Validate.unique_identifier(self.class, :udid, new_val, api: api)
+      @need_to_update = true
     end
 
-    # The ebooks subset of the full history
-    #
-    # @return [Hash] Keys are :installed, :pending, and :failed
-    #   See #installed_managed_ebooks, #pending_managed_ebooks and
-    #   #failed_managed_ebooks
     #
-    def managed_ebook_history
-      self.class.management_history @id, :ebooks, api: @api
+    def asset_tag=(new_val)
+      return nil if @asset_tag == new_val
+      new_val.strip!
+      @asset_tag = new_val
+      @need_to_update = true
     end
 
-    # The ebooks that have been installed via MDM
-    #
-    # @param from[Symbol] :in_house, :ibookstore, or :all.
-    #   Defaults to :all
-    #
-    # @return [Hash{Array<Hash>}] When from = :all, all three sources.
     #
-    # @return [Array<Hash>] When from = :in_house, :app_store, or :other
-    #   the managed apps that have been installed from that source.
-    #
-    def installed_managed_ebooks(from = :all)
-      all = managed_ebook_history[:installed]
-      case from
-      when :all
-        all
-      when :in_house
-        all[:inhouse]
-      when :ibookstore
-        all[:ibookstore]
-      else
-        raise JSS::InvalidDataError, "Unknown ebook source: '#{from}'"
-      end
-    end
-
-    # Mananged ebooks pending installation
-    #
-    # @return [Array<Hash>] The pending ebooks
-    #
-    def pending_managed_ebooks
-      managed_ebook_history[:pending]
-    end
-
-   # Mananged ebooks tha failed installation
-   #
-   # @return [Array<Hash>] The failed ebook installs
-   #
-    def failed_managed_ebooks
-      managed_ebook_history[:failed]
+    def update
+      super
+      return unless @needs_mdm_name_change
+      set_device_mame @name if managed? && supervised?
+      @needs_mdm_name_change = false
     end
 
-
-    # Aliases
-    alias battery_percent battery_level
-    alias managed? managed
-    alias sn serial_number
-    alias serialnumber serial_number
-
-    alias noop blank_push
-    alias send_blank_push blank_push
-    alias recon update_inventory
-    alias lock device_lock
-    alias lock_device device_lock
-    alias erase erase_device
-    alias wipe erase_device
-    alias unmanage unmanage_device
-    alias make_unmanaged unmanage_device
-
     # private methods
     ##############################
 
@@ -945,12 +538,16 @@ module JSS
     def rest_xml
       doc = REXML::Document.new APIConnection::XML_HEADER
       md = doc.add_element self.class::RSRC_OBJECT_KEY.to_s
+      general = md.add_element('general')
+      general.add_element('name').text = @name
+      general.add_element('udid').text = @udid
+      general.add_element('serial_number').text = @serial_number
+      general.add_element('asset_tag').text = @asset_tag
 
-      md << ext_attr_xml if @changed_eas && !@changed_eas.empty?
-
+      md << ext_attr_xml if unsaved_eas?
       md << location_xml if has_location?
       md << purchasing_xml if has_purchasing?
-
+      add_site_to_xml doc
       doc.to_s
     end