From 18b0d101b765ca72b1318d8b45998f33bc71a0f0 Mon Sep 17 00:00:00 2001 From: raghavaggarwal2308 Date: Wed, 29 Nov 2023 16:21:01 +0530 Subject: [PATCH 1/6] [MI-3785] Updated docs: 1. Added latest screenshot 2. Completed the documentation for plugin configuration. --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e361f99f..bd43b64c 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The Mattermost Zoom integration allows team members to initiate a Zoom meeting w **Important**: Only Zoom users associated with the Zoom Account that created the Zoom App will be able to use the plugin. You can add these users from the **Manage Users** section in the Zoom Account settings. -![example](https://github.com/mattermost/mattermost-plugin-zoom/assets/74422101/64bb5511-0ab0-402f-9fae-7c3c8878a5ac) +![image](https://github.com/mattermost/mattermost-plugin-gitlab/assets/55234496/4315391e-5dc2-4cfd-a1ea-3e6dd87c0473) ## Admin guide @@ -198,12 +198,11 @@ Select **Done** and then save your app. * If you're using a self-hosted private cloud or on-premises Zoom server, enter the **Zoom URL** and **Zoom API URL** for the Zoom server, for example `https://yourzoom.com` and `https://api.yourzoom.com/v2` respectively. Leave blank if you're using Zoom's vendor-hosted SaaS service. * **Cloud Hosted?** * Leave **Zoom API URL** and **Zoom URL** fields blank. +* If you are using and account level app on Zoom, set **OAuth by Account Level App (Beta)** to `true`. * Connect your users to Zoom using OAuth. - * Use the Client ID and Client Secret generated when configuring Zoom to fill in the fields **Zoom OAuth Client ID** and **Zoom OAuth Client Secret**. + * Use the Client ID and Client Secret generated when configuring Zoom to fill in the fields **Zoom OAuth Client ID** and **Zoom OAuth Client Secret**. (Make sure these credentials are according to the app type (user/account level) you are using.) * Select the **Regenerate** button next to the field **At Rest Token Encryption Key**. - * Make sure **Enable Password based authentication** is set to `false`. - * Ignore **API Key** and **API Secret** fields. -* If you are using Webhooks or Deauthorization, make sure you select the **Regenerate** button on **Webhook Secret** field. +* If you are using Webhooks or Deauthorization, make sure you select the **Regenerate** button on **Webhook Secret** field and set the **Zoom Webhook Secret** from the features page in your Zoom app. * Select **Save**. ## User guide From 4d847db04c9177a48b4a990a54e892d5c944aa67 Mon Sep 17 00:00:00 2001 From: raghavaggarwal2308 Date: Wed, 29 Nov 2023 16:28:43 +0530 Subject: [PATCH 2/6] [MI-3785] Updated screenshot link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bd43b64c..94f43f5a 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The Mattermost Zoom integration allows team members to initiate a Zoom meeting w **Important**: Only Zoom users associated with the Zoom Account that created the Zoom App will be able to use the plugin. You can add these users from the **Manage Users** section in the Zoom Account settings. -![image](https://github.com/mattermost/mattermost-plugin-gitlab/assets/55234496/4315391e-5dc2-4cfd-a1ea-3e6dd87c0473) +![image](https://github.com/mattermost/mattermost-plugin-zoom/assets/55234496/a109df21-f3c4-4432-b42d-7ef3ae493a50) ## Admin guide From d48e7792e2a494597dec4876a25fae2b034db801 Mon Sep 17 00:00:00 2001 From: raghavaggarwal2308 Date: Wed, 29 Nov 2023 16:31:10 +0530 Subject: [PATCH 3/6] [MI-3785] Minor fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 94f43f5a..722f6b24 100644 --- a/README.md +++ b/README.md @@ -198,7 +198,7 @@ Select **Done** and then save your app. * If you're using a self-hosted private cloud or on-premises Zoom server, enter the **Zoom URL** and **Zoom API URL** for the Zoom server, for example `https://yourzoom.com` and `https://api.yourzoom.com/v2` respectively. Leave blank if you're using Zoom's vendor-hosted SaaS service. * **Cloud Hosted?** * Leave **Zoom API URL** and **Zoom URL** fields blank. -* If you are using and account level app on Zoom, set **OAuth by Account Level App (Beta)** to `true`. +* If you are using an account level app on Zoom, set **OAuth by Account Level App (Beta)** to `true`. * Connect your users to Zoom using OAuth. * Use the Client ID and Client Secret generated when configuring Zoom to fill in the fields **Zoom OAuth Client ID** and **Zoom OAuth Client Secret**. (Make sure these credentials are according to the app type (user/account level) you are using.) * Select the **Regenerate** button next to the field **At Rest Token Encryption Key**. From 4f2b23ace6791c19517a4461e9eb233cd6846d04 Mon Sep 17 00:00:00 2001 From: raghavaggarwal2308 Date: Thu, 30 Nov 2023 20:49:43 +0530 Subject: [PATCH 4/6] [MI-3785] Review fixes --- README.md | 4 ++-- plugin.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 722f6b24..1c1b4f6f 100644 --- a/README.md +++ b/README.md @@ -198,11 +198,11 @@ Select **Done** and then save your app. * If you're using a self-hosted private cloud or on-premises Zoom server, enter the **Zoom URL** and **Zoom API URL** for the Zoom server, for example `https://yourzoom.com` and `https://api.yourzoom.com/v2` respectively. Leave blank if you're using Zoom's vendor-hosted SaaS service. * **Cloud Hosted?** * Leave **Zoom API URL** and **Zoom URL** fields blank. -* If you are using an account level app on Zoom, set **OAuth by Account Level App (Beta)** to `true`. +* If you are using an account level app on Zoom, set **OAuth by Account Level App** to `true`. * Connect your users to Zoom using OAuth. * Use the Client ID and Client Secret generated when configuring Zoom to fill in the fields **Zoom OAuth Client ID** and **Zoom OAuth Client Secret**. (Make sure these credentials are according to the app type (user/account level) you are using.) * Select the **Regenerate** button next to the field **At Rest Token Encryption Key**. -* If you are using Webhooks or Deauthorization, make sure you select the **Regenerate** button on **Webhook Secret** field and set the **Zoom Webhook Secret** from the features page in your Zoom app. +* If you are using Webhooks or Deauthorization, make sure you select the **Regenerate** button on **Webhook Secret** field. Then set the **Zoom Webhook Secret** from the features page in your Zoom app. * Select **Save**. ## User guide diff --git a/plugin.json b/plugin.json index 9b744c2a..debfe8ac 100644 --- a/plugin.json +++ b/plugin.json @@ -43,7 +43,7 @@ }, { "key": "AccountLevelApp", - "display_name": "OAuth by Account Level App (Beta):", + "display_name": "OAuth by Account Level App:", "type": "bool", "help_text": "When true, only an account administrator has to log in. The rest of the users will automatically use their Mattermost email to authenticate when starting meetings.", "placeholder": "", From 1536adb1d8e4e5ecb40d1c712f2fecb978d02974 Mon Sep 17 00:00:00 2001 From: raghavaggarwal2308 Date: Fri, 1 Dec 2023 14:11:28 +0530 Subject: [PATCH 5/6] [MI-3785] Review fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1c1b4f6f..c0806ae7 100644 --- a/README.md +++ b/README.md @@ -200,7 +200,7 @@ Select **Done** and then save your app. * Leave **Zoom API URL** and **Zoom URL** fields blank. * If you are using an account level app on Zoom, set **OAuth by Account Level App** to `true`. * Connect your users to Zoom using OAuth. - * Use the Client ID and Client Secret generated when configuring Zoom to fill in the fields **Zoom OAuth Client ID** and **Zoom OAuth Client Secret**. (Make sure these credentials are according to the app type (user/account level) you are using.) + * Use the Client ID and Client Secret generated when configuring Zoom to fill in the fields **Zoom OAuth Client ID** and **Zoom OAuth Client Secret**. (If you have selected the app type as "Account level app", make sure that you are using a account level app on Zoom side as well) * Select the **Regenerate** button next to the field **At Rest Token Encryption Key**. * If you are using Webhooks or Deauthorization, make sure you select the **Regenerate** button on **Webhook Secret** field. Then set the **Zoom Webhook Secret** from the features page in your Zoom app. * Select **Save**. From 2be206079cfc8eb4a1ed4bec9e01a6388d72f1af Mon Sep 17 00:00:00 2001 From: Raghav Aggarwal Date: Mon, 4 Dec 2023 14:57:02 +0530 Subject: [PATCH 6/6] [MI-3785] Review fix Co-authored-by: Michael Kochell <6913320+mickmister@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c0806ae7..516150be 100644 --- a/README.md +++ b/README.md @@ -200,7 +200,7 @@ Select **Done** and then save your app. * Leave **Zoom API URL** and **Zoom URL** fields blank. * If you are using an account level app on Zoom, set **OAuth by Account Level App** to `true`. * Connect your users to Zoom using OAuth. - * Use the Client ID and Client Secret generated when configuring Zoom to fill in the fields **Zoom OAuth Client ID** and **Zoom OAuth Client Secret**. (If you have selected the app type as "Account level app", make sure that you are using a account level app on Zoom side as well) + * Use the Client ID and Client Secret generated when configuring Zoom to fill in the fields **Zoom OAuth Client ID** and **Zoom OAuth Client Secret**. (If you have selected the app type as "Account level app", make sure that you are using an account-level app on Zoom side as well) * Select the **Regenerate** button next to the field **At Rest Token Encryption Key**. * If you are using Webhooks or Deauthorization, make sure you select the **Regenerate** button on **Webhook Secret** field. Then set the **Zoom Webhook Secret** from the features page in your Zoom app. * Select **Save**.