[v10.0.x] Alerting: Fix edit / view of webhook contact point when no authorization is set (#71972)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
Fix edit / view of webhook contact point when no authorization is set (#71965)
This commit is contained in:
grafana-delivery-bot[bot]
2023-07-19 20:34:36 +03:00
committed by GitHub
parent 857b275d61
commit e4e170f844
2 changed files with 8 additions and 3 deletions
@@ -34,6 +34,11 @@ describe('normalizeFormValues', () => {
expect(normalizeFormValues(config)).toEqual(createContactPoint({ bearer_token_file: 'file' }));
});
it('should normalize even if authorization is not defined', () => {
const config = createContactPoint({});
expect(normalizeFormValues(config)).toEqual(createContactPoint({}));
});
});
function createContactPoint(httpConfig: DeprecatedAuthHTTPConfig | HTTPAuthConfig) {
@@ -8,7 +8,7 @@ export interface DeprecatedAuthHTTPConfig {
}
export interface HTTPAuthConfig {
authorization: {
authorization?: {
type: string;
credentials?: string;
credentials_file?: string;
@@ -42,8 +42,8 @@ function normalizeHTTPConfig(config: HTTPAuthConfig | DeprecatedAuthHTTPConfig):
return {
...omit(config, 'authorization'),
bearer_token: config.authorization.credentials,
bearer_token_file: config.authorization.credentials_file,
bearer_token: config.authorization?.credentials,
bearer_token_file: config.authorization?.credentials_file,
};
}