ruby-jss 1.6.4 → 2.0.0b1

data/lib/{jss/api_object → jamf/api/classic/api_objects}/mdm.rb

@@ -1,4 +1,4 @@
-### Copyright 2020 Pixar
+### Copyright 2022 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")
@@ -24,7 +24,7 @@
 ###
 
 ###
-module JSS
+module Jamf
 
   # Mixin Modules
   #####################################
@@ -76,6 +76,8 @@ module JSS
 
     DELETE_USER = 'DeleteUser'.freeze
     UNLOCK_USER_ACCOUNT = 'UnlockUserAccount'.freeze
+    ENABLE_REMOTE_DESKTOP = 'EnableRemoteDesktop'.freeze
+    DISABLE_REMOTE_DESKTOP = 'DisableRemoteDesktop'.freeze
 
     # devices
 
@@ -116,7 +118,9 @@ module JSS
       ERASE_DEVICE,
       UNMANGE_DEVICE,
       DELETE_USER,
-      UNLOCK_USER_ACCOUNT
+      UNLOCK_USER_ACCOUNT,
+      ENABLE_REMOTE_DESKTOP,
+      DISABLE_REMOTE_DESKTOP
     ].freeze
 
     # The MDM commands applicable to all mobile devices
@@ -188,6 +192,9 @@ module JSS
 
       delete_user: DELETE_USER,
 
+      enable_remote_desktop: ENABLE_REMOTE_DESKTOP,
+      disable_remote_desktop: DISABLE_REMOTE_DESKTOP,
+
       # mobile devices only
       settings: SETTINGS, # not yet implemented as its own method
 
@@ -240,8 +247,7 @@ module JSS
       DEVICE_LOCK => :passcode, # 6 char passcode
       ERASE_DEVICE => String, # 6 char passcode
       DELETE_USER => String, # username
-      UNLOCK_USER_ACCOUNT => String, # username
-
+      UNLOCK_USER_ACCOUNT => String # username
     }.freeze
 
     WALLPAPER_LOCATIONS = {
@@ -305,17 +311,17 @@ module JSS
       #
       # @example send a blank push to mobiledevice id 12 without instantiating:
       #
-      #   JSS::MobileDevice.send_blank_push 12
+      #   Jamf::MobileDevice.send_blank_push 12
       #
       # @example send a blank push to mobiledevice id 12 with instantiating:
       #
-      #   device = JSS::MobileDevice.fetch id: 12
+      #   device = Jamf::MobileDevice.fetch id: 12
       #   device.send_blank_push
       #
       # @example send a blank push to computers in computer groups
       #   'SpecialMacs' and 'FooBarGroup'
       #
-      #   JSS::ComputerGroup.send_blank_push ['SpecialMacs', 'FooBarGroup']
+      #   Jamf::ComputerGroup.send_blank_push ['SpecialMacs', 'FooBarGroup']
       #
       # @param targets[String,Integer,Array<String,Integer>]
       #   the name or id of the device(s), or devicegroup(s) to receive the
@@ -329,8 +335,8 @@ module JSS
       # @param opts[Hash] Some commands require extra data, e.g. a device name.
       #   Put it here
       #
-      # @param api[JSS::APIConnection] the API connection to use. Defaults to the
-      #   currently active API, see {JSS::APIConnection}
+      # @param cnx [Jamf::Connection] the API connection to use. Defaults to the
+      #   currently active API, see {Jamf::Connection}
       #
       # @return [Hash{Integer=>String}] Keys are the target device ids.
       #   Values depend on the kind of target:
@@ -344,12 +350,14 @@ module JSS
       #   always 'Command sent' (an error will be raised if there are problems
       #   sending)
       #
-      def send_mdm_command(targets, command, opts: {}, api: JSS.api)
+      def send_mdm_command(targets, command, opts: {}, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
         command = validate_command(command)
 
         rsrc = "#{send_command_rsrc}/command/#{command}"
 
-        targets = raw_targets_to_ids targets, api: api
+        targets = raw_targets_to_ids targets, cnx: cnx
 
         cmd_xml = mdm_command_xml(command, opts, targets)
 
@@ -359,7 +367,7 @@ module JSS
           puts "\n\nTo rsrc: #{rsrc}"
         end
 
-        result = api.post_rsrc rsrc, cmd_xml
+        result = cnx.c_post rsrc, cmd_xml
 
         if command == BLANK_PUSH
           hash = {}
@@ -419,7 +427,7 @@ module JSS
         when *DEVICE_TARGETS
           DEVICE_RSRC
         else
-          raise JSS::InvalidDataError, "Unknown MDM command target: #{self::MDM_COMMAND_TARGET}"
+          raise Jamf::InvalidDataError, "Unknown MDM command target: #{self::MDM_COMMAND_TARGET}"
         end
       end
 
@@ -430,20 +438,23 @@ module JSS
       #
       # @param expand_groups[Boolean] Should groups be expanded into member ids?
       #
-      # @param api[JSS::APIConnection] an API connection to use.
+      # @param cnx [Jamf::Connection] an API connection to use.
       #
       # @return [Array<Integer>] The ids of the target devices for a command
       #
-      def raw_targets_to_ids(targets, api: JSS.api, expand_groups: true)
+      def raw_targets_to_ids(targets, expand_groups: true, unmanaged_ok: false, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
         targets = targets.is_a?(Array) ? targets : [targets]
 
         # flush caches before checking ids and managment
-        api.flushcache self::RSRC_LIST_KEY
+        cnx.flushcache self::RSRC_LIST_KEY
 
         # make sure its an array of ids
         targets.map! do |md|
-          id = valid_id md, api: api
-          raise JSS::NoSuchItemError, "No #{self} matches identifier: #{md}" unless id
+          id = valid_id md, cnx: cnx
+          raise Jamf::NoSuchItemError, "No #{self} matches identifier: #{md}" unless id
+
           id
         end # map!
 
@@ -455,13 +466,17 @@ module JSS
         end
 
         # make sure all of them are managed, or else the API will raise a 400
-        # 'Bad Request' when sending the command to an unmanaged target
-        all_mgd = map_all_ids_to(:managed, api: api).select { |_id, mgd| mgd }.keys
-
-        targets.each do |target_id|
-          raise JSS::UnmanagedError, "#{self} with id #{target_id} is not managed. Cannot send command." unless all_mgd.include? target_id
-        end
-
+        # 'Bad Request' when sending the command to an unmanaged target.
+        # Some actions, like flushing MDM commands (see .flush_mdm_commands)
+        # are OK on unmanaged machines, so they will specify 'unmanaged_ok'
+        unless unmanaged_ok
+          all_mgd = map_all_ids_to(:managed, cnx: cnx).select { |_id, mgd| mgd }.keys
+
+          targets.each do |target_id|
+            raise Jamf::UnmanagedError, "#{self} with id #{target_id} is not managed. Cannot send command." unless all_mgd.include? target_id
+          end
+        end # unles
+        
         targets
       end
 
@@ -477,22 +492,22 @@ module JSS
       # @return [String] The XML content to send to the API
       #
       def mdm_command_xml(command, options, targets)
-        raise JSS::MissingDataError, 'Targets cannot be empty' if targets.empty?
+        raise Jamf::MissingDataError, 'Targets cannot be empty' if targets.empty?
 
         case self::MDM_COMMAND_TARGET
         when *COMPUTER_TARGETS
           command_elem = COMPUTER_COMMAND_ELEMENT
-          target_list_elem = JSS::Computer::RSRC_LIST_KEY.to_s
-          target_elem = JSS::Computer::RSRC_OBJECT_KEY.to_s
+          target_list_elem = Jamf::Computer::RSRC_LIST_KEY.to_s
+          target_elem = Jamf::Computer::RSRC_OBJECT_KEY.to_s
         when *DEVICE_TARGETS
           command_elem = DEVICE_COMMAND_ELEMENT
-          target_list_elem = JSS::MobileDevice::RSRC_LIST_KEY.to_s
-          target_elem = JSS::MobileDevice::RSRC_OBJECT_KEY.to_s
+          target_list_elem = Jamf::MobileDevice::RSRC_LIST_KEY.to_s
+          target_elem = Jamf::MobileDevice::RSRC_OBJECT_KEY.to_s
         else
-          raise JSS::NoSuchItemError, "Unknonwn MDM command target: #{self::MDM_COMMAND_TARGET}"
+          raise Jamf::NoSuchItemError, "Unknonwn MDM command target: #{self::MDM_COMMAND_TARGET}"
         end # case
 
-        xml = REXML::Document.new JSS::APIConnection::XML_HEADER
+        xml = REXML::Document.new Jamf::Connection::XML_HEADER
         cmd_xml = xml.add_element command_elem
 
         general = cmd_xml.add_element GENERAL_ELEMENT
@@ -518,20 +533,22 @@ module JSS
       # @return [String] the matching value for the command symbol given
       #
       def validate_command(command)
-        raise JSS::NoSuchItemError, "Unknown command '#{command}'" unless COMMANDS.keys.include? command
+        raise Jamf::NoSuchItemError, "Unknown command '#{command}'" unless COMMANDS.keys.include? command
 
         command = COMMANDS[command]
 
         case self::MDM_COMMAND_TARGET
         when *COMPUTER_TARGETS
           return command if COMPUTER_COMMANDS.include? command
-          raise JSS::UnsupportedError, "'#{command}' cannot be sent to computers or computer groups"
+
+          raise Jamf::UnsupportedError, "'#{command}' cannot be sent to computers or computer groups"
         when *DEVICE_TARGETS
           return command if DEVICE_COMMANDS.include? command
-          raise JSS::UnsupportedError, "'#{command}' cannot be sent to mobile devices or mobile device groups"
+
+          raise Jamf::UnsupportedError, "'#{command}' cannot be sent to mobile devices or mobile device groups"
         end
 
-        raise JSS::NoSuchItemError, "'#{command}' is known, but not available for computers or mobile devices. This is a bug. Please report it."
+        raise Jamf::NoSuchItemError, "'#{command}' is known, but not available for computers or mobile devices. This is a bug. Please report it."
       end
 
       ###### The individual commands
@@ -545,12 +562,14 @@ module JSS
       #
       # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)]
       #
-      def blank_push(targets, api: JSS.api)
-        send_mdm_command targets, :blank_push, api: api
+      def blank_push(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :blank_push, cnx: cnx
       end
       alias send_blank_push blank_push
       alias noop blank_push
@@ -563,20 +582,23 @@ module JSS
       #
       # @param message[String] An optional message to display on mobiledevices & mobiledevicegroups
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def device_lock(targets, passcode: '', message: nil, api: JSS.api)
+      def device_lock(targets, passcode: '', message: nil, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
         case self::MDM_COMMAND_TARGET
         when *COMPUTER_TARGETS
-          raise JSS::InvalidDataError, 'Locking computers requires a 6-character String passcode' unless passcode.size == 6
+          raise Jamf::InvalidDataError, 'Locking computers requires a 6-character String passcode' unless passcode.size == 6
+
           opts = { passcode: passcode }
         when *DEVICE_TARGETS
           opts = {}
           opts[:lock_message] = message if message
         end # case
-        send_mdm_command targets, :device_lock, opts: opts, api: api
+        send_mdm_command targets, :device_lock, opts: opts, cnx: cnx
       end
       alias lock_device device_lock
       alias lock device_lock
@@ -589,20 +611,23 @@ module JSS
       #
       # @param preserve_data_plan[Boolean] Should the data plan of the mobile device be preserved?
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def erase_device(targets, passcode: '', preserve_data_plan: false, api: JSS.api)
+      def erase_device(targets, passcode: '', preserve_data_plan: false, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
         case self::MDM_COMMAND_TARGET
         when *COMPUTER_TARGETS
-          raise JSS::InvalidDataError, 'Erasing computers requires a 6-character String passcode' unless passcode.size == 6
+          raise Jamf::InvalidDataError, 'Erasing computers requires a 6-character String passcode' unless passcode.size == 6
+
           opts = { passcode: passcode }
         when *DEVICE_TARGETS
           opts = {}
           opts[:preserve_data_plan] = 'true' if preserve_data_plan
         end # case
-        send_mdm_command targets, :erase_device, opts: opts, api: api
+        send_mdm_command targets, :erase_device, opts: opts, cnx: cnx
       end
       alias wipe erase_device
       alias wipe_device erase_device
@@ -614,16 +639,18 @@ module JSS
       # NOTE: when used with computers, the mdm profile will probably
       # be re-installed immediately unless the computer is also no longer
       # managed by Jamf Pro itself. To fully unmanage a computer, use
-      # the {JSS::Computer#make_unmanaged} instance method.
+      # the {Jamf::Computer#make_unmanaged} instance method.
       #
       # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def unmanage_device(targets, api: JSS.api)
-        send_mdm_command targets, :unmanage_device, api: api
+      def unmanage_device(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :unmanage_device, cnx: cnx
       end
       alias remove_mdm_profile unmanage_device
 
@@ -636,12 +663,14 @@ module JSS
       #
       # @param user[String] the username of the acct to unlock
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def unlock_user_account(targets, user, api: JSS.api)
-        send_mdm_command targets, :unlock_user_account, opts: { user_name: user }, api: api
+      def unlock_user_account(targets, user, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :unlock_user_account, opts: { user_name: user }, cnx: cnx
       end
 
       # Send a delete_user command to one or more targets
@@ -650,12 +679,42 @@ module JSS
       #
       # @param user[String] the username of the acct to delete
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def delete_user(targets, user, api: JSS.api)
-        send_mdm_command targets, :delete_user, opts: { user_name: user }, api: api
+      def delete_user(targets, user, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :delete_user, opts: { user_name: user }, cnx: cnx
+      end
+
+      # Send an enable_remote_desktop command to one or more targets
+      #
+      # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
+      #
+      # @param cnx [Jamf::Connection] the API thru which to send the command
+      #
+      # @return (see .send_mdm_command)
+      #
+      def enable_remote_desktop(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :enable_remote_desktop, cnx: cnx
+      end
+
+      # Send a disable_remote_desktop command to one or more targets
+      #
+      # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
+      #
+      # @param cnx [Jamf::Connection] the API thru which to send the command
+      #
+      # @return (see .send_mdm_command)
+      #
+      def disable_remote_desktop(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :disable_remote_desktop, cnx: cnx
       end
 
       # Commands for mobile devices only
@@ -665,12 +724,14 @@ module JSS
       #
       # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def update_inventory(targets, api: JSS.api)
-        send_mdm_command targets, :update_inventory, api: api
+      def update_inventory(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :update_inventory, cnx: cnx
       end
       alias recon update_inventory
 
@@ -678,72 +739,84 @@ module JSS
       #
       # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def clear_passcode(targets, api: JSS.api)
-        send_mdm_command targets, :clear_passcode, api: api
+      def clear_passcode(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :clear_passcode, cnx: cnx
       end
 
       # Send an clear_restrictions_password command to one or more targets
       #
       # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def clear_restrictions_password(targets, api: JSS.api)
-        send_mdm_command targets, :clear_restrictions_password, api: api
+      def clear_restrictions_password(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :clear_restrictions_password, cnx: cnx
       end
 
       # Send an enable_data_roaming command to one or more targets
       #
       # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def enable_data_roaming(targets, api: JSS.api)
-        send_mdm_command targets, :enable_data_roaming, api: api
+      def enable_data_roaming(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :enable_data_roaming, cnx: cnx
       end
 
       # Send andisable_data_roaming command to one or more targets
       #
       # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def disable_data_roaming(targets, api: JSS.api)
-        send_mdm_command targets, :disable_data_roaming, api: api
+      def disable_data_roaming(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :disable_data_roaming, cnx: cnx
       end
 
       # Send an enable_voice_roaming command to one or more targets
       #
       # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def enable_voice_roaming(targets, api: JSS.api)
-        send_mdm_command targets, :enable_voice_roaming, api: api
+      def enable_voice_roaming(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :enable_voice_roaming, cnx: cnx
       end
 
       # Send a disable_voice_roaming command to one or more targets
       #
       # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def disable_voice_roaming(targets, api: JSS.api)
-        send_mdm_command targets, :disable_voice_roaming, api: api
+      def disable_voice_roaming(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :disable_voice_roaming, cnx: cnx
       end
 
       # Commands for supervized mobile devices only
@@ -755,12 +828,14 @@ module JSS
       #
       # @param name[String] The new name
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def device_name(targets, name, api: JSS.api)
-        send_mdm_command targets, :device_name, opts: { device_name: name }, api: api
+      def device_name(targets, name, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :device_name, opts: { device_name: name }, cnx: cnx
       end
       alias set_name device_name
       alias set_device_name device_name
@@ -777,18 +852,24 @@ module JSS
       # @param wallpaper_id[Symbol] The id of an Icon in Jamf Pro to use as the wallpaper image,
       #   required if no wallpaper_content
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def wallpaper(targets, wallpaper_setting: nil, wallpaper_content: nil, wallpaper_id: nil, api: JSS.api)
-        raise ArgumentError, "wallpaper_setting must be one of: :#{WALLPAPER_LOCATIONS.keys.join ', :'}" unless WALLPAPER_LOCATIONS.keys.include? wallpaper_setting
+      def wallpaper(targets, wallpaper_setting: nil, wallpaper_content: nil, wallpaper_id: nil, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        unless WALLPAPER_LOCATIONS.keys.include? wallpaper_setting
+          raise ArgumentError, 
+                "wallpaper_setting must be one of: :#{WALLPAPER_LOCATIONS.keys.join ', :'}"
+        end
 
         opts = { wallpaper_setting: WALLPAPER_LOCATIONS[wallpaper_setting] }
 
         if wallpaper_content
           file = Pathname.new wallpaper_content
-          raise JSS::NoSuchItemError, "Not a file: #{file}" unless file.file?
+          raise Jamf::NoSuchItemError, "Not a file: #{file}" unless file.file?
+
           opts[:wallpaper_content] = Base64.encode64 file.read
         elsif wallpaper_id
           opts[:wallpaper_id] = wallpaper_id
@@ -796,7 +877,7 @@ module JSS
           raise ArgumentError, 'Either wallpaper_id: or wallpaper_content must be provided'
         end
 
-        send_mdm_command targets, :wallpaper, opts: opts, api: api
+        send_mdm_command targets, :wallpaper, opts: opts, cnx: cnx
       end
       alias set_wallpaper wallpaper
 
@@ -806,24 +887,28 @@ module JSS
       #
       # @param secs[Integer] The numer of seconds for the grace period
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def passcode_lock_grace_period(targets, secs, api: JSS.api)
-        send_mdm_command targets, :passcode_lock_grace_period, opts: { passcode_lock_grace_period: secs }, api: api
+      def passcode_lock_grace_period(targets, secs, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :passcode_lock_grace_period, opts: { passcode_lock_grace_period: secs }, cnx: cnx
       end
 
       # Send a shut_down_device command to one or more targets
       #
       # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def shut_down_device(targets, api: JSS.api)
-        send_mdm_command targets, :shut_down_device, api: api
+      def shut_down_device(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :shut_down_device, cnx: cnx
       end
       alias shutdown_device shut_down_device
       alias shut_down shut_down_device
@@ -833,12 +918,14 @@ module JSS
       #
       # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def restart_device(targets, api: JSS.api)
-        send_mdm_command targets, :restart_device, api: api
+      def restart_device(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :restart_device, cnx: cnx
       end
       alias restart restart_device
 
@@ -846,48 +933,56 @@ module JSS
       #
       # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def enable_app_analytics(targets, api: JSS.api)
-        send_mdm_command targets, :enable_app_analytics, api: api
+      def enable_app_analytics(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :enable_app_analytics, cnx: cnx
       end
 
       # Send a disable_app_analytics command to one or more targets
       #
       # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def disable_app_analytics(targets, api: JSS.api)
-        send_mdm_command targets, :disable_app_analytics, api: api
+      def disable_app_analytics(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :disable_app_analytics, cnx: cnx
       end
 
       # Send an enable_diagnostic_submission command to one or more targets
       #
       # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def enable_diagnostic_submission(targets, api: JSS.api)
-        send_mdm_command targets, :enable_diagnostic_submission, api: api
+      def enable_diagnostic_submission(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :enable_diagnostic_submission, cnx: cnx
       end
 
       # Send a disable_diagnostic_submission command to one or more targets
       #
       # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def disable_diagnostic_submission(targets, api: JSS.api)
-        send_mdm_command targets, :disable_diagnostic_submission, api: api
+      def disable_diagnostic_submission(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :disable_diagnostic_submission, cnx: cnx
       end
 
       # Send a enable_lost_mode command to one or more targets
@@ -906,51 +1001,59 @@ module JSS
       #
       # @param enforce_lost_mode[Boolean] Re-enabled lost mode when re-enrolled after wipe.
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
       def enable_lost_mode(
-            targets,
-            message: nil,
-            phone: nil,
-            footnote: nil,
-            play_sound: false,
-            enforce_lost_mode: true,
-            api: JSS.api
+        targets,
+        message: nil,
+        phone: nil,
+        footnote: nil,
+        play_sound: false,
+        enforce_lost_mode: true,
+        api: nil,
+        cnx: Jamf.cnx
       )
+        cnx = api if api
+
         raise ArgumentError, 'Either message: or phone_number: must be provided' unless message || phone
+
         opts = { always_enforce_lost_mode: enforce_lost_mode }
         opts[:lost_mode_message] = message if message
         opts[:lost_mode_phone] = phone if phone
         opts[:lost_mode_footnote] = footnote if footnote
         opts[:lost_mode_with_sound] = 'true' if play_sound
 
-        send_mdm_command targets, :enable_lost_mode, opts: opts, api: api
+        send_mdm_command targets, :enable_lost_mode, opts: opts, cnx: cnx
       end
 
       # Send a play_lost_mode_sound command to one or more targets
       #
       # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def play_lost_mode_sound(targets, api: JSS.api)
-        send_mdm_command targets, :play_lost_mode_sound, api: api
+      def play_lost_mode_sound(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :play_lost_mode_sound, cnx: cnx
       end
 
       # Send a disable_lost_mode command to one or more targets
       #
       # @param targets[String,Integer,Array<String,Integer>] @see .send_mdm_command
       #
-      # @param api[JSS::APIConnection] the API thru which to send the command
+      # @param cnx [Jamf::Connection] the API thru which to send the command
       #
       # @return (see .send_mdm_command)
       #
-      def disable_lost_mode(targets, api: JSS.api)
-        send_mdm_command targets, :disable_lost_mode, api: api
+      def disable_lost_mode(targets, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        send_mdm_command targets, :disable_lost_mode, cnx: cnx
       end
 
       # Flushing Commands
@@ -964,19 +1067,23 @@ module JSS
       #   of them. NOTE: when calling this on a Group class, the targets
       #   are the groups themselves, not the individual members.
       #
-      # @param status[String] a key from {JSS::Commandable::FLUSHABLE_STATUSES}
+      # @param status[String] a key from {Jamf::Commandable::FLUSHABLE_STATUSES}
       #
-      # @param api[JSS::APIConnection] an API connection to use.
-      #   Defaults to the corrently active API. See {JSS::APIConnection}
+      # @param cnx [Jamf::Connection] an API connection to use.
+      #   Defaults to the corrently active API. See {Jamf::Connection}
       #
       # @return [void]
       #
-      def flush_mdm_commands(targets, status: nil, api: JSS.api)
-        raise JSS::InvalidDataError, "Status must be one of :#{FLUSHABLE_STATUSES.keys.join ', :'}" unless FLUSHABLE_STATUSES.keys.include? status
+      def flush_mdm_commands(targets, status: nil, api: nil, cnx: Jamf.cnx)
+        cnx = api if api
+
+        raise Jamf::InvalidDataError, "Status must be one of :#{FLUSHABLE_STATUSES.keys.join ', :'}" unless FLUSHABLE_STATUSES.keys.include? status
 
         status = FLUSHABLE_STATUSES[status]
 
-        target_ids = raw_targets_to_ids targets, api: api, expand_groups: false
+        # TODO: add 'unmanaged_ok:' param to raw_targets_to_ids method, so that we can 
+        # use this to flush commands for unmanaged machines.
+        target_ids = raw_targets_to_ids targets, cnx: cnx, expand_groups: false, unmanaged_ok: true
 
         command_flush_rsrc = "commandflush/#{self::MDM_COMMAND_TARGET}/id"
 
@@ -984,15 +1091,15 @@ module JSS
 
         puts "Sending API DELETE: #{flush_rsrc}" if JSS.devmode?
 
-        api.delete_rsrc flush_rsrc
+        cnx.c_delete flush_rsrc
       end
 
     end # module ClassMethods
 
     # Extend ourself when included
-    # @see {JSS::MDM::ClassMethods}
+    # @see {Jamf::MDM::ClassMethods}
     def self.included(klass)
-      klass.extend JSS::MDM::ClassMethods
+      klass.extend Jamf::MDM::ClassMethods
     end
 
     # Mixin Instance Methods
@@ -1009,7 +1116,7 @@ module JSS
     # @return [void]
     #
     def blank_push
-      self.class.send_blank_push @id, api: @api
+      self.class.send_blank_push @id, cnx: @cnx
     end
     alias send_blank_push blank_push
     alias noop blank_push
@@ -1022,7 +1129,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def device_lock(passcode_or_message = '')
-      self.class.device_lock @id, passcode: passcode_or_message, message: passcode_or_message, api: @api
+      self.class.device_lock @id, passcode: passcode_or_message, message: passcode_or_message, cnx: @cnx
     end
     alias lock device_lock
     alias lock_device device_lock
@@ -1034,7 +1141,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def erase_device(passcode = '', preserve_data_plan: false)
-      self.class.erase_device @id, passcode: passcode, preserve_data_plan: preserve_data_plan, api: @api
+      self.class.erase_device @id, passcode: passcode, preserve_data_plan: preserve_data_plan, cnx: @cnx
     end
     alias wipe_device erase_device
     alias wipe_computer erase_device
@@ -1046,12 +1153,12 @@ module JSS
     # NOTE: when used with computers, the mdm profile will probably
     # be re-installed immediately unless the computer is also no longer
     # managed by Jamf Pro itself. To fully unmanage a computer, use
-    # the {JSS::Computer#make_unmanaged} instance method.
+    # the {Jamf::Computer#make_unmanaged} instance method.
     #
     # @return (see .send_mdm_command)
     #
     def unmanage_device
-      self.class.unmanage_device @id, api: @api
+      self.class.unmanage_device @id, cnx: @cnx
     end
     alias remove_mdm_profile unmanage_device
 
@@ -1065,7 +1172,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def unlock_user_account(user)
-      self.class.unlock_user_account @id, user, api: @api
+      self.class.unlock_user_account @id, user, cnx: @cnx
     end
 
     # Send a delete_user command to this computer or group
@@ -1075,7 +1182,23 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def delete_user(user)
-      self.class.delete_user @id, user, api: @api
+      self.class.delete_user @id, user, cnx: @cnx
+    end
+
+    # Send an enable_remote_desktop command to this computer or group
+    #
+    # @return (see .send_mdm_command)
+    #
+    def enable_remote_desktop
+      self.class.enable_remote_desktop @id, cnx: @cnx
+    end
+
+    # Send a disable_remote_desktop command to this computer or group
+    #
+    # @return (see .send_mdm_command)
+    #
+    def disable_remote_desktop
+      self.class.disable_remote_desktop @id, cnx: @cnx
     end
 
     # Commands for mobile devices only
@@ -1088,7 +1211,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def update_inventory
-      self.class.update_inventory @id, api: @api
+      self.class.update_inventory @id, cnx: @cnx
     end
     alias recon update_inventory
 
@@ -1097,7 +1220,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def clear_passcode
-      self.class.clear_passcode @id, api: @api
+      self.class.clear_passcode @id, cnx: @cnx
     end
 
     # Send an clear_restrictions_password command to this object
@@ -1105,7 +1228,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def clear_restrictions_password
-      self.class.clear_restrictions_password @id, api: @api
+      self.class.clear_restrictions_password @id, cnx: @cnx
     end
 
     # Send an enable_data_roaming command to this object
@@ -1113,7 +1236,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def enable_data_roaming
-      self.class.enable_data_roaming @id, api: @api
+      self.class.enable_data_roaming @id, cnx: @cnx
     end
 
     # Send a disable_data_roaming command to this object
@@ -1121,7 +1244,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def disable_data_roaming
-      self.class.disable_data_roaming @id, api: @api
+      self.class.disable_data_roaming @id, cnx: @cnx
     end
 
     # Send an enable_voice_roaming command to this object
@@ -1129,7 +1252,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def enable_voice_roaming
-      self.class.enable_voice_roaming @id, api: @api
+      self.class.enable_voice_roaming @id, cnx: @cnx
     end
 
     # Send a disable_voice_roaming command to this object
@@ -1137,7 +1260,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def disable_voice_roaming
-      self.class.disable_voice_roaming @id, api: @api
+      self.class.disable_voice_roaming @id, cnx: @cnx
     end
 
     # Commands for supervized mobile devices only
@@ -1154,7 +1277,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def device_name(name)
-      self.class.device_name @id, name, api: @api
+      self.class.device_name @id, name, cnx: @cnx
     end
     alias set_name device_name
     alias set_device_name device_name
@@ -1176,8 +1299,7 @@ module JSS
         @id,
         wallpaper_setting: wallpaper_setting,
         wallpaper_content: wallpaper_content,
-        wallpaper_id: wallpaper_id,
-        api: @api
+        wallpaper_id: wallpaper_id, cnx: @cnx
       )
     end
     alias set_wallpaper wallpaper
@@ -1189,7 +1311,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def passcode_lock_grace_period(secs)
-      self.class.passcode_lock_grace_period @id, secs, api: @api
+      self.class.passcode_lock_grace_period @id, secs, cnx: @cnx
     end
 
     # Send a shut_down_device command to this object
@@ -1197,7 +1319,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def shut_down_device
-      self.class.shut_down_device @id, api: @api
+      self.class.shut_down_device @id, cnx: @cnx
     end
     alias shutdown_device shut_down_device
     alias shut_down shut_down_device
@@ -1208,7 +1330,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def restart_device
-      self.class.restart_device @id, api: @api
+      self.class.restart_device @id, cnx: @cnx
     end
     alias restart restart_device
 
@@ -1217,7 +1339,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def enable_app_analytics
-      self.class.enable_app_analytics @id, api: @api
+      self.class.enable_app_analytics @id, cnx: @cnx
     end
 
     # Send a disable_app_analytics command to this object
@@ -1225,7 +1347,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def disable_app_analytics
-      self.class.disable_app_analytics @id, api: @api
+      self.class.disable_app_analytics @id, cnx: @cnx
     end
 
     # Send an enable_diagnostic_submission command to this object
@@ -1233,7 +1355,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def enable_diagnostic_submission
-      self.class.enable_diagnostic_submission @id, api: @api
+      self.class.enable_diagnostic_submission @id, cnx: @cnx
     end
 
     # Send a disable_diagnostic_submission command to this object
@@ -1241,7 +1363,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def disable_diagnostic_submission
-      self.class.disable_diagnostic_submission @id, api: @api
+      self.class.disable_diagnostic_submission @id, cnx: @cnx
     end
 
     # Send a enable_lost_mode command to one or more targets
@@ -1261,11 +1383,11 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def enable_lost_mode(
-          message: nil,
-          phone_number: nil,
-          footnote: nil,
-          enforce_lost_mode: true,
-          play_sound: false
+      message: nil,
+      phone_number: nil,
+      footnote: nil,
+      enforce_lost_mode: true,
+      play_sound: false
     )
       self.class.enable_lost_mode(
         @id,
@@ -1273,8 +1395,7 @@ module JSS
         phone_number: phone_number,
         footnote: footnote,
         play_sound: play_sound,
-        enforce_lost_mode: enforce_lost_mode,
-        api: @api
+        enforce_lost_mode: enforce_lost_mode, cnx: @cnx
       )
     end
 
@@ -1283,7 +1404,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def play_lost_mode_sound
-      self.class.play_lost_mode_sound @id, api: @api
+      self.class.play_lost_mode_sound @id, cnx: @cnx
     end
 
     # Send a disable_lost_mode command to this object
@@ -1291,7 +1412,7 @@ module JSS
     # @return (see .send_mdm_command)
     #
     def disable_lost_mode
-      self.class.disable_lost_mode @id, api: @api
+      self.class.disable_lost_mode @id, cnx: @cnx
     end
 
     # Flushing Commands
@@ -1299,12 +1420,12 @@ module JSS
 
     # flush pending and/or failed MDM commands for this object
     #
-    # @param status[String] a key from {JSS::Commandable::FLUSHABLE_STATUSES}
+    # @param status[String] a key from {Jamf::Commandable::FLUSHABLE_STATUSES}
     #
     # @return [void]
     #
     def flush_mdm_commands(status)
-      self.class.flush_mdm_commands @id, status: status, api: @api
+      self.class.flush_mdm_commands @id, status: status, cnx: @cnx
     end
 
   end # module MDM