Merge pull request #191 from vscheuber/main

MINOR RELEASE

CHANGELOG.md

@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+-   \#52: Added new developer options for `script export` and `script import` commands:
+    -   `frodo script export`:
+        -   `-x`, `--extract`: Extract the script from the exported file, and save it to a separate file. Ignored with `-n` or `-a`.
+    -   `frodo script import`:
+        -   `-w`, `--watch`: Watch for changes to the script files and import the scripts automatically when the file changes. Can only be used with `-A`. (default: false)
+
+            ***Note:*** This new option only applies if the export was generated with the new `--extract` option!
+
+### Changed
+
+-   Updated to frodo-lib 0.18.2
+
+### Fixed
+
+-   \#190: Frodo now properly imports previously exported saml providers.
+
 ## [0.20.2-0] - 2023-01-24
 
 ## [0.20.1] - 2023-01-20

package.json

@@ -104,7 +104,7 @@
     ]
   },
   "dependencies": {
-    "@rockcarver/frodo-lib": "0.18.2-0",
+    "@rockcarver/frodo-lib": "0.18.2",
     "chokidar": "^3.5.3",
     "cli-progress": "^3.11.2",
     "cli-table3": "^0.6.3",

src/app.ts

@@ -19,7 +19,8 @@ import realm from './cli/realm/realm';
 import saml from './cli/saml/saml';
 import script from './cli/script/script';
 import service from './cli/service/service';
-import something from './cli/_template/something';
+// enable sample command template.
+// import something from './cli/_template/something';
 import theme from './cli/theme/theme';
 import { printMessage } from './utils/Console';
 import { getVersions } from './utils/Version';

src/ops/Saml2Ops.ts

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import { Saml2ProviderSkeleton } from '@rockcarver/frodo-lib/types/api/ApiTypes';
-import { Saml2, ExportImportUtils } from '@rockcarver/frodo-lib';
+import { Saml2, ExportImportUtils, Base64 } from '@rockcarver/frodo-lib';
 import {
   MultiOpStatusInterface,
   Saml2ExportInterface,
@@ -11,10 +11,11 @@ import {
   createProgressBar,
   createTable,
   debugMessage,
+  failSpinner,
   printMessage,
   showSpinner,
   stopProgressBar,
-  stopSpinner,
+  succeedSpinner,
   updateProgressBar,
 } from '../utils/Console';
 import { saveTextToFile } from '../utils/ExportImportUtils';
@@ -250,16 +251,12 @@ export async function importSaml2ProviderFromFile(
   fs.readFile(file, 'utf8', async (err, data) => {
     if (err) throw err;
     const fileData = JSON.parse(data);
-    if (validateImport(fileData.meta)) {
-      showSpinner(`Importing ${entityId}...`);
-      try {
-        await importSaml2Provider(entityId, fileData);
-        stopSpinner(`Imported ${entityId}.`);
-      } catch (error) {
-        stopSpinner(`Error importing ${entityId}: ${error.message}`);
-      }
-    } else {
-      printMessage('Import validation failed...', 'error');
+    showSpinner(`Importing ${entityId}...`);
+    try {
+      await importSaml2Provider(entityId, fileData);
+      succeedSpinner(`Imported ${entityId}.`);
+    } catch (error) {
+      failSpinner(`Error importing ${entityId}: ${error.message}`);
     }
   });
 }
@@ -273,19 +270,16 @@ export async function importFirstSaml2ProviderFromFile(file: string) {
     if (err) throw err;
     const fileData = JSON.parse(data) as Saml2ExportInterface;
     // pick the first provider and run with it
-    const entityId =
+    const entityId64 =
       Object.keys(fileData.saml.remote)[0] ||
       Object.keys(fileData.saml.hosted)[0];
-    if (validateImport(fileData.meta)) {
-      showSpinner(`Importing ${entityId}...`);
-      try {
-        await importSaml2Provider(entityId, fileData);
-        stopSpinner(`Imported ${entityId}.`);
-      } catch (error) {
-        stopSpinner(`Error importing ${entityId}: ${error.message}`);
-      }
-    } else {
-      printMessage('Import validation failed...', 'error');
+    const entityId = Base64.decode(entityId64);
+    showSpinner(`Importing ${entityId}...`);
+    try {
+      await importSaml2Provider(entityId, fileData);
+      succeedSpinner(`Imported ${entityId}.`);
+    } catch (error) {
+      failSpinner(`Error importing ${entityId}: ${error.message}`);
     }
   });
 }