Skip to content
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

Fix/save auth settings #689

Merged
merged 2 commits into from
Nov 19, 2024
Merged

Fix/save auth settings #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
048e05c
feat: Add client settings for saving logo and favicon
iandebruin98 Nov 18, 2024
da67957
feat: Update anonymous auth config too when updating settings
iandebruin98 Nov 18, 2024
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
4 changes: 2 additions & 2 deletions apps/api-server/src/adapter/openstad/service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,8 @@ service.updateClient = async function({ authConfig, project }) {
canCreateNewUsers: project.config.users?.canCreateNewUsers
},
styling: {
logo: authConfig?.config?.styling?.logo || project.config.styling?.logo,
favicon: authConfig?.config?.styling?.favicon || project.config.styling?.favicon,
logo: authConfig?.config?.styling?.logo || client?.config?.styling?.logo || project.config.styling?.logo,
favicon: authConfig?.config?.styling?.favicon || client?.config?.styling?.favicon || project.config.styling?.favicon,
inlineCSS: project.config.styling?.inlineCSS,
displayClientName: project.config.styling?.displayClientName,
},
Expand Down
8 changes: 5 additions & 3 deletions apps/api-server/src/routes/api/project.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,13 +585,15 @@ router.route('/:projectId') //(\\d+)
if (!hasRole( req.user, 'admin')) return next();
try {
let providers = await authSettings.providers({ project });
const configData = req.body.config?.auth?.provider?.openstad?.config || {};

for (let provider of providers) {
let authData = req.body.config?.auth?.provider?.[provider];
if (!authData) continue;
if ( Object.keys(configData).length === 0 ) continue;

let authConfig = await authSettings.config({ project, useAuth: provider });
let adapter = await authSettings.adapter({ authConfig });
if (adapter.service.updateClient) {
let merged = merge.recursive({}, authConfig, req.body.config?.auth?.provider?.[authConfig.provider])
let merged = merge.recursive({}, authConfig, {config: configData});
await adapter.service.updateClient({ authConfig: merged, project });
delete req.body.config?.auth?.provider?.[authConfig.provider]?.authTypes;
delete req.body.config?.auth?.provider?.[authConfig.provider]?.twoFactorRoles;
Expand Down
Loading