LDAP debug page: deduplicate errors (grafana#19168)

teodoryantcheff · Sep 18, 2019 · 6b2e95a · 6b2e95a
1 parent 5ef40b2
commit 6b2e95a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/public/app/features/admin/state/actions.ts b/public/app/features/admin/state/actions.ts
@@ -38,6 +38,7 @@ export function loadLdapState(): ThunkResult<void> {
       const connectionInfo = await getLdapState();
       dispatch(ldapConnectionInfoLoadedAction(connectionInfo));
     } catch (error) {
+      error.isHandled = true;
       const ldapError = {
         title: error.data.message,
         body: error.data.error,
@@ -63,6 +64,7 @@ export function loadUserMapping(username: string): ThunkResult<void> {
       const userInfo = await getUserInfo(username);
       dispatch(userMappingInfoLoadedAction(userInfo));
     } catch (error) {
+      error.isHandled = true;
       const userError = {
         title: error.data.message,
         body: error.data.error,
@@ -106,6 +108,7 @@ export function loadLdapUserInfo(userId: number): ThunkResult<void> {
       dispatch(loadUserSessions(userId));
       dispatch(loadUserMapping(user.login));
     } catch (error) {
+      error.isHandled = true;
       const userError = {
         title: error.data.message,
         body: error.data.error,

diff --git a/public/app/features/admin/state/apis.ts b/public/app/features/admin/state/apis.ts
@@ -47,18 +47,14 @@ export const syncLdapUser = async (userId: number) => {
 };
 
 export const getUserInfo = async (username: string): Promise<LdapUser> => {
-  try {
-    const response = await getBackendSrv().get(`/api/admin/ldap/${username}`);
-    const { name, surname, email, login, isGrafanaAdmin, isDisabled, roles, teams } = response;
-    return {
-      info: { name, surname, email, login },
-      permissions: { isGrafanaAdmin, isDisabled },
-      roles,
-      teams,
-    };
-  } catch (error) {
-    throw error;
-  }
+  const response = await getBackendSrv().get(`/api/admin/ldap/${username}`);
+  const { name, surname, email, login, isGrafanaAdmin, isDisabled, roles, teams } = response;
+  return {
+    info: { name, surname, email, login },
+    permissions: { isGrafanaAdmin, isDisabled },
+    roles,
+    teams,
+  };
 };
 
 export const getUser = async (id: number): Promise<User> => {