Skip to content

Commit

Permalink
migrate to forceMigrateToSecureLegacySignature
Browse files Browse the repository at this point in the history
update dependencies
  • Loading branch information
juanpicado committed May 12, 2024
1 parent 306da4a commit c1ab73c
Show file tree
Hide file tree
Showing 14 changed files with 943 additions and 1,012 deletions.
66 changes: 33 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@
"url": "https://opencollective.com/verdaccio"
},
"dependencies": {
"@verdaccio/auth": "7.0.0-next-7.13",
"@verdaccio/config": "7.0.0-next-7.13",
"@verdaccio/core": "7.0.0-next-7.13",
"@verdaccio/hooks": "7.0.0-next-7.13",
"@verdaccio/loaders": "7.0.0-next-7.13",
"@verdaccio/auth": "7.0.0-next-7.15",
"@verdaccio/config": "7.0.0-next-7.15",
"@verdaccio/core": "7.0.0-next-7.15",
"@verdaccio/hooks": "7.0.0-next-7.15",
"@verdaccio/loaders": "7.0.0-next-7.15",
"@verdaccio/local-storage": "10.3.4",
"@verdaccio/logger": "7.0.0-next-7.13",
"@verdaccio/middleware": "7.0.0-next-7.13",
"@verdaccio/proxy": "7.0.0-next-7.13",
"@verdaccio/search": "7.0.0-next-7.2",
"@verdaccio/signature": "7.0.0-next.3",
"@verdaccio/logger": "7.0.0-next-7.15",
"@verdaccio/middleware": "7.0.0-next-7.15",
"@verdaccio/proxy": "7.0.0-next-7.15",
"@verdaccio/search": "7.0.0-next-7.4",
"@verdaccio/signature": "7.0.0-next-7.5",
"@verdaccio/streams": "10.2.1",
"@verdaccio/tarball": "12.0.0-next-7.13",
"@verdaccio/ui-theme": "7.0.0-next-7.13",
"@verdaccio/url": "12.0.0-next-7.13",
"@verdaccio/utils": "7.0.0-next-7.13",
"@verdaccio/tarball": "12.0.0-next-7.15",
"@verdaccio/ui-theme": "3.4.1",
"@verdaccio/url": "12.0.0-next-7.15",
"@verdaccio/utils": "7.0.0-next-7.15",
"async": "3.2.5",
"clipanion": "3.2.1",
"compression": "1.7.4",
Expand All @@ -53,32 +53,32 @@
"mkdirp": "1.0.4",
"mv": "2.1.1",
"pkginfo": "0.4.1",
"semver": "7.6.0",
"validator": "13.11.0",
"verdaccio-audit": "12.0.0-next-7.13",
"verdaccio-htpasswd": "12.0.0-next-7.13"
"semver": "7.6.2",
"validator": "13.12.0",
"verdaccio-audit": "12.0.0-next-7.15",
"verdaccio-htpasswd": "12.0.0-next-7.15"
},
"devDependencies": {
"@babel/cli": "7.23.4",
"@babel/core": "7.23.7",
"@babel/eslint-parser": "7.23.3",
"@babel/node": "7.22.19",
"@babel/cli": "7.24.5",
"@babel/core": "7.24.5",
"@babel/eslint-parser": "7.24.5",
"@babel/node": "7.23.9",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/plugin-syntax-dynamic-import": "7.8.3",
"@babel/polyfill": "^7.12.1",
"@babel/preset-env": "7.23.8",
"@babel/preset-typescript": "7.23.3",
"@babel/preset-env": "7.24.5",
"@babel/preset-typescript": "7.24.1",
"@babel/register": "7.23.7",
"@babel/runtime": "7.23.8",
"@octokit/rest": "20.0.2",
"@babel/runtime": "7.24.5",
"@octokit/rest": "20.1.1",
"@trivago/prettier-plugin-sort-imports": "4.3.0",
"@types/async": "3.2.24",
"@types/express": "4.17.21",
"@types/express-serve-static-core": "4.17.42",
"@types/express-serve-static-core": "4.19.0",
"@types/http-errors": "2.0.4",
"@types/jest": "29.5.11",
"@types/lodash": "4.14.202",
"@types/mime": "3.0.4",
"@types/jest": "29.5.12",
"@types/lodash": "4.17.1",
"@types/mime": "3.0.0",
"@types/minimatch": "5.1.2",
"@types/node": "20.11.7",
"@types/semver": "7.5.6",
Expand Down Expand Up @@ -109,13 +109,13 @@
"lockfile-lint": "4.13.2",
"mockdate": "3.0.5",
"nock": "13.5.0",
"prettier": "3.2.4",
"rimraf": "5.0.5",
"prettier": "3.2.5",
"rimraf": "5.0.7",
"selfsigned": "2.4.1",
"standard-version": "9.5.0",
"supertest": "6.3.4",
"ts-node": "10.9.2",
"typescript": "5.3.3",
"typescript": "5.4.5",
"verdaccio-auth-memory": "10.2.2",
"verdaccio-memory": "10.3.2"
},
Expand Down
5 changes: 1 addition & 4 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
export { parseConfigFile } from './lib/utils';
export { ConfigBuilder, parseConfigFile, findConfigFile } from '@verdaccio/config';
export { startVerdaccio as default, startVerdaccio } from './lib/bootstrap';
// Similar structure as v6 but with different functions
// this is a bridge for easy migration to v6
export { runServer } from './lib/run-server';
export { ConfigBuilder } from '@verdaccio/config';
3 changes: 1 addition & 2 deletions src/lib/cli/commands/init.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { Command, Option } from 'clipanion';
import path from 'path';

import { findConfigFile, parseConfigFile } from '@verdaccio/config';
import { warningUtils } from '@verdaccio/core';
import { ConfigYaml } from '@verdaccio/types';

import { listenDefaultCallback, startVerdaccio } from '../../bootstrap';
import findConfigFile from '../../config-path';
import { parseConfigFile } from '../../utils';

require('pkginfo')(module);
const pkgVersion = module.exports.version;
Expand Down
135 changes: 0 additions & 135 deletions src/lib/config-path.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/lib/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Config as ConfigCore } from '@verdaccio/config';
class Config extends ConfigCore {
public constructor(config: any) {
config.configPath = config.self_path;
super(config, { forceEnhancedLegacySignature: false });
super(config, { forceMigrateToSecureLegacySignature: true });
}
}

Expand Down
3 changes: 1 addition & 2 deletions src/lib/run-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@ import https from 'https';
import _, { assign } from 'lodash';
import path from 'path';

import { findConfigFile, parseConfigFile } from '@verdaccio/config';
import { Config, HttpsConfKeyCert, HttpsConfPfx } from '@verdaccio/types';

import endPointAPI from '../api/index';
import { getListListenAddresses } from './cli/utils';
import findConfigFile from './config-path';
import { API_ERROR } from './constants';
import { parseConfigFile } from './utils';

const debug = buildDebug('verdaccio');

Expand Down
3 changes: 1 addition & 2 deletions src/lib/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import semver from 'semver';
import { URL } from 'url';
import validator from 'validator';

import { parseConfigFile } from '@verdaccio/config';
// eslint-disable-next-line max-len
import { errorUtils, validatioUtils } from '@verdaccio/core';
import { StringValue } from '@verdaccio/types';
Expand Down Expand Up @@ -472,4 +471,4 @@ export function hasLogin(config: Config) {
return _.isNil(config?.web?.login) || config?.web?.login === true;
}

export { buildTokenUtil as buildToken, parseConfigFile };
export { buildTokenUtil as buildToken };
2 changes: 1 addition & 1 deletion test/unit/modules/bootstrap/legacy.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { join } from 'path';

import startVerdaccioDeault, { startVerdaccio } from '../../../../src';
import { parseConfigFile } from '../../../../src/lib/utils';
import { parseConfigFile } from '@verdaccio/config';

describe('bootstrap legacy', () => {
describe('startVerdaccio', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/modules/bootstrap/run-server.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { join } from 'path';

import { runServer } from '../../../../src';
import { parseConfigFile } from '../../../../src/lib/utils';
import { parseConfigFile } from '@verdaccio/config';

describe('bootstrap modern', () => {
describe('runServer', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/modules/cli/cli.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import startServer from '../../../../src';
import { getListListenAddresses } from '../../../../src/lib/cli/utils';
import { DEFAULT_DOMAIN, DEFAULT_PORT, DEFAULT_PROTOCOL } from '../../../../src/lib/constants';
import { setup } from '../../../../src/lib/logger';
import { parseConfigFile } from '../../../../src/lib/utils';
import { parseConfigFile } from '@verdaccio/config';
import config from '../../partials/config';

setup([]);
Expand Down
4 changes: 2 additions & 2 deletions test/unit/modules/config/config.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import path from 'path';
import Config from '../../../../src/lib/config';
import { DEFAULT_REGISTRY, DEFAULT_UPLINK, ROLES, WEB_TITLE } from '../../../../src/lib/constants';
import { setup } from '../../../../src/lib/logger';
import { parseConfigFile } from '../../../../src/lib/utils';
import { parseConfigFile } from '@verdaccio/config';

setup([]);

Expand Down Expand Up @@ -61,7 +61,7 @@ const checkDefaultConfPackages = (config) => {
expect(config.url_prefix).toBeUndefined();
expect(config.url_prefix).toBeUndefined();
expect(config.security).toEqual({
api: { legacy: true },
api: { legacy: true, "migrateToSecureLegacySignature": true },
web: { sign: { expiresIn: '1h' }, verify: {} },
});
};
Expand Down
2 changes: 1 addition & 1 deletion test/unit/modules/utils/api.__test.template.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import request from 'supertest';

import endPointAPI from '../../../../src/api/index';
import { setup } from '../../../../src/lib/logger';
import { parseConfigFile } from '../../../../src/lib/utils';
import { parseConfigFile } from '@verdaccio/config';
import { DOMAIN_SERVERS } from '../../../functional/config.functional';
import { parseConfigurationFile } from '../../__helper';
import { addUser } from '../../__helper/api';
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"rootDir": "./src",
"outDir": "./build",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"esModuleInterop": true
},
"exclude": ["node_modules", "**/*.spec.ts"],
"include": ["src/**/*.ts", "types/*.d.ts"],
"include": ["src/**/*.ts", "types/*.d.ts"]
}

0 comments on commit c1ab73c

Please sign in to comment.