Merge branch 'release/0.63.0'

Author: Jericho

README.md

@@ -167,13 +167,11 @@ There are a few ways you can overcome this problem:
 Solution number 1:
 You can create mutiple OAuth apps in Zoom's management dashboard, one for each instance of your app. This means that each instance will have their own clientId, clientSecret and accountId and therefore they can independently request tokens without interfering with each other.
 
-This puts the onus is on you to create and manage these Zoom apps. Additionally, you are responsible for ensuring that the `OAuthConnectionInfo` in your C# code is initialized with the appropriate values for each instance.
-
-This is a simple and effective solution when you have a relatively small number of instances but, in my opinion, it becomes overwhelming when your number of instances becomes too large.
+This puts the onus on you to create and manage these Zoom apps. Additionally, you are responsible for ensuring that the `OAuthConnectionInfo` in your C# code is initialized with the appropriate values for each instance. This is a simple and effective solution when you have a relatively small number of instances but, in my opinion, it becomes overwhelming when your number of instances becomes too large.
 
 
 Solution number 2:
-Create a single Zoom OAuth app. Contact Zoom support and request additional "token indices" (also known as "group numbers") for this OAuth app. Subsequently, new tokens can be "scoped" to a given index which means that a token issued for a specific index does not invalidate token for any other index. Hopefully, Zoom will grant you enough token indices and you will be able to dedicate one index for each instance of your application and you can subsequently modify your C# code to "scope"" you OAuth connection to a desired index, like so:
+Create a single Zoom OAuth app. Contact Zoom support and request additional "token indices" (also known as "group numbers") for this OAuth app. Subsequently, new tokens can be "scoped" to a given index which means that a token issued for a specific index does not invalidate token for any other index. Hopefully, Zoom will grant you enough token indices and you will be able to dedicate one index for each instance of your application and you can subsequently modify your C# code to "scope" you OAuth connection to a desired index, like so:
 
 ```csharp
 // you initialize the connection info for your first instance like this:
@@ -190,6 +188,14 @@ var connectionInfo = OAuthConnectionInfo.ForServerToServer(clientId, clientSecre
 
 Just like solution number 1, this solution works well for scenarios where you have a relatively small number of instances and where Zoom has granted you enough indices.
 
+But what if you have more instances of your application than the number of indices that Zoom has granted you? For instance, what if you have 100 instances of your application running in the cloud (Azure, AWS, etc.) but Zoom granted you only 5 indices? If you are in this situation, the solutions I presented so far won't solve the problem. Keep reading, the next solution is a much better option for you.
+
+
+Solution number 3:
+You can make sure that all instances share the same token by storing the token information in a common repository that all your instances have access to. Examples of such repositories are: Azure blob storage, SQL server, Redis, MySQL, etc. For this solution to be effective, we must also make sure that your instances don't request new tokens at the same time because that would again tigger the problem described earlier where each new token invalidates the previous one. 
+
+If this solution sounds like a good option for your scenario, you're in luck: there's a beta version of ZoomNet that provides the necessary infrastructure and all you have to do is to write an implementation of a provided interface to provide the logic for the repository of your choice where token information information will be preserved and make accessible to all your application instances. ZoomNet takes care of allowing only one of your instances to be allowed to refresh a token at any given moment. If you are interrested in testing this beta version, leave a comment [here](https://github.com/Jericho/ZoomNet/issues/269).
+
 
 ### Webhook Parser
 

Source/ZoomNet.IntegrationTests/Tests/Meetings.cs

@@ -51,6 +51,7 @@ public async Task RunAsync(User myUser, string[] myPermissions, IZoomClient clie
 				ApprovalType = ApprovalType.Manual,
 				JoinBeforeHost = true,
 				JoinBeforeHostTime = JoinBeforeHostTime.FiveMinutes,
+				UsePmi = true,
 			};
 			var trackingFields = new Dictionary<string, string>()
 			{

Source/ZoomNet/Json/KeyValuePairConverter.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+
+namespace ZoomNet.Json
+{
+	/// <summary>
+	/// Converts an array of <see cref="KeyValuePair{TKey, TValue}"/> to or from JSON.
+	/// </summary>
+	/// <seealso cref="ZoomNetJsonConverter{T}"/>
+	internal class KeyValuePairConverter : ZoomNetJsonConverter<KeyValuePair<string, string>[]>
+	{
+		private const string DefaultKeyFieldName = "key";
+		private const string DefaultValueFieldName = "value";
+
+		private readonly string _keyFieldName;
+		private readonly string _valueFieldName;
+
+		public KeyValuePairConverter()
+			: this(DefaultKeyFieldName, DefaultValueFieldName)
+		{
+		}
+
+		public KeyValuePairConverter(string keyFieldName, string valueFieldName)
+		{
+			_keyFieldName = keyFieldName;
+			_valueFieldName = valueFieldName;
+		}
+
+		public override KeyValuePair<string, string>[] Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+		{
+			if (reader.TokenType == JsonTokenType.StartArray)
+			{
+				var values = new List<KeyValuePair<string, string>>();
+
+				reader.Read();
+
+				while ((reader.TokenType != JsonTokenType.EndArray) && reader.Read())
+				{
+					if (reader.TokenType == JsonTokenType.StartObject)
+					{
+						var fieldName = string.Empty;
+						var fieldValue = string.Empty;
+
+						while ((reader.TokenType != JsonTokenType.EndObject) && reader.Read())
+						{
+							if (reader.TokenType == JsonTokenType.PropertyName)
+							{
+								var propertyName = reader.GetString();
+								reader.Read();
+
+								if (propertyName == _keyFieldName) fieldName = reader.GetString();
+								else if (propertyName == _valueFieldName) fieldValue = reader.GetString();
+							}
+						}
+
+						values.Add(new KeyValuePair<string, string>(fieldName, fieldValue));
+					}
+				}
+
+				return values.ToArray();
+			}
+
+			throw new Exception("Unable to read Key/Value pair");
+		}
+
+		public override void Write(Utf8JsonWriter writer, KeyValuePair<string, string>[] value, JsonSerializerOptions options)
+		{
+			if (value == null) return;
+
+			writer.WriteStartArray();
+
+			foreach (var item in value)
+			{
+				writer.WriteStartObject();
+				writer.WriteString(_keyFieldName, item.Key);
+				writer.WriteString(_valueFieldName, item.Value);
+				writer.WriteEndObject();
+			}
+
+			writer.WriteEndArray();
+		}
+	}
+}

Source/ZoomNet/Json/TrackingFieldsConverter.cs

@@ -10,41 +10,16 @@ namespace ZoomNet.Json
 	/// <seealso cref="ZoomNetJsonConverter{T}"/>
 	internal class TrackingFieldsConverter : ZoomNetJsonConverter<KeyValuePair<string, string>[]>
 	{
+		private readonly KeyValuePairConverter _converter = new KeyValuePairConverter("field", "value");
+
 		public override KeyValuePair<string, string>[] Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
 		{
-			if (reader.TokenType == JsonTokenType.StartArray)
-			{
-				var values = new List<KeyValuePair<string, string>>();
-
-				reader.Read();
-
-				while ((reader.TokenType != JsonTokenType.EndArray) && reader.Read())
-				{
-					if (reader.TokenType == JsonTokenType.StartObject)
-					{
-						var fieldName = string.Empty;
-						var fieldValue = string.Empty;
-
-						while ((reader.TokenType != JsonTokenType.EndObject) && reader.Read())
-						{
-							if (reader.TokenType == JsonTokenType.PropertyName)
-							{
-								var propertyName = reader.GetString();
-								reader.Read();
-
-								if (propertyName == "field") fieldName = reader.GetString();
-								else if (propertyName == "value") fieldValue = reader.GetString();
-							}
-						}
-
-						values.Add(new KeyValuePair<string, string>(fieldName, fieldValue));
-					}
-				}
-
-				return values.ToArray();
-			}
+			return _converter.Read(ref reader, typeToConvert, options);
+		}
 
-			throw new Exception("Unable to convert to tracking fields");
+		public override void Write(Utf8JsonWriter writer, KeyValuePair<string, string>[] value, JsonSerializerOptions options)
+		{
+			_converter.Write(writer, value, options);
 		}
 	}
 }

Source/ZoomNet/Models/CalendarIntegrationType.cs

@@ -0,0 +1,18 @@
+namespace ZoomNet.Models
+{
+	/// <summary>
+	/// Type of calendar integration used to schedule the meeting.
+	/// </summary>
+	public enum CalendarIntegrationType
+	{
+		/// <summary>
+		/// <a href="https://support.zoom.us/hc/en-us/articles/360031592971-Getting-started-with-Outlook-plugin-and-add-in">Zoom Outlook add-in</a>.
+		/// </summary>
+		Outlook = 1,
+
+		/// <summary>
+		/// <a href="https://support.zoom.us/hc/en-us/articles/360020187492-Using-the-Zoom-for-Google-Workspace-add-on">Zoom for Google Workspace add-on</a>.
+		/// </summary>
+		GoogleWorkspace = 2,
+	}
+}

Source/ZoomNet/Models/Meeting.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.Text.Json.Serialization;
+using ZoomNet.Json;
 
 namespace ZoomNet.Models
 {
@@ -24,12 +26,12 @@ public abstract class Meeting
 		/// The id.
 		/// </value>
 		[JsonPropertyName("id")]
-
-		// This allows us to overcome the fact that "id" is sometimes a string and sometimes a number
-		// See: https://devforum.zoom.us/t/the-data-type-of-meetingid-is-inconsistent-in-webhook-documentation/70090
-		// Also, see: https://github.com/Jericho/ZoomNet/issues/228
+		/*
+			This allows us to overcome the fact that "id" is sometimes a string and sometimes a number
+			See: https://devforum.zoom.us/t/the-data-type-of-meetingid-is-inconsistent-in-webhook-documentation/70090
+			Also, see: https://github.com/Jericho/ZoomNet/issues/228
+		*/
 		[JsonNumberHandling(JsonNumberHandling.AllowReadingFromString)]
-
 		public long Id { get; set; }
 
 		/// <summary>
@@ -126,5 +128,40 @@ public abstract class Meeting
 		/// </summary>
 		[JsonPropertyName("settings")]
 		public MeetingSettings Settings { get; set; }
+
+		/// <summary>
+		/// Gets or sets the timezone.
+		/// For example, "America/Los_Angeles".
+		/// Please reference our <a href="https://marketplace.zoom.us/docs/api-reference/other-references/abbreviation-lists#timezones">timezone list</a> for supported timezones and their formats.
+		/// </summary>
+		/// <value>The meeting timezone. For example, "America/Los_Angeles". Please reference our <a href="https://marketplace.zoom.us/docs/api-reference/other-references/abbreviation-lists#timezones">timezone list</a> for supported timezones and their formats.</value>
+		[JsonPropertyName("timezone")]
+		public string Timezone { get; set; }
+
+		/// <summary>
+		/// Gets or sets the ID of the user who scheduled this meeting on behalf of the host.
+		/// </summary>
+		[JsonPropertyName("assistant_id")]
+		public string AssistantId { get; set; }
+
+		/// <summary>
+		/// Gets or sets the email address of the meeting host.
+		/// </summary>
+		[JsonPropertyName("host_email")]
+		public string HostEmail { get; set; }
+
+		/// <summary>
+		/// Gets or sets the encrypted passcode for third party endpoints (H323/SIP).
+		/// </summary>
+		[JsonPropertyName("encrypted_password")]
+		public string EncryptedPassword { get; set; }
+
+		/// <summary>
+		/// Gets or sets the tracking fields.
+		/// </summary>
+		/// <value>The tracking fields.</value>
+		[JsonPropertyName("tracking_fields")]
+		[JsonConverter(typeof(TrackingFieldsConverter))]
+		public KeyValuePair<string, string>[] TrackingFields { get; set; } = Array.Empty<KeyValuePair<string, string>>();
 	}
 }

Source/ZoomNet/Models/MeetingSettings.cs

@@ -1,4 +1,6 @@
+using Newtonsoft.Json.Converters;
 using System;
+using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
 namespace ZoomNet.Models
@@ -156,5 +158,109 @@ public class MeetingSettings
 		/// </summary>
 		[JsonPropertyName("watermark")]
 		public bool? Watermark { get; set; }
+
+		/// <summary>
+		/// Gets or sets the value indicating whether to allow attendees to join the meeting from multiple devices.
+		/// This setting only works for meetings that require registration.
+		/// </summary>
+		[JsonPropertyName("allow_multiple_devices")]
+		public bool? AllowMultipleDevices { get; set; }
+
+		/// <summary>
+		/// Gets or sets the value indicating whether to send email notifications to alternative hosts, default value is true.
+		/// </summary>
+		[JsonPropertyName("alternative_hosts_email_notification")]
+		public bool? SendNotificationsToAlternativeHosts { get; set; }
+
+		/// <summary>
+		/// Gets or sets the value indicating whether to allow alternative hosts to add or edit polls.
+		/// This requires Zoom version 5.8.0 or higher.
+		/// </summary>
+		[JsonPropertyName("alternative_host_update_polls")]
+		public bool? AllowAlternativeHostToUpdatePolls { get; set; }
+
+		/// <summary>
+		/// Gets or sets the third party audio conference info.
+		/// Constraints: Max 2048 chars.
+		/// </summary>
+		[JsonPropertyName("audio_conference_info")]
+		public string ThirdPartyAudioConferenceInfo { get; set; }
+
+		/// <summary>
+		/// Gets or sets the list the domains that are authenticated if user has configured "Sign Into Zoom with Specified Domains" option.
+		/// </summary>
+		[JsonPropertyName("authentication_domains")]
+		public string AuthenticationDomains { get; set; }
+
+		/// <summary>
+		/// Gets or sets the authentication name set in the authentication profile.
+		/// </summary>
+		[JsonPropertyName("authentication_name")]
+		public string AuthenticationName { get; set; }
+
+		/// <summary>
+		/// Gets or Sets the authentication option id.
+		/// </summary>
+		[JsonPropertyName("authentication_option")]
+		public string AuthenticationOptionId { get; set; }
+
+		/// <summary>
+		/// Gets or sets the type of calendar integration used to schedule the meeting.
+		/// Works with the private_meeting field to determine whether to share details of meetings or not.
+		/// </summary>
+		[JsonPropertyName("calendar_type")]
+		public CalendarIntegrationType? CalendarIntegrationType { get; set; }
+
+		/// <summary>
+		/// Gets or sets the custom keys and values assigned to the meeting.
+		/// </summary>
+		[JsonPropertyName("custom_keys")]
+		[JsonConverter(typeof(KeyValuePairConverter))]
+		public KeyValuePair<string, string>[] CustomKeys { get; set; }
+
+		/// <summary>
+		/// Gets or sets the value indicating whether to send email notifications to alternative hosts and users with <a href="https://support.zoom.us/hc/en-us/articles/201362803-Scheduling-privilege">scheduling privileges</a>.
+		/// This value defaults to true.
+		/// </summary>
+		[JsonPropertyName("email_notification")]
+		public bool? SendEmailNotifications { get; set; }
+
+		/// <summary>
+		/// Gets or sets the encryption type.
+		/// When using end-to-end encryption, several features (e.g. cloud recording, phone/SIP/H.323 dial-in) will be automatically disabled.
+		/// </summary>
+		[JsonPropertyName("encryption_type")]
+		public EncryptionType? EncryptionType { get; set; }
+
+		/// <summary>
+		/// Gets or sets the value indicating whether the Focus Mode feature is enabled when the meeting starts.
+		/// </summary>
+		[JsonPropertyName("focus_mode")]
+		public bool? FocusModeEnabled { get; set; }
+
+		/// <summary>
+		/// Gets or sets the value indicating whether only authenticated users can join meetings.
+		/// </summary>
+		[JsonPropertyName("meeting_authentication")]
+		public bool? AuthenticationRequired { get; set; }
+
+		/// <summary>
+		/// Gets or sets the value indicating whether the meeting is set as private.
+		/// </summary>
+		[JsonPropertyName("private_meeting")]
+		public bool? Private { get; set; }
+
+		/// <summary>
+		/// Gets or sets the value indicating whether to send registrants an email confirmation.
+		/// </summary>
+		[JsonPropertyName("registrants_email_notification")]
+		public bool? SendConfirmationEmailToRegistrants { get; set; }
+
+		/// <summary>
+		/// Gets or sets the value indicating whether to show social share buttons on the meeting registration page.
+		/// This setting only works for meetings that require registration.
+		/// </summary>
+		[JsonPropertyName("show_share_button")]
+		public bool? ShowShareButton { get; set; }
 	}
 }