Skip to content
Merged
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
38 changes: 7 additions & 31 deletions packages/oc/src/registry/routes/helpers/get-component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,7 @@ import emptyResponseHandler from 'oc-empty-response-handler';
import { fromPromise } from 'universalify';
import strings from '../../../resources';
import settings from '../../../resources/settings';
import type {
Component,
Config,
PluginContext,
Plugins,
Template
} from '../../../types';
import type { Component, Config, PluginContext, Plugins } from '../../../types';
import isTemplateLegacy from '../../../utils/is-template-legacy';
import eventsHandler from '../../domain/events-handler';
import NestedRenderer from '../../domain/nested-renderer';
Expand Down Expand Up @@ -203,6 +197,9 @@ export default function getComponent(conf: Config, repository: Repository) {

let componentCallbackDone = false;
const conf = options.conf;
const customHeadersToSkipSet = conf.customHeadersToSkipOnWeakVersion?.length
? new Set(conf.customHeadersToSkipOnWeakVersion)
: undefined;
const acceptLanguage = getLanguage();
const requestedComponent = {
name: options.name,
Expand Down Expand Up @@ -315,7 +312,8 @@ export default function getComponent(conf: Config, repository: Repository) {
templateType = `oc-template-${templateType}`;
}

if (!repository.getTemplate(templateType)) {
const ocTemplate = repository.getTemplate(templateType);
if (!ocTemplate) {
return callback({
status: 400,
response: {
Expand All @@ -326,11 +324,6 @@ export default function getComponent(conf: Config, repository: Repository) {
});
}

const customHeadersToSkip = conf.customHeadersToSkipOnWeakVersion;
const customHeadersToSkipSet = customHeadersToSkip?.length
? new Set(customHeadersToSkip)
: undefined;

const filterCustomHeaders = (
headers: Record<string, string>,
requestedVersion: string,
Expand Down Expand Up @@ -551,23 +544,6 @@ export default function getComponent(conf: Config, repository: Repository) {
component.name,
component.version,
(_err, templateText) => {
let ocTemplate: Template;

try {
ocTemplate = repository.getTemplate(templateType);
} catch {
return callback({
status: 400,
response: {
code: 'TEMPLATE_NOT_SUPPORTED',
error:
strings.errors.registry.TEMPLATE_NOT_SUPPORTED(
templateType
)
}
});
}

const template = ocTemplate.getCompiledTemplate(
templateText,
key
Expand All @@ -581,7 +557,7 @@ export default function getComponent(conf: Config, repository: Repository) {
};
const staticPath = repository
.getStaticFilePath(component.name, component.version, '')
.replace('https:', '');
.replace(/^https:/, '');

if (!component.oc.files.dataProvider) {
const { __oc_Retry, ...props } = params;
Expand Down
Loading