Skip to content
Merged
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
4 changes: 4 additions & 0 deletions packages/insomnia/src/common/__tests__/import.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ import { describe, expect, it } from 'vitest';
import { project, request, requestGroup, workspace } from '../../models';
import * as importUtil from '../import';

/*
@vitest-environment jsdom
*/

describe('isApiSpecImport()', () => {
it.each(['swagger2', 'openapi3'])(
'should return true if spec id is %o',
Expand Down
24 changes: 17 additions & 7 deletions packages/insomnia/src/common/import.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { type ApiSpec, isApiSpec } from '../models/api-spec';
import { type CookieJar, isCookieJar } from '../models/cookie-jar';
import { type BaseEnvironment, type Environment, isEnvironment } from '../models/environment';
import { type GrpcRequest, isGrpcRequest } from '../models/grpc-request';
import { type BaseModel, getModel } from '../models/index';
import { type BaseModel, getModel, userSession } from '../models/index';
import * as models from '../models/index';
import { isMockRoute, type MockRoute } from '../models/mock-route';
import { isRequest, type Request } from '../models/request';
Expand All @@ -16,6 +16,7 @@ import {
type WebSocketRequest,
} from '../models/websocket-request';
import { isWorkspace, type Workspace } from '../models/workspace';
import type { CurrentPlan } from '../ui/routes/organization';
import { convert, convertPostmanDataDump, type InsomniaImporter } from '../utils/importers/convert';
import { id as postmanEnvImporterId } from '../utils/importers/importers/postman-env';
import { invariant } from '../utils/invariant';
Expand Down Expand Up @@ -228,18 +229,25 @@ export async function importResourcesToProject({ projectId }: { projectId: strin
await db.flushChanges(bufferId);
return { resources: r.flat() };
}
const isTeamOrAbove = async () => {
const { accountId } = await userSession.getOrCreate();
const currentPlan = JSON.parse(localStorage.getItem(`${accountId}:currentPlan`) || '{}') as CurrentPlan || {};
return ['team', 'enterprise', 'enterprise-member'].includes(currentPlan?.type);
};
const updateIdsInString = (str: string, ResourceIdMap: Map<string, string>) => {
let newString = str;
for (const [idA, idB] of ResourceIdMap.entries()) {
newString = newString.replace(new RegExp(idA, 'g'), idB);
}
return newString;
};

const importRequestWithNewIds = (request: Request, ResourceIdMap: Map<string, string>) => {
const newRequestWithIdsUpdated = JSON.parse(updateIdsInString(JSON.stringify(request), ResourceIdMap));
const importRequestWithNewIds = (request: Request, ResourceIdMap: Map<string, string>, canTransform: boolean) => {
let transformedRequest = request;
if (canTransform) { // if not logged in, this wont run
transformedRequest = JSON.parse(updateIdsInString(JSON.stringify(request), ResourceIdMap));
}
return ({
...newRequestWithIdsUpdated,
...transformedRequest,
_id: ResourceIdMap.get(request._id),
parentId: ResourceIdMap.get(request.parentId),
});
Expand Down Expand Up @@ -292,6 +300,7 @@ export const importResourcesToWorkspace = async ({ workspaceId }: { workspaceId:
model && ResourceIdMap.set(resource._id, generateId(model.prefix));
}

const canTransform = await isTeamOrAbove();
// Preserve optionalResource relationships
for (const resource of optionalResources) {
const model = getModel(resource.type);
Expand All @@ -314,7 +323,7 @@ export const importResourcesToWorkspace = async ({ workspaceId }: { workspaceId:
parentId: ResourceIdMap.get(resource.parentId),
});
} else if (isRequest(resource)) {
await db.docCreate(model.type, importRequestWithNewIds(resource, ResourceIdMap));
await db.docCreate(model.type, importRequestWithNewIds(resource, ResourceIdMap, canTransform));
} else {
await db.docCreate(model.type, {
...resource,
Expand Down Expand Up @@ -398,6 +407,7 @@ const importResourcesToNewWorkspace = async (projectId: string, workspaceToImpor
model && ResourceIdMap.set(resource._id, generateId(model.prefix));
}

const canTransform = await isTeamOrAbove();
for (const resource of resourcesWithoutWorkspaceAndApiSpec) {
const model = getModel(resource.type);

Expand All @@ -417,7 +427,7 @@ const importResourcesToNewWorkspace = async (projectId: string, workspaceToImpor
parentId: ResourceIdMap.get(resource.parentId),
});
} else if (isRequest(resource)) {
await db.docCreate(model.type, importRequestWithNewIds(resource, ResourceIdMap));
await db.docCreate(model.type, importRequestWithNewIds(resource, ResourceIdMap, canTransform));
} else {
await db.docCreate(model.type, {
...resource,
Expand Down
2 changes: 1 addition & 1 deletion packages/insomnia/src/ui/routes/organization.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const formatCurrentPlanType = (type: PersonalPlanType) => {
};
type PaymentSchedules = 'month' | 'year';

interface CurrentPlan {
export interface CurrentPlan {
isActive: boolean;
period: PaymentSchedules;
planId: string;
Expand Down