Skip to content

feat: add preLoadedConnections array option to Jackson options #4074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vansh98789 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add preLoadedConnections array option to Jackson options #4074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 22 additions & 8 deletions npm/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type {
Connection,
IDirectorySyncController,
JacksonOption,
JacksonOptionWithRequiredLogger,
Expand Down Expand Up @@ -153,19 +154,32 @@ export const controllers = async (
eventController,
});

// write pre-loaded connections if present
// write pre-loaded connections if present (in-memory array — bundler-safe, no dynamic imports)
const preLoadedConnections = opts.preLoadedConnections;
const preLoadedConnection = opts.preLoadedConnection;

const writeConnection = async (connection: Connection) => {
if ('oidcDiscoveryUrl' in connection || 'oidcMetadata' in connection) {
await connectionAPIController.createOIDCConnection(connection);
} else {
await connectionAPIController.createSAMLConnection(connection);
}

logger.info(`loaded connection for tenant "${connection.tenant}" and product "${connection.product}"`);
};

if (preLoadedConnections && preLoadedConnections.length > 0) {
for (const connection of preLoadedConnections) {
await writeConnection(connection);
}
}

// existing path-based approach — kept for backward compatibility
if (preLoadedConnection && preLoadedConnection.length > 0) {
const connections = await loadConnection(preLoadedConnection);

for (const connection of connections) {
if ('oidcDiscoveryUrl' in connection || 'oidcMetadata' in connection) {
await connectionAPIController.createOIDCConnection(connection);
} else {
await connectionAPIController.createSAMLConnection(connection);
}

logger.info(`loaded connection for tenant "${connection.tenant}" and product "${connection.product}"`);
await writeConnection(connection);
}
}

Expand Down
6 changes: 6 additions & 0 deletions npm/src/typings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ export interface OIDCSSOConnectionWithDiscoveryUrl extends OIDCSSOConnection {
oidcDiscoveryUrl: string;
oidcMetadata?: never;
}
export type Connection =
| SAMLSSOConnectionWithEncodedMetadata
| SAMLSSOConnectionWithRawMetadata
| OIDCSSOConnectionWithDiscoveryUrl
| OIDCSSOConnectionWithMetadata;

export interface SAMLSSORecord extends SAMLSSOConnection {
clientID: string; // set by Jackson
Expand Down Expand Up @@ -428,6 +433,7 @@ export interface JacksonOption {
acsUrl?: string;
oidcPath?: string;
samlAudience?: string;
preLoadedConnections?: Connection[]; // new (in-memory, no dynamic imports)
preLoadedConnection?: string;
idpEnabled?: boolean;
db: DatabaseOption | DatabaseDriverOption;
Expand Down