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

Jump to bottom

do not warn when switching capabilities for resources with optional auth #61043

Merged
merged 2 commits into from
Mar 24, 2020
Merged

do not warn when switching capabilities for resources with optional auth #61043

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
9fe92e1
do not switch capabilities for optional routes
mshustov Mar 24, 2020
d9d2e91
downgrade message to debug
mshustov Mar 24, 2020
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 x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ describe('capabilitiesSwitcher', () => {
expect(result).toEqual(buildCapabilities());
});

it('logs a warning, and does not toggle capabilities if an error is encountered', async () => {
it('logs a debug message, and does not toggle capabilities if an error is encountered', async () => {
const space: Space = {
id: 'space',
name: '',
Expand All @@ -171,7 +171,7 @@ describe('capabilitiesSwitcher', () => {
const result = await switcher(request, capabilities);

expect(result).toEqual(buildCapabilities());
expect(logger.warn).toHaveBeenCalledWith(
expect(logger.debug).toHaveBeenCalledWith(
`Error toggling capabilities for request to /path: Error: Something terrible happened`
);
});
Expand Down
3 changes: 2 additions & 1 deletion x-pack/plugins/spaces/server/capabilities/capabilities_switcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ export function setupCapabilitiesSwitcher(

const registeredFeatures = features.getFeatures();

// try to retrieve capabilities for authenticated or "maybe authenticated" users
return toggleCapabilities(registeredFeatures, capabilities, activeSpace);
} catch (e) {
logger.warn(`Error toggling capabilities for request to ${request.url.pathname}: ${e}`);
logger.debug(`Error toggling capabilities for request to ${request.url.pathname}: ${e}`);
return capabilities;
}
};
Expand Down