Merge pull request #370 from vscheuber/main

fixes #369 and update to frodo-lib 2.0.0-72

package.json

@@ -116,7 +116,7 @@
     ]
   },
   "dependencies": {
-    "@rockcarver/frodo-lib": "2.0.0-71",
+    "@rockcarver/frodo-lib": "2.0.0-72",
     "chokidar": "^3.5.3",
     "cli-progress": "^3.11.2",
     "cli-table3": "^0.6.3",
@@ -129,6 +129,7 @@
     "inquirer-autocomplete-prompt": "^2.0.0",
     "nanospinner": "^1.1.0",
     "properties-reader": "^2.2.0",
+    "readline-sync": "^1.4.10",
     "replaceall": "^0.1.6",
     "resolve": "^1.22.1",
     "slugify": "^1.6.5",

src/cli/_template/something-delete.ts

@@ -1,10 +1,8 @@
-import { frodo } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand('frodo something delete');
 
 program

src/cli/_template/something-describe.ts

@@ -1,10 +1,8 @@
-import { frodo } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand('frodo something describe');
 
 program

src/cli/_template/something-else-delete.ts

@@ -1,10 +1,8 @@
-import { frodo } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand('frodo something else delete');
 
 program

src/cli/_template/something-else-describe.ts

@@ -1,10 +1,8 @@
-import { frodo } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand('frodo something else describe');
 
 program

src/cli/_template/something-else-export.ts

@@ -1,10 +1,8 @@
-import { frodo } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand('frodo something else export');
 
 program

src/cli/_template/something-else-import.ts

@@ -1,10 +1,8 @@
-import { frodo } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand('frodo something else import');
 
 program

src/cli/_template/something-else-list.ts

@@ -1,10 +1,8 @@
-import { frodo } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand('frodo something else list');
 
 program

src/cli/_template/something-export.ts

@@ -1,10 +1,8 @@
-import { frodo } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand('frodo something export');
 
 program

src/cli/_template/something-import.ts

@@ -1,10 +1,8 @@
-import { frodo } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand('frodo something import');
 
 program

src/cli/_template/something-list.ts

@@ -1,10 +1,8 @@
-import { frodo } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand('frodo something list');
 
 program

src/cli/_template/something-other-delete.ts

@@ -1,10 +1,8 @@
-import { frodo } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand('frodo something other delete');
 
 program

src/cli/_template/something-other-describe.ts

@@ -1,10 +1,8 @@
-import { frodo } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand('frodo something other describe');
 
 program

src/cli/_template/something-other-export.ts

@@ -1,10 +1,8 @@
-import { frodo } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand('frodo something other export');
 
 program

src/cli/_template/something-other-import.ts

@@ -1,10 +1,8 @@
-import { frodo } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand('frodo something other import');
 
 program

src/cli/_template/something-other-list.ts

@@ -1,10 +1,8 @@
-import { frodo } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand('frodo something other list');
 
 program

src/cli/admin/admin-add-autoid-static-user-mapping.ts

@@ -1,9 +1,9 @@
 import { frodo } from '@rockcarver/frodo-lib';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { printMessage } from '../../utils/Console.js';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
 const { addAutoIdStaticUserMapping } = frodo.admin;
 
 const program = new FrodoCommand('frodo admin add-autoid-static-user-mapping');

src/cli/admin/admin-create-oauth2-client-with-admin-privileges.ts

@@ -3,10 +3,10 @@ import Table from 'cli-table3';
 import { Option } from 'commander';
 import { v4 as uuidv4 } from 'uuid';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { printMessage } from '../../utils/Console.js';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
 const { createOAuth2ClientWithAdminPrivileges, createLongLivedToken } =
   frodo.admin;
 

src/cli/admin/admin-execute-rfc7523-authz-grant-flow.ts

@@ -1,16 +1,14 @@
-import { frodo } from '@rockcarver/frodo-lib';
 import { JwkRsa } from '@rockcarver/frodo-lib/types/ops/JoseOps.js';
 import { Option } from 'commander';
 import fs from 'fs';
 import { v4 as uuidv4 } from 'uuid';
 
 import * as s from '../../help/SampleData';
 import { executeRfc7523AuthZGrantFlow } from '../../ops/AdminOps.js';
+import { getTokens } from '../../ops/AuthenticateOps';
 import { printMessage } from '../../utils/Console.js';
 import { FrodoCommand } from '../FrodoCommand.js';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand(
   'frodo admin execute-rfc7523-authz-grant-flow'
 );

src/cli/admin/admin-federation-export.ts

@@ -1,16 +1,14 @@
-import { frodo } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
 import {
   exportAdminFederationProvidersToFile,
   exportAdminFederationProvidersToFiles,
   exportAdminFederationProviderToFile,
 } from '../../ops/AdminFederationOps';
+import { getTokens } from '../../ops/AuthenticateOps';
 import { printMessage, verboseMessage } from '../../utils/Console';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand('frodo admin federation export', ['realm']);
 
 program

src/cli/admin/admin-federation-import.ts

@@ -1,4 +1,3 @@
-import { frodo } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
 import {
@@ -7,11 +6,10 @@ import {
   importAdminFederationProvidersFromFiles,
   importFirstAdminFederationProviderFromFile,
 } from '../../ops/AdminFederationOps';
+import { getTokens } from '../../ops/AuthenticateOps';
 import { printMessage, verboseMessage } from '../../utils/Console';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand('frodo admin federation import', ['realm']);
 
 program

src/cli/admin/admin-federation-list.ts

@@ -1,11 +1,8 @@
-import { frodo } from '@rockcarver/frodo-lib';
-
 import { listAdminFederationProviders } from '../../ops/AdminFederationOps';
+import { getTokens } from '../../ops/AuthenticateOps';
 import { verboseMessage } from '../../utils/Console';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand('frodo admin federation list', ['realm']);
 
 program

src/cli/admin/admin-generate-rfc7523-authz-grant-artefacts.ts

@@ -1,16 +1,15 @@
-import { frodo, state } from '@rockcarver/frodo-lib';
+import { state } from '@rockcarver/frodo-lib';
 import { JwkRsa } from '@rockcarver/frodo-lib/types/ops/JoseOps.js';
 import { Option } from 'commander';
 import fs from 'fs';
 import { v4 as uuidv4 } from 'uuid';
 
 import * as s from '../../help/SampleData';
 import { generateRfc7523AuthZGrantArtefacts } from '../../ops/AdminOps.js';
+import { getTokens } from '../../ops/AuthenticateOps';
 import { printMessage } from '../../utils/Console.js';
 import { FrodoCommand } from '../FrodoCommand.js';
 
-const { getTokens } = frodo.login;
-
 const program = new FrodoCommand(
   'frodo admin generate-rfc7523-authz-grant-artefacts'
 );

src/cli/admin/admin-get-access-token.ts

@@ -1,10 +1,10 @@
 import { frodo, state } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { printMessage } from '../../utils/Console.js';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
 const { clientCredentialsGrant } = frodo.oauth2oidc.endpoint;
 
 const program = new FrodoCommand('frodo admin get-access-token');

src/cli/admin/admin-grant-oauth2-client-admin-privileges.ts

@@ -1,10 +1,10 @@
 import { frodo, state } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { printMessage } from '../../utils/Console.js';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
 const { grantOAuth2ClientAdminPrivileges } = frodo.admin;
 
 const program = new FrodoCommand(

src/cli/admin/admin-hide-generic-extension-attributes.ts

@@ -1,10 +1,10 @@
 import { frodo, state } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { printMessage } from '../../utils/Console.js';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
 const { hideGenericExtensionAttributes } = frodo.admin;
 
 const program = new FrodoCommand(

src/cli/admin/admin-list-oauth2-clients-with-admin-privileges.ts

@@ -1,9 +1,9 @@
 import { frodo, state } from '@rockcarver/frodo-lib';
 
+import { getTokens } from '../../ops/AuthenticateOps';
 import { printMessage } from '../../utils/Console.js';
 import { FrodoCommand } from '../FrodoCommand';
 
-const { getTokens } = frodo.login;
 const { listOAuth2AdminClients } = frodo.admin;
 
 const program = new FrodoCommand(