Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions app/back-end/events/site.js
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,26 @@ class SiteEvents {
config.settings.deployment.netlify.id = netlifyIdData.toSave;
config.settings.deployment.netlify.token = netlifyTokenData.toSave;
}

if (
config.settings.deployment.cloudflareWorkers &&
config.settings.deployment.cloudflareWorkers.accountId !== '' &&
config.settings.deployment.cloudflareWorkers.apiToken !== '' &&
config.settings.deployment.cloudflareWorkers.accountId !== 'publii-cf-account-id ' + siteID
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When deciding whether to store Cloudflare Workers credentials in the keychain, the condition checks whether accountId is already the placeholder value, but it doesn’t check the same for apiToken. For consistency with other credential blocks (and to avoid trying to re-store placeholder values), add a placeholder check for cloudflareWorkers.apiToken as well.

Suggested change
config.settings.deployment.cloudflareWorkers.accountId !== 'publii-cf-account-id ' + siteID
config.settings.deployment.cloudflareWorkers.accountId !== 'publii-cf-account-id ' + siteID &&
config.settings.deployment.cloudflareWorkers.apiToken !== 'publii-cf-api-token ' + siteID

) {
let cfAccountIdData = await self.loadPassword(
config.settings,
'publii-cf-account-id',
config.settings.deployment.cloudflareWorkers.accountId
);
let cfApiTokenData = await self.loadPassword(
config.settings,
'publii-cf-api-token',
config.settings.deployment.cloudflareWorkers.apiToken
);
config.settings.deployment.cloudflareWorkers.accountId = cfAccountIdData.toSave;
config.settings.deployment.cloudflareWorkers.apiToken = cfApiTokenData.toSave;
}
} catch (error) {
event.sender.send('app-site-config-saved', {
status: false,
Expand Down
Loading