Merge pull request #400 from vscheuber/main

fixes #392

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+-   \#392: Implemented error handling pattern for methods with unusual amounts of REST calls like `frodo.config.exportFullConfiguration` and `frodo.config.importFullConfiguration`
+
 ## [2.0.0-75] - 2024-03-29
 
 ### Fixed

src/api/IdmConfigApi.ts

@@ -122,12 +122,8 @@ export async function putConfigEntity({
     getHostBaseUrl(state.getHost()),
     entityId
   );
-  try {
-    const { data } = await generateIdmApi({ state }).put(urlString, entityData);
-    return data;
-  } catch (error) {
-    throw Error(`Error on config entity ${entityId}: ${error}`);
-  }
+  const { data } = await generateIdmApi({ state }).put(urlString, entityData);
+  return data;
 }
 
 /**

src/ops/ApplicationOps.ts

@@ -1381,7 +1381,6 @@ export async function importApplications({
 }): Promise<ApplicationSkeleton[]> {
   const response = [];
   const errors = [];
-  const imported = [];
   try {
     for (const applicationId of Object.keys(importData.managedApplication)) {
       const applicationData = importData.managedApplication[applicationId];
@@ -1402,23 +1401,17 @@ export async function importApplications({
             state,
           })
         );
-        imported.push(applicationId);
       } catch (error) {
         errors.push(error);
       }
     }
     if (errors.length) {
       throw new FrodoError(`Error importing applications`, errors);
     }
-    if (0 === imported.length) {
-      throw new FrodoError(
-        `Import error:\nNo applications found in import data!`
-      );
-    }
     return response;
   } catch (error) {
     // just re-throw previously caught errors
-    if (errors.length > 0 || imported.length == 0) {
+    if (errors.length > 0) {
       throw error;
     }
     throw new FrodoError(`Error importing applications`, error);

src/ops/AuthenticateOps.ts

@@ -715,7 +715,7 @@ export async function getFreshSaBearerToken({
     const err: FrodoError = error as FrodoError;
     if (
       err.isHttpError &&
-      err.httpErrorMessage === 'invalid_scope' &&
+      err.httpErrorText === 'invalid_scope' &&
       err.httpDescription?.startsWith('Unsupported scope for service account: ')
     ) {
       const invalidScopes: string[] = err.httpDescription

src/ops/CirclesOfTrustOps.ts

@@ -707,7 +707,6 @@ export async function importCirclesOfTrust({
 }): Promise<CircleOfTrustSkeleton[]> {
   const responses = [];
   const errors = [];
-  const imported = [];
   try {
     entityProviders = entityProviders.map((id) => `${id}|saml2`);
     const validEntityIds = await readSaml2EntityIds({ state });
@@ -736,7 +735,6 @@ export async function importCirclesOfTrust({
                 cotData,
                 state,
               });
-              imported.push(cotId);
               responses.push(response);
             } catch (createError) {
               if ((createError as FrodoError).httpStatus === 409) {
@@ -770,7 +768,6 @@ export async function importCirclesOfTrust({
                     cotData: existingCot,
                     state,
                   });
-                  imported.push(cotId);
                   responses.push(response);
                 } else {
                   debugMessage({
@@ -848,20 +845,14 @@ export async function importCirclesOfTrust({
         });
         errors.push(error);
       }
-      imported.push(cotId);
     }
     if (errors.length > 0) {
       throw new FrodoError(`Error importing circles of trust`);
     }
-    if (0 === imported.length) {
-      throw new Error(
-        `Import error:\nNo circles of trust found in import data!`
-      );
-    }
     return responses;
   } catch (error) {
     // just re-throw previously caught errors
-    if (errors.length > 0 || imported.length == 0) {
+    if (errors.length > 0) {
       throw error;
     }
     throw new FrodoError(`Error importing circles of trust`, error);