public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v9.4.x] Alerting: fix users call 403 by calling /user instead of /users/{id} (#64607)

Browse Source 
Co-authored-by: Virginia Cepeda <virginia.cepeda@grafana.com>
fix users call 403 by calling /user instead of /users/{id} (#64544)
This commit is contained in:
Grot (@grafanabot)
2023-03-10 14:29:43 +01:00
committed by GitHub
parent 961446e7e1
commit 6f22584d26
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/alerting/unified/Analytics.test.ts
+4 -4
View File
@@ -18,10 +18,10 @@ describe('isNewUser', function () {
getBackendSrv().get = jest.fn().mockResolvedValue(newUser);
const isNew = await isNewUser(1);
const isNew = await isNewUser();
expect(isNew).toBe(true);
expect(getBackendSrv().get).toHaveBeenCalledTimes(1);
expect(getBackendSrv().get).toHaveBeenCalledWith('/api/users/1');
expect(getBackendSrv().get).toHaveBeenCalledWith('/api/user');
});
it('should return false if the user has been created prior to the last two weeks', async () => {
@@ -32,9 +32,9 @@ describe('isNewUser', function () {
getBackendSrv().get = jest.fn().mockResolvedValue(oldUser);
const isNew = await isNewUser(2);
const isNew = await isNewUser();
expect(isNew).toBe(false);
expect(getBackendSrv().get).toHaveBeenCalledTimes(1);
expect(getBackendSrv().get).toHaveBeenCalledWith('/api/users/2');
expect(getBackendSrv().get).toHaveBeenCalledWith('/api/user');
});
});
public/app/features/alerting/unified/Analytics.ts
+5 -5
View File
@@ -44,9 +44,9 @@ export function withPerformanceLogging<TFunc extends (...args: any[]) => Promise
};
}
export async function isNewUser(userId: number) {
export async function isNewUser() {
try {
const { createdAt } = await getBackendSrv().get(`/api/users/${userId}`);
const { createdAt } = await getBackendSrv().get(`/api/user`);
const limitDateForNewUser = dateTime().subtract(USER_CREATION_MIN_DAYS, 'days');
const userCreationDate = dateTime(createdAt);
@@ -60,7 +60,7 @@ export async function isNewUser(userId: number) {
}
export const trackNewAlerRuleFormSaved = async (props: AlertRuleTrackingProps) => {
const isNew = await isNewUser(props.user_id);
const isNew = await isNewUser();
if (isNew) {
return;
}
@@ -68,7 +68,7 @@ export const trackNewAlerRuleFormSaved = async (props: AlertRuleTrackingProps) =
};
export const trackNewAlerRuleFormCancelled = async (props: AlertRuleTrackingProps) => {
const isNew = await isNewUser(props.user_id);
const isNew = await isNewUser();
if (isNew) {
return;
}
@@ -76,7 +76,7 @@ export const trackNewAlerRuleFormCancelled = async (props: AlertRuleTrackingProp
};
export const trackNewAlerRuleFormError = async (props: AlertRuleTrackingProps & { error: string }) => {
const isNew = await isNewUser(props.user_id);
const isNew = await isNewUser();
if (isNew) {
return;
}