Skip to content

Fix slack webhook overriding #856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gaspergrom merged 5 commits into from
May 12, 2023
Merged

Fix slack webhook overriding #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9dc80ce
Fix slack webhook overriding
gaspergrom May 12, 2023
aed91f2
Remove unused files
gaspergrom May 12, 2023
a06842e
Fix formatting
gaspergrom May 12, 2023
54e1f30
Fix slackwebhook checking
gaspergrom May 12, 2023
cd2513b
fix formatting
gaspergrom May 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions backend/src/database/repositories/settingsRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ export default class SettingsRepository {

data.backgroundImageUrl = _get(data, 'backgroundImages[0].downloadUrl', null)
data.logoUrl = _get(data, 'logos[0].downloadUrl', null)
if (
typeof data.slackWebhook !== 'string' ||
(typeof data.slackWebhook === 'string' && !data.slackWebHook?.startsWith('https://'))
) {
data.slackWebHook = undefined
}

const [settings] = await options.database.settings.findOrCreate({
where: { id: tenant.id, tenantId: tenant.id },
Expand Down
3 changes: 3 additions & 0 deletions backend/src/services/settingsService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class SettingsService {
const updated = await SettingsRepository.save(
{
...options.currentTenant.settings[0].dataValues,
slackWebHook: undefined,
customActivityTypes: activityTypes.custom,
},
options,
Expand Down Expand Up @@ -140,6 +141,7 @@ class SettingsService {
const updated = await SettingsRepository.save(
{
...options.currentTenant.settings[0].dataValues,
slackWebHook: undefined,
customActivityTypes: activityTypes.custom,
},
options,
Expand All @@ -158,6 +160,7 @@ class SettingsService {
const updated = await SettingsRepository.save(
{
...options.currentTenant.settings[0].dataValues,
slackWebHook: undefined,
customActivityTypes: activityTypes.custom,
},
options,
Expand Down