comet_backup_ruby_sdk 1.8.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f171b686ff819ece50144f9df68d33e4cc19d16f3650a14fa0a8e2ab6085705
-  data.tar.gz: 1c772db480d36ef618b9ae49ffdfbaf7266a8c048e46db97e28861bbf62bf0c7
+  metadata.gz: 69a41caa98a2a94326271b4b1ee4f2d7f61e98b0d62c1964ac1707e1984dca72
+  data.tar.gz: 3dce1759fcc473dcd64b592cfab33633ae31fe619ea07b0a9e13719c7981e5da
 SHA512:
-  metadata.gz: a81c233bc05c79786095deb47dabcb5450d5a70fe14586207c37fad3ec7954bfee346926de2de3c72df1616726de83cd8956b099d21f533d3e477c01597c5f1b
-  data.tar.gz: 9c397ce360202863393420b7c4440274e62aff5862b3eaee47671a662606624641f12cfd6762d0609b5043f624cdcd7d39fc7aee450efaa5334729d04357379d
+  metadata.gz: b3f505381b2cd44a90667f1de2f8fa6d4b99cffeb106e271eac055545ea7f51c57c948077baabb52025b120ded6efe0bd1bbbcf3df5b3dceabc84960b5040a3f
+  data.tar.gz: 4a3588488fb2a2da49662460438c0e8d85f7f57cb7fdd654199c30fe6c4bfd820e418872a8f0f751c1a7094d0d6b0754809c4fcb94cf98846cbbe3810eb341a0

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/CHANGELOG.md

@@ -1,5 +1,36 @@
 # CHANGELOG
 
+## 2022-01-28 v1.12.0
+- Based on 21.12.4
+- Add `AdminStoragePingDestination` API to perform a server-side Test Connections action when configuring Storage Role
+- Add `HasLicense` on `Office365MixedVirtualAccount` struct, and add `TotalLicensedMailsCount` and `TotalUnlicensedMailsCount` on `BackupJobDetail` struct, to track Office 365 license usage
+- Add `AdminWebAuthnRegistration` new `Type` field and `WEBAUTHN_DEVICE_TYPE` constants, to determine the type of hardware WebAuthn device
+- Add deprecation comments to U2F types (use WebAuthn instead), to `B2DestinationLocation.MaxConnections`, and to `Office365CustomSetting` (use Office365CustomSettingV2 instead)
+- Fix an issue with wrong array types in `WebAuthnPublicKeyCredentialCreationOptions` and `WebAuthnPublicKeyCredentialRequestOptions`
+- Fix an issue with wrong values for some `STOREDOBJECTTYPE_` constants related to Office 365
+- Fix an issue with executable permissions on some files
+
+## 2021-12-22 v1.11.0
+- Based on 21.12.1
+- Add `AdminAccountWebauthnRegistration` endpoint for new WebAuthn support.
+- Deprecate `AdminAccountU2fSubmitChallenge` as U2F is ending browser support in February 2022.
+
+## 2021-11-24 v1.10.0
+- Based on 21.9.12
+- Add support for Thai and Danish localizations
+- Add From and To fields to the EmailReportGenerated API
+- Add `AdminDispatcherEmailPreview` api method for requesting the HTML content of an email
+- Add `ImageEtag` field to the response of the ServerMetaBrandingProperties endpoint.
+- Add support for new engine properties on the Office365 backup type.
+- Add `AdminDispatcherOffice365ListVirtualAccounts` api method for requesting Objects that Office365 is capable of backing up.
+
+## 2021-10-21 1.9.0
+- Based on 21.9.7
+- Add Support for `HideFiles` parameter in B2 Destination Locations
+- Add support for `RegistrationTime` to `DeviceConfig`
+- Upgrade MYSQL to support new TLS connection options
+- Add support for new API: `AdminMetaReadAllLogsRequest` and `AdminDispatcherRequestWindiskSnapshot`
+
 ## 2021-09-14 1.8.0
 - Based on Comet 21.9.2
 - Support new `custom_headers` field on the `WebhookOption` class for specifying custom HTTP headers

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    comet_backup_ruby_sdk (1.8.0)
+    comet_backup_ruby_sdk (1.12.0)
 
 GEM
   remote: https://rubygems.org/
@@ -33,11 +33,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler (~> 2.1.4)
   comet_backup_ruby_sdk!
   minitest (~> 5.14)
   rake (~> 13.0)
   rubocop (~> 0.88)
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

data/README.md

@@ -84,7 +84,7 @@ end
 ```ruby
 bundle exec rake rubocop
 
-COMETSERVER_ADDRESS='http://127.0.0.1:8060' \
+  COMETSERVER_ADDRESS='http://127.0.0.1:8060' \
 	COMETSERVER_ADMINUSER=admin \
 	COMETSERVER_ADMINPASS=admin \
 	bundle exec rake test

data/RELEASING.md

@@ -1,5 +1,6 @@
 # Procedure for releasing gem package updates
 
+0. As a cygwin user, with docker installed; `docker run -it -v "$(cygpath -w "$PWD"):/app" -w /app ruby:2.7 bash` will get you with a suitable ruby environment for testing/building and releasing this package9.
 1. All tests passing
 2. Update changelog in `CHANGELOG.md`
 3. Update version number in `comet_backup_ruby_sdk.gemspec`

data/comet_backup_ruby_sdk.gemspec

@@ -12,7 +12,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'comet_backup_ruby_sdk'
-  spec.version       = '1.8.0'
+  spec.version       = '1.12.0'
   spec.authors       = ['Comet Licensing Ltd.']
   spec.email         = ['hello@cometbackup.com']
 
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
+  spec.add_development_dependency 'bundler', '~> 2.1.4'
   spec.add_development_dependency 'minitest', '~> 5.14'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 0.88'

data/lib/comet/api_response_error.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby --enable-frozen-string-literal
 #
-# Copyright (c) 2020-2021 Comet Licensing Ltd.
+# Copyright (c) 2020-2022 Comet Licensing Ltd.
 # Please see the LICENSE file for usage information.
 #
 # SPDX-License-Identifier: MIT

data/lib/comet/comet_server.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby --enable-frozen-string-literal
 #
-# Copyright (c) 2020-2021 Comet Licensing Ltd.
+# Copyright (c) 2020-2022 Comet Licensing Ltd.
 # Please see the LICENSE file for usage information.
 #
 # SPDX-License-Identifier: MIT
@@ -96,7 +96,7 @@ module Comet
     #
     # You must supply administrator authentication credentials to use this API.
     #
-    # @param [String] self_address (Optional) External URL of this server (used for U2F AppID)
+    # @param [String] self_address (Optional) External URL of this server
     # @return [Comet::SessionKeyRegeneratedResponse]
     def admin_account_session_start(self_address = nil)
       submit_params = {}
@@ -166,6 +166,9 @@ module Comet
     # AdminAccountU2fRequestRegistrationChallenge
     #
     # Register a new FIDO U2F token.
+    # Browser support for U2F is ending in February 2022. WebAuthn is backwards
+    # compatible with U2F keys, and Comet will automatically migrate existing U2F keys
+    # to allow their use with the WebAuthn endpoints.
     #
     # You must supply administrator authentication credentials to use this API.
     #
@@ -188,6 +191,9 @@ module Comet
     # AdminAccountU2fSubmitChallengeResponse
     #
     # Register a new FIDO U2F token.
+    # Browser support for U2F is ending in February 2022. WebAuthn is backwards
+    # compatible with U2F keys, and Comet will automatically migrate existing U2F keys
+    # to allow their use with the WebAuthn endpoints.
     #
     # You must supply administrator authentication credentials to use this API.
     #
@@ -245,6 +251,58 @@ module Comet
       ret
     end
 
+    # AdminAccountWebauthnRequestRegistrationChallenge
+    #
+    # Register a new FIDO2 WebAuthn token.
+    #
+    # You must supply administrator authentication credentials to use this API.
+    #
+    # @param [String] self_address External URL of this server, used as WebAuthn ID
+    # @return [Comet::WebAuthnRegistrationChallengeResponse]
+    def admin_account_webauthn_request_registration_challenge(self_address)
+      submit_params = {}
+      raise TypeError, "'self_address' expected String, got #{self_address.class}" unless self_address.is_a? String
+
+      submit_params['SelfAddress'] = self_address
+
+      body = perform_request('api/v1/admin/account/webauthn/request-registration-challenge', submit_params)
+      json_body = JSON.parse body
+      check_status json_body
+      ret = Comet::WebAuthnRegistrationChallengeResponse.new
+      ret.from_hash(json_body)
+      ret
+    end
+
+    # AdminAccountWebauthnSubmitChallengeResponse
+    #
+    # Register a new FIDO2 WebAuthn token.
+    #
+    # You must supply administrator authentication credentials to use this API.
+    #
+    # @param [String] self_address External URL of this server, used as WebAuthn ID
+    # @param [String] challenge_id Associated value from AdminAccountWebAuthnRequestRegistrationChallenge API
+    # @param [String] credential JSON-encoded credential
+    # @return [Comet::CometAPIResponseMessage]
+    def admin_account_webauthn_submit_challenge_response(self_address, challenge_id, credential)
+      submit_params = {}
+      raise TypeError, "'self_address' expected String, got #{self_address.class}" unless self_address.is_a? String
+
+      submit_params['SelfAddress'] = self_address
+      raise TypeError, "'challenge_id' expected String, got #{challenge_id.class}" unless challenge_id.is_a? String
+
+      submit_params['ChallengeID'] = challenge_id
+      raise TypeError, "'credential' expected String, got #{credential.class}" unless credential.is_a? String
+
+      submit_params['Credential'] = credential
+
+      body = perform_request('api/v1/admin/account/webauthn/submit-challenge-response', submit_params)
+      json_body = JSON.parse body
+      check_status json_body
+      ret = Comet::CometAPIResponseMessage.new
+      ret.from_hash(json_body)
+      ret
+    end
+
     # AdminAddUser
     #
     # Add a new user account.
@@ -1001,6 +1059,42 @@ module Comet
       ret
     end
 
+    # AdminDispatcherEmailPreview
+    #
+    # Request HTML content of an email.
+    # The remote device must have given consent for an MSP to browse their mail
+    #
+    # You must supply administrator authentication credentials to use this API.
+    # This API requires the Auth Role to be enabled.
+    #
+    # @param [String] target_id The live connection GUID
+    # @param [String] snapshot where the email belongs to
+    # @param [String] destination The Storage Vault ID
+    # @param [String] path of the email to view
+    # @return [Comet::EmailReportGeneratedPreview]
+    def admin_dispatcher_email_preview(target_id, snapshot, destination, path)
+      submit_params = {}
+      raise TypeError, "'target_id' expected String, got #{target_id.class}" unless target_id.is_a? String
+
+      submit_params['TargetID'] = target_id
+      raise TypeError, "'snapshot' expected String, got #{snapshot.class}" unless snapshot.is_a? String
+
+      submit_params['Snapshot'] = snapshot
+      raise TypeError, "'destination' expected String, got #{destination.class}" unless destination.is_a? String
+
+      submit_params['Destination'] = destination
+      raise TypeError, "'path' expected String, got #{path.class}" unless path.is_a? String
+
+      submit_params['Path'] = path
+
+      body = perform_request('api/v1/admin/dispatcher/email-preview', submit_params)
+      json_body = JSON.parse body
+      check_status json_body
+      ret = Comet::EmailReportGeneratedPreview.new
+      ret.from_hash(json_body)
+      ret
+    end
+
     # AdminDispatcherImportApply
     #
     # Instruct a live connected device to import settings from an installed product.
@@ -1077,6 +1171,34 @@ module Comet
       ret
     end
 
+    # AdminDispatcherOffice365ListVirtualAccounts
+    #
+    # Request a list of Office365 Resources (groups, sites, teams groups and users).
+    # The remote device must have given consent for an MSP to browse their files.
+    #
+    # You must supply administrator authentication credentials to use this API.
+    # This API requires the Auth Role to be enabled.
+    #
+    # @param [String] target_id The live connection GUID
+    # @param [Comet::Office365Credential] credentials The Office365 account credential
+    # @return [Comet::BrowseOffice365ListVirtualAccountsResponse]
+    def admin_dispatcher_office_365list_virtual_accounts(target_id, credentials)
+      submit_params = {}
+      raise TypeError, "'target_id' expected String, got #{target_id.class}" unless target_id.is_a? String
+
+      submit_params['TargetID'] = target_id
+      raise TypeError, "'credentials' expected Comet::Office365Credential, got #{credentials.class}" unless credentials.is_a? Comet::Office365Credential
+
+      submit_params['Credentials'] = credentials.to_json
+
+      body = perform_request('api/v1/admin/dispatcher/office365-list-virtual-accounts', submit_params)
+      json_body = JSON.parse body
+      check_status json_body
+      ret = Comet::BrowseOffice365ListVirtualAccountsResponse.new
+      ret.from_hash(json_body)
+      ret
+    end
+
     # AdminDispatcherPingDestination
     #
     # Test the connection to the storage bucket.
@@ -1563,6 +1685,37 @@ module Comet
       ret
     end
 
+    # AdminDispatcherRequestWindiskSnapshot
+    #
+    # Request a Disk Image snapshot with the windiskbrowse-style from a live connected device.
+    #
+    # You must supply administrator authentication credentials to use this API.
+    # This API requires the Auth Role to be enabled.
+    #
+    # @param [String] target_id The live connection GUID
+    # @param [String] destination The Storage Vault ID
+    # @param [String] snapshot_id The Snapshot ID
+    # @return [Comet::DispatcherWindiskSnapshotResponse]
+    def admin_dispatcher_request_windisk_snapshot(target_id, destination, snapshot_id)
+      submit_params = {}
+      raise TypeError, "'target_id' expected String, got #{target_id.class}" unless target_id.is_a? String
+
+      submit_params['TargetID'] = target_id
+      raise TypeError, "'destination' expected String, got #{destination.class}" unless destination.is_a? String
+
+      submit_params['Destination'] = destination
+      raise TypeError, "'snapshot_id' expected String, got #{snapshot_id.class}" unless snapshot_id.is_a? String
+
+      submit_params['SnapshotID'] = snapshot_id
+
+      body = perform_request('api/v1/admin/dispatcher/request-windisk-snapshot', submit_params)
+      json_body = JSON.parse body
+      check_status json_body
+      ret = Comet::DispatcherWindiskSnapshotResponse.new
+      ret.from_hash(json_body)
+      ret
+    end
+
     # AdminDispatcherRunBackup
     #
     # Instruct a live connected device to run a scheduled backup.
@@ -2139,6 +2292,7 @@ module Comet
     # Cancel a running job.
     # A request is sent to the live-connected device, asking it to cancel the operation. This may fail if there is no live-connection.
     # Only jobs from Comet 18.3.5 or newer can be cancelled. A job can only be cancelled if it has a non-empty CancellationID field in its properties.
+    # If the device is running Comet 21.9.5 or later, this API will wait up to ten seconds for a confirmation from the client.
     #
     # You must supply administrator authentication credentials to use this API.
     # This API requires the Auth Role to be enabled.
@@ -2318,6 +2472,20 @@ module Comet
       ret
     end
 
+    # AdminMetaReadAllLogs
+    #
+    # Get a ZIP file of all of the server's log files.
+    # On non-Windows platforms, log content uses LF line endings. On Windows, Comet changed from LF to CRLF line endings in 18.3.2.
+    # This API does not automatically convert line endings; around the 18.3.2 timeframe, log content may even contain mixed line-endings.
+    #
+    # You must supply administrator authentication credentials to use this API.
+    # This API is only available for administrator accounts in the top-level Organization, not in any other Organization.
+    #
+    # @return [String]
+    def admin_meta_read_all_logs
+      perform_request('api/v1/admin/meta/read-all-logs')
+    end
+
     # AdminMetaReadLogs
     #
     # Get log file content.
@@ -3332,6 +3500,31 @@ module Comet
       ret
     end
 
+    # AdminStoragePingDestination
+    #
+    # Ping a storage destination.
+    #
+    # You must supply administrator authentication credentials to use this API.
+    # Access to this API may be prevented on a per-administrator basis.
+    # This API requires the Storage Role to be enabled.
+    # This API is only available for administrator accounts in the top-level Organization, not in any other Organization.
+    #
+    # @param [Comet::DestinationLocation] extra_data The destination location settings
+    # @return [Comet::CometAPIResponseMessage]
+    def admin_storage_ping_destination(extra_data)
+      submit_params = {}
+      raise TypeError, "'extra_data' expected Comet::DestinationLocation, got #{extra_data.class}" unless extra_data.is_a? Comet::DestinationLocation
+
+      submit_params['ExtraData'] = extra_data.to_json
+
+      body = perform_request('api/v1/admin/storage/ping-destination', submit_params)
+      json_body = JSON.parse body
+      check_status json_body
+      ret = Comet::CometAPIResponseMessage.new
+      ret.from_hash(json_body)
+      ret
+    end
+
     # AdminStorageRegisterBucket
     #
     # Create a new bucket.
@@ -3483,7 +3676,7 @@ module Comet
 
       ret_error = Comet::CometAPIResponseMessage.new
       ret_error.from_hash(obj)
-      raise Comet::APIResponseError.new(ret_error), 'Comet API response status was not OK'
+      raise Comet::APIResponseError.new(ret_error)
     end
 
     # Perform a synchronous HTTP request.
@@ -3520,7 +3713,7 @@ module Comet
 
       form_params = []
       params.each do |k, v|
-        form_params.append [k, v, { :filename => k }]
+        form_params.append [k, v, {:filename => k}]
       end
       req.set_form(form_params, 'multipart/form-data')
 

data/lib/comet/definitions.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby --enable-frozen-string-literal
 #
-# Copyright (c) 2020-2021 Comet Licensing Ltd.
+# Copyright (c) 2020-2022 Comet Licensing Ltd.
 # Please see the LICENSE file for usage information.
 #
 # SPDX-License-Identifier: MIT
@@ -155,6 +155,24 @@ module Comet
 
   MONGODB_DEFAULT_PORT = 27_017
 
+  SERVICE_CALENDAR = 1
+
+  SERVICE_CONTACT = 2
+
+  SERVICE_MAIL = 4
+
+  SERVICE_SHAREPOINT = 8
+
+  SERVICE_ONEDRIVE = 16
+
+  MIXED_VIRTUAL_ACCOUNT_TYPE_USER = 1
+
+  MIXED_VIRTUAL_ACCOUNT_TYPE_GROUP = 2
+
+  MIXED_VIRTUAL_ACCOUNT_TYPE_TEAM_GROUP = 3
+
+  MIXED_VIRTUAL_ACCOUNT_TYPE_SHAREPOINT_ONLY = 4
+
   # RestoreType:
   RESTORETYPE_INVALID = -1
 
@@ -342,22 +360,22 @@ module Comet
   STOREDOBJECTTYPE_WINEFS = 'winefs'
 
   # StoredObjectType: "file"
-  STOREDOBJECTTYPE_EMAILMESSAGE = 'emailmessage\"'
+  STOREDOBJECTTYPE_EMAILMESSAGE = 'emailmessage'
 
   # StoredObjectType: "dir"
-  STOREDOBJECTTYPE_EMAILFOLDER = 'mailfolder\"'
+  STOREDOBJECTTYPE_EMAILFOLDER = 'mailfolder'
 
   # StoredObjectType: "file"
-  STOREDOBJECTTYPE_OFFICECONTACT = 'contact\"'
+  STOREDOBJECTTYPE_OFFICECONTACT = 'contact'
 
   # StoredObjectType: "dir"
-  STOREDOBJECTTYPE_OFFICECONTACTFOLDER = 'contactfolder\"'
+  STOREDOBJECTTYPE_OFFICECONTACTFOLDER = 'contactfolder'
 
   # StoredObjectType: "file"
-  STOREDOBJECTTYPE_OFFICECALENDAREVENT = 'calendarevent\"'
+  STOREDOBJECTTYPE_OFFICECALENDAREVENT = 'calendarevent'
 
   # StoredObjectType: "dir"
-  STOREDOBJECTTYPE_OFFICECALENDAR = 'calendar\"'
+  STOREDOBJECTTYPE_OFFICECALENDAR = 'calendar'
 
   # StoredObjectType:
   STOREDOBJECTTYPE_MSSITE = 'mssite'
@@ -407,18 +425,18 @@ module Comet
   # DefaultSettingMode:
   SETTING_ENFORCED_OFF = 4
 
-  # sz.LanguageCode:
+  # LanguageCode:
   DEFAULT_LANGUAGE = 'en_US'
 
   DEFAULT_TIMEZONE = 'UTC'
 
-  APPLICATION_VERSION = '21.9.2'
+  APPLICATION_VERSION = '21.12.4'
 
   APPLICATION_VERSION_MAJOR = 21
 
-  APPLICATION_VERSION_MINOR = 9
+  APPLICATION_VERSION_MINOR = 12
 
-  APPLICATION_VERSION_REVISION = 2
+  APPLICATION_VERSION_REVISION = 4
 
   RELEASE_CODENAME = 'Voyager'
 
@@ -426,6 +444,10 @@ module Comet
 
   PASSWORD_FORMAT_PLAINTEXT = 0
 
+  UNKNOWN_DEVICE_ERROR = 'ERR_UNKNOWN_DEVICE'
+
+  TOTPREQUIRED_ERROR = 'ERR_TOTP_REQUIRED'
+
   EMAIL_WORKER_STATE_NOT_STARTED = 0
 
   EMAIL_WORKER_STATE_STARTED = 1
@@ -436,9 +458,26 @@ module Comet
 
   EMAIL_WORKER_STATE_SENDING = 4
 
-  UNKNOWN_DEVICE_ERROR = 'ERR_UNKNOWN_DEVICE'
+  # WebAuthnDeviceType:
+  WEBAUTHN_DEVICE_TYPE__UNKNOWN = 0
 
-  TOTPREQUIRED_ERROR = 'ERR_TOTP_REQUIRED'
+  # WebAuthnDeviceType:
+  WEBAUTHN_DEVICE_TYPE__HARDWARE_TOKEN = 1
+
+  # WebAuthnDeviceType:
+  WEBAUTHN_DEVICE_TYPE__ANDROID = 2
+
+  # WebAuthnDeviceType:
+  WEBAUTHN_DEVICE_TYPE__APPLE = 3
+
+  # WebAuthnDeviceType:
+  WEBAUTHN_DEVICE_TYPE__TPM_GENERIC = 4
+
+  # WebAuthnDeviceType:
+  WEBAUTHN_DEVICE_TYPE__TPM_WINDOWS = 5
+
+  # WebAuthnDeviceType:
+  WEBAUTHN_DEVICE_TYPE__TPM_LINUX = 6
 
   # UpdateStatus:
   UPDATESTATUS_NOT_SEEN = 0

data/lib/comet/models/add_bucket_response_message.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby --enable-frozen-string-literal
 #
-# Copyright (c) 2020-2021 Comet Licensing Ltd.
+# Copyright (c) 2020-2022 Comet Licensing Ltd.
 # Please see the LICENSE file for usage information.
 #
 # SPDX-License-Identifier: MIT

data/lib/comet/models/admin_account_properties_response.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby --enable-frozen-string-literal
 #
-# Copyright (c) 2020-2021 Comet Licensing Ltd.
+# Copyright (c) 2020-2022 Comet Licensing Ltd.
 # Please see the LICENSE file for usage information.
 #
 # SPDX-License-Identifier: MIT

data/lib/comet/models/admin_email_options.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby --enable-frozen-string-literal
 #
-# Copyright (c) 2020-2021 Comet Licensing Ltd.
+# Copyright (c) 2020-2022 Comet Licensing Ltd.
 # Please see the LICENSE file for usage information.
 #
 # SPDX-License-Identifier: MIT

data/lib/comet/models/admin_resource_response.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby --enable-frozen-string-literal
 #
-# Copyright (c) 2020-2021 Comet Licensing Ltd.
+# Copyright (c) 2020-2022 Comet Licensing Ltd.
 # Please see the LICENSE file for usage information.
 #
 # SPDX-License-Identifier: MIT

data/lib/comet/models/admin_security_options.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby --enable-frozen-string-literal
 #
-# Copyright (c) 2020-2021 Comet Licensing Ltd.
+# Copyright (c) 2020-2022 Comet Licensing Ltd.
 # Please see the LICENSE file for usage information.
 #
 # SPDX-License-Identifier: MIT
@@ -27,11 +27,19 @@ module Comet
     attr_accessor :allow_password_and_totplogin
 
     # @type [Boolean] allow_password_and_u2flogin
+    # @deprecated This member has been deprecated since Comet version 21.12.0
     attr_accessor :allow_password_and_u2flogin
 
+    # @type [Boolean] allow_password_and_web_authn_login
+    attr_accessor :allow_password_and_web_authn_login
+
     # @type [Array<Comet::AdminU2FRegistration>] u2fregistrations
+    # @deprecated This member has been deprecated since Comet version 21.12.0
     attr_accessor :u2fregistrations
 
+    # @type [Array<Comet::AdminWebAuthnRegistration>] web_authn_registrations
+    attr_accessor :web_authn_registrations
+
     # @type [Number] totpkey_encryption_format
     attr_accessor :totpkey_encryption_format
 
@@ -52,6 +60,7 @@ module Comet
       @password_format = 0
       @password = ''
       @u2fregistrations = []
+      @web_authn_registrations = []
       @totpkey_encryption_format = 0
       @totpkey = ''
       @ipwhitelist = ''
@@ -85,6 +94,8 @@ module Comet
           @allow_password_and_totplogin = v
         when 'AllowPasswordAndU2FLogin'
           @allow_password_and_u2flogin = v
+        when 'AllowPasswordAndWebAuthnLogin'
+          @allow_password_and_web_authn_login = v
         when 'U2FRegistrations'
           if v.nil?
             @u2fregistrations = []
@@ -95,6 +106,16 @@ module Comet
               @u2fregistrations[i1].from_hash(v1)
             end
           end
+        when 'WebAuthnRegistrations'
+          if v.nil?
+            @web_authn_registrations = []
+          else
+            @web_authn_registrations = Array.new(v.length)
+            v.each_with_index do |v1, i1|
+              @web_authn_registrations[i1] = Comet::AdminWebAuthnRegistration.new
+              @web_authn_registrations[i1].from_hash(v1)
+            end
+          end
         when 'TOTPKeyEncryptionFormat'
           raise TypeError, "'v' expected Numeric, got #{v.class}" unless v.is_a? Numeric
 
@@ -121,9 +142,13 @@ module Comet
       ret['AllowPasswordLogin'] = @allow_password_login
       ret['AllowPasswordAndTOTPLogin'] = @allow_password_and_totplogin
       ret['AllowPasswordAndU2FLogin'] = @allow_password_and_u2flogin
+      ret['AllowPasswordAndWebAuthnLogin'] = @allow_password_and_web_authn_login
       unless @u2fregistrations.nil?
         ret['U2FRegistrations'] = @u2fregistrations
       end
+      unless @web_authn_registrations.nil?
+        ret['WebAuthnRegistrations'] = @web_authn_registrations
+      end
       unless @totpkey_encryption_format.nil?
         ret['TOTPKeyEncryptionFormat'] = @totpkey_encryption_format
       end

data/lib/comet/models/admin_u2fregistration.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby --enable-frozen-string-literal
 #
-# Copyright (c) 2020-2021 Comet Licensing Ltd.
+# Copyright (c) 2020-2022 Comet Licensing Ltd.
 # Please see the LICENSE file for usage information.
 #
 # SPDX-License-Identifier: MIT
@@ -13,6 +13,7 @@ require 'json'
 module Comet
 
   # AdminU2FRegistration is a typed class wrapper around the underlying Comet Server API data structure.
+  # @deprecated This type has been deprecated since Comet version 21.12.0
   class AdminU2FRegistration
 
     # @type [String] description

data/lib/comet/models/admin_user_permissions.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby --enable-frozen-string-literal
 #
-# Copyright (c) 2020-2021 Comet Licensing Ltd.
+# Copyright (c) 2020-2022 Comet Licensing Ltd.
 # Please see the LICENSE file for usage information.
 #
 # SPDX-License-Identifier: MIT