fix(core): update oauth endpoints to use instance base url

This commit is contained in:
freya 2022-09-14 09:05:31 +01:00 committed by GitHub
parent 461848fcc4
commit dd3ba96372
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -254,6 +254,9 @@ class App {
telemetrySettings.config = { key, url }; telemetrySettings.config = { key, url };
} }
// Define it here to avoid calling the function multiple times
const instanceBaseUrl = getInstanceBaseUrl();
this.frontendSettings = { this.frontendSettings = {
endpointWebhook: this.endpointWebhook, endpointWebhook: this.endpointWebhook,
endpointWebhookTest: this.endpointWebhookTest, endpointWebhookTest: this.endpointWebhookTest,
@ -264,11 +267,11 @@ class App {
maxExecutionTimeout: this.maxExecutionTimeout, maxExecutionTimeout: this.maxExecutionTimeout,
timezone: this.timezone, timezone: this.timezone,
urlBaseWebhook, urlBaseWebhook,
urlBaseEditor: getInstanceBaseUrl(), urlBaseEditor: instanceBaseUrl,
versionCli: '', versionCli: '',
oauthCallbackUrls: { oauthCallbackUrls: {
oauth1: `${urlBaseWebhook}${this.restEndpoint}/oauth1-credential/callback`, oauth1: `${instanceBaseUrl}/${this.restEndpoint}/oauth1-credential/callback`,
oauth2: `${urlBaseWebhook}${this.restEndpoint}/oauth2-credential/callback`, oauth2: `${instanceBaseUrl}/${this.restEndpoint}/oauth2-credential/callback`,
}, },
versionNotifications: { versionNotifications: {
enabled: config.getEnv('versionNotifications.enabled'), enabled: config.getEnv('versionNotifications.enabled'),