From 6fce376e7b808ef17d48d051a24ff758ccb99d85 Mon Sep 17 00:00:00 2001 From: Nick Misasi Date: Wed, 5 Apr 2023 10:53:07 -0400 Subject: [PATCH] [MM-51905] Fix: Successful trial request shows error modal (#22800) * License public key to test env for mono-repo * Fix error modal showing on a successful trial request --- model/config.go | 4 ++-- server/channels/utils/license-public-key-test.txt | 14 +++++++------- server/channels/utils/license-public-key.txt | 14 +++++++------- .../components/start_trial_form_modal/index.tsx | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/model/config.go b/model/config.go index 4868229bbfc..def23f67c6c 100644 --- a/model/config.go +++ b/model/config.go @@ -239,10 +239,10 @@ const ( Office365SettingsDefaultTokenEndpoint = "https://login.microsoftonline.com/common/oauth2/v2.0/token" Office365SettingsDefaultUserAPIEndpoint = "https://graph.microsoft.com/v1.0/me" - CloudSettingsDefaultCwsURL = "https://customers.mattermost.com" + CloudSettingsDefaultCwsURL = "https://portal.test.cloud.mattermost.com" CloudSettingsDefaultCwsAPIURL = "https://portal.internal.prod.cloud.mattermost.com" // TODO: update to "https://portal.test.cloud.mattermost.com" when ready to use test license key - CloudSettingsDefaultCwsURLTest = "https://customers.mattermost.com" + CloudSettingsDefaultCwsURLTest = "https://portal.test.cloud.mattermost.com" // TODO: update to // "https://api.internal.test.cloud.mattermost.com" when ready to use test license key CloudSettingsDefaultCwsAPIURLTest = "https://portal.internal.prod.cloud.mattermost.com" diff --git a/server/channels/utils/license-public-key-test.txt b/server/channels/utils/license-public-key-test.txt index 23c8800db39..720b2eb1f1b 100644 --- a/server/channels/utils/license-public-key-test.txt +++ b/server/channels/utils/license-public-key-test.txt @@ -1,9 +1,9 @@ -----BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyZmShlU8Z8HdG0IWSZ8r -tSyzyxrXkJjsFUf0Ke7bm/TLtIggRdqOcUF3XEWqQk5RGD5vuq7Rlg1zZqMEBk8N -EZeRhkxyaZW8pLjxwuBUOnXfJew31+gsTNdKZzRjrvPumKr3EtkleuoxNdoatu4E -HrKmR/4Yi71EqAvkhk7ZjQFuF0osSWJMEEGGCSUYQnTEqUzcZSh1BhVpkIkeu8Kk -1wCtptODixvEujgqVe+SrE3UlZjBmPjC/CL+3cYmufpSNgcEJm2mwsdaXp2OPpfn -a0v85XL6i9ote2P+fLZ3wX9EoioHzgdgB7arOxY50QRJO7OyCqpKFKv6lRWTXuSt -hwIDAQAB +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwVMaUtQMFtQsRoa2FQd+ +17+acMRMqzPsFTJEix7n+tA8ieCAX0lvNBOjVh8lrt/AUe7B3ZJ0HE6v8xuKj9YA +zUqV8R27UmnIxf5TCXFWrt+fnzX31yLjqK4Fd6JmiDheUatd1hG+gkScMAPuj+Xw +4O+V5sMwaVusytVgmehqcVKYrKpDyhBDUEbDRbKKbP4YAHbmNs3AzlGBbQtvc1fi +0ww7oNKs9cZVcCIeNdwbkXmf8pK5zSXqVsmyPyH3Ue8M6JMNGuPGh1fyHRhFdIiD +lxd7LBKSh7BTjbRtG9DEt1dyMnYQDgRVAdpururuK/otowCowr6X/Etnk2NNeXcZ +4QIDAQAB -----END PUBLIC KEY----- diff --git a/server/channels/utils/license-public-key.txt b/server/channels/utils/license-public-key.txt index 23c8800db39..720b2eb1f1b 100644 --- a/server/channels/utils/license-public-key.txt +++ b/server/channels/utils/license-public-key.txt @@ -1,9 +1,9 @@ -----BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyZmShlU8Z8HdG0IWSZ8r -tSyzyxrXkJjsFUf0Ke7bm/TLtIggRdqOcUF3XEWqQk5RGD5vuq7Rlg1zZqMEBk8N -EZeRhkxyaZW8pLjxwuBUOnXfJew31+gsTNdKZzRjrvPumKr3EtkleuoxNdoatu4E -HrKmR/4Yi71EqAvkhk7ZjQFuF0osSWJMEEGGCSUYQnTEqUzcZSh1BhVpkIkeu8Kk -1wCtptODixvEujgqVe+SrE3UlZjBmPjC/CL+3cYmufpSNgcEJm2mwsdaXp2OPpfn -a0v85XL6i9ote2P+fLZ3wX9EoioHzgdgB7arOxY50QRJO7OyCqpKFKv6lRWTXuSt -hwIDAQAB +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwVMaUtQMFtQsRoa2FQd+ +17+acMRMqzPsFTJEix7n+tA8ieCAX0lvNBOjVh8lrt/AUe7B3ZJ0HE6v8xuKj9YA +zUqV8R27UmnIxf5TCXFWrt+fnzX31yLjqK4Fd6JmiDheUatd1hG+gkScMAPuj+Xw +4O+V5sMwaVusytVgmehqcVKYrKpDyhBDUEbDRbKKbP4YAHbmNs3AzlGBbQtvc1fi +0ww7oNKs9cZVcCIeNdwbkXmf8pK5zSXqVsmyPyH3Ue8M6JMNGuPGh1fyHRhFdIiD +lxd7LBKSh7BTjbRtG9DEt1dyMnYQDgRVAdpururuK/otowCowr6X/Etnk2NNeXcZ +4QIDAQAB -----END PUBLIC KEY----- diff --git a/webapp/channels/src/components/start_trial_form_modal/index.tsx b/webapp/channels/src/components/start_trial_form_modal/index.tsx index 04e778682b7..e64ed539a16 100644 --- a/webapp/channels/src/components/start_trial_form_modal/index.tsx +++ b/webapp/channels/src/components/start_trial_form_modal/index.tsx @@ -129,7 +129,7 @@ function StartTrialFormModal(props: Props): JSX.Element | null { company_country: country, company_size: orgSize, }; - const error = await dispatch(requestTrialLicense(trialRequestBody, props.page || 'license')); + const {error, data} = await dispatch(requestTrialLicense(trialRequestBody, props.page || 'license')); if (error) { setLoadStatus(TrialLoadStatus.Failed); let title; @@ -137,7 +137,7 @@ function StartTrialFormModal(props: Props): JSX.Element | null { let buttonText; let onTryAgain = handleErrorModalTryAgain; - if (error?.data.status === 422) { + if (data.status === 422) { title = (<>); subtitle = (