jazzymc/homarr
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: import sidebar issues (#1712)

Browse Source
This commit is contained in:
Meier Lukas
2024-12-18 13:52:10 +01:00
committed by GitHub
parent 5fbbf037ce
commit a51999457b
6 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/old-import/src/import/collections/integration-collection.ts
View File

@@ -7,12 +7,17 @@ import { createDbInsertCollection } from "./common";
export const createIntegrationInsertCollection = (
preparedIntegrations: PreparedIntegration[],
encryptionToken: string | null,
encryptionToken: string | null | undefined,
) => {
const insertCollection = createDbInsertCollection(["integrations", "integrationSecrets"]);
if (preparedIntegrations.length === 0) {
return insertCollection;
}
logger.info(`Preparing integrations for insert collection count=${preparedIntegrations.length}`);
if (encryptionToken === null) {
if (encryptionToken === null || encryptionToken === undefined) {
logger.debug("Skipping integration decryption due to missing token");
return insertCollection;
}

11
packages/old-import/src/import/collections/user-collection.ts
View File

@@ -6,12 +6,19 @@ import { mapAndDecryptUsers } from "../../mappers/map-user";
import type { OldmarrImportUser } from "../../user-schema";
import { createDbInsertCollection } from "./common";
export const createUserInsertCollection = (importUsers: OldmarrImportUser[], encryptionToken: string | null) => {
export const createUserInsertCollection = (
importUsers: OldmarrImportUser[],
encryptionToken: string | null | undefined,
) => {
const insertCollection = createDbInsertCollection(["users", "groups", "groupMembers", "groupPermissions"]);
if (importUsers.length === 0) {
return insertCollection;
}
logger.info(`Preparing users for insert collection count=${importUsers.length}`);
if (encryptionToken === null) {
if (encryptionToken === null || encryptionToken === undefined) {
logger.debug("Skipping user decryption due to missing token");
return insertCollection;
}