Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
456 changes: 456 additions & 0 deletions src/api/SecretStoreApi.ts

Large diffs are not rendered by default.

173 changes: 0 additions & 173 deletions src/api/classic/SecretStoreApi.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/lib/FrodoLib.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import AuthenticationSettingsOps, {
AuthenticationSettings,
} from '../ops/AuthenticationSettingsOps';
import CirclesOfTrustOps, { CirclesOfTrust } from '../ops/CirclesOfTrustOps';
import SecretStoreOps, { SecretStore } from '../ops/classic/SecretStoreOps';
import ServerOps, { Server } from '../ops/classic/ServerOps';
import SiteOps, { Site } from '../ops/classic/SiteOps';
import AdminFederationOps, {
Expand Down Expand Up @@ -81,6 +80,7 @@ import ResourceTypeOps, { ResourceType } from '../ops/ResourceTypeOps';
import Saml2Ops, { Saml2 } from '../ops/Saml2Ops';
import ScriptOps, { Script } from '../ops/ScriptOps';
import ScriptTypeOps, { ScriptType } from '../ops/ScriptTypeOps';
import SecretStoreOps, { SecretStore } from '../ops/SecretStoreOps';
import ServiceOps, { Service } from '../ops/ServiceOps';
import SessionOps, { Session } from '../ops/SessionOps';
import ThemeOps, { Theme } from '../ops/ThemeOps';
Expand Down
15 changes: 8 additions & 7 deletions src/ops/ConfigOps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ import {
exportCirclesOfTrust,
importCirclesOfTrust,
} from './CirclesOfTrustOps';
import {
exportSecretStores,
importSecretStores,
SecretStoreExportSkeleton,
} from './classic/SecretStoreOps';
import {
exportServers,
importServers,
Expand Down Expand Up @@ -110,6 +105,11 @@ import {
importScriptTypes,
ScriptTypeExportSkeleton,
} from './ScriptTypeOps';
import {
exportSecretStores,
importSecretStores,
SecretStoreExportSkeleton,
} from './SecretStoreOps';
import { exportServices, importServices } from './ServiceOps';
import { exportThemes, importThemes, ThemeSkeleton } from './ThemeOps';

Expand Down Expand Up @@ -683,7 +683,7 @@ export async function exportFullConfiguration({
realmStateObj,
'Secret Stores',
resultCallback,
isClassicDeployment
isClassicDeployment || isCloudDeployment
)
)?.secretstore,
service: (
Expand Down Expand Up @@ -1052,7 +1052,8 @@ export async function importFullConfiguration({
indicatorId,
'Secret Stores',
resultCallback,
isClassicDeployment && !!importData.realm[realm].secretstore
(isClassicDeployment || isCloudDeployment) &&
!!importData.realm[realm].secretstore
)
);
response.push(
Expand Down
2 changes: 1 addition & 1 deletion src/ops/OpsTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ export interface ExportMetaData {
exportToolVersion: string;
}

export type ResultCallback<R> = (error: FrodoError, result: R) => void;
export type ResultCallback<R> = (error?: FrodoError, result?: R) => void;

export type ErrorFilter = (error: FrodoError) => boolean;
Loading