@verdaccio/api 8.1.0-next-8.3 → 8.1.0-next-8.5

package/src/v1/search.ts

@@ -3,9 +3,9 @@ import _ from 'lodash';
 
 import { Auth } from '@verdaccio/auth';
 import { HTTP_STATUS, searchUtils } from '@verdaccio/core';
-import { logger } from '@verdaccio/logger';
 import { Storage } from '@verdaccio/store';
 import { Manifest } from '@verdaccio/types';
+import { Logger } from '@verdaccio/types';
 
 const debug = buildDebug('verdaccio:api:search');
 
@@ -15,7 +15,7 @@ const debug = buildDebug('verdaccio:api:search');
  *  - {"objects":[],"total":0,"time":"Sun Jul 25 2021 14:09:11 GMT+0000 (Coordinated Universal Time)"}
  * req: 'GET /-/v1/search?text=react&size=20&frpom=0&quality=0.65&popularity=0.98&maintenance=0.5'
  */
-export default function (route, auth: Auth, storage: Storage): void {
+export default function (route, auth: Auth, storage: Storage, logger: Logger): void {
   function checkAccess(pkg: any, auth: any, remoteUser): Promise<Manifest | null> {
     return new Promise((resolve, reject) => {
       auth.allow_access({ packageName: pkg?.package?.name }, remoteUser, function (err, allowed) {

package/src/v1/token.ts

@@ -4,10 +4,10 @@ import _ from 'lodash';
 import { getApiToken } from '@verdaccio/auth';
 import { Auth } from '@verdaccio/auth';
 import { HEADERS, HTTP_STATUS, SUPPORT_ERRORS, errorUtils } from '@verdaccio/core';
-import { logger } from '@verdaccio/logger';
 import { rateLimit } from '@verdaccio/middleware';
 import { Storage } from '@verdaccio/store';
 import { Config, RemoteUser, Token } from '@verdaccio/types';
+import { Logger } from '@verdaccio/types';
 import { mask, stringToMD5 } from '@verdaccio/utils';
 
 import { $NextFunctionVer, $RequestExtend } from '../../types/custom';
@@ -24,7 +24,13 @@ function normalizeToken(token: Token): NormalizeToken {
 }
 
 // https://github.com/npm/npm-profile/blob/latest/lib/index.js
-export default function (route: Router, auth: Auth, storage: Storage, config: Config): void {
+export default function (
+  route: Router,
+  auth: Auth,
+  storage: Storage,
+  config: Config,
+  logger: Logger
+): void {
   route.get(
     '/-/npm/v1/tokens',
     rateLimit(config?.userRateLimit),

package/test/integration/distTag.spec.ts

@@ -2,9 +2,12 @@ import supertest from 'supertest';
 import { beforeEach, describe, expect, test } from 'vitest';
 
 import { API_MESSAGE, HEADERS, HEADER_TYPE, HTTP_STATUS } from '@verdaccio/core';
+import { setup } from '@verdaccio/logger';
 
 import { getDisTags, initializeServer, publishVersion } from './_helper';
 
+setup({});
+
 describe('package', () => {
   let app;
   beforeEach(async () => {

package/test/integration/package.spec.ts

@@ -31,12 +31,13 @@ describe('package', () => {
       ['@scope/foo2', 'foo2-1.0.0.tgz'],
     ])('should fails if tarball does not exist', async (pkg, fileName) => {
       await publishVersion(app, pkg, '1.0.1');
-      return await supertest(app)
+      await supertest(app)
         .get(`/${pkg}/-/${fileName}`)
         .set(HEADERS.ACCEPT, HEADERS.JSON)
         .expect(HEADER_TYPE.CONTENT_TYPE, HEADERS.OCTET_STREAM)
         .expect(HTTP_STATUS.NOT_FOUND);
     });
+
     test.todo('check content length file header');
     test.todo('fails on file was aborted');
   });
@@ -97,8 +98,8 @@ describe('package', () => {
         expect(response.body.time).toBeDefined();
         expect(response.body.modified).toBeDefined();
         expect(response.body[DIST_TAGS]).toEqual({ latest: '1.0.0' });
-        expect(response.body.readme).not.toBeDefined();
-        expect(response.body._rev).not.toBeDefined();
+        expect(response.body.readme).toBeDefined();
+        expect(response.body._rev).toBeDefined();
         expect(response.body.users).not.toBeDefined();
       }
     );

package/test/integration/publish.spec.ts

@@ -57,7 +57,7 @@ describe('publish', () => {
       async (pkgName) => {
         const app = await initializeServer('publish.yaml');
         await publishVersion(app, pkgName, '1.0.0');
-        return new Promise((resolve) => {
+        new Promise((resolve) => {
           publishVersion(app, pkgName, '1.0.0')
             .expect(HTTP_STATUS.CONFLICT)
             .then((response) => {
@@ -73,7 +73,7 @@ describe('publish', () => {
     describe('no proxies setup', () => {
       test.each([['foo', '@scope/foo']])('should publish a package', async (pkgName) => {
         const app = await initializeServer('publish.yaml');
-        return new Promise((resolve) => {
+        new Promise((resolve) => {
           publishVersion(app, pkgName, '1.0.0')
             .expect(HTTP_STATUS.CREATED)
             .then((response) => {
@@ -86,7 +86,7 @@ describe('publish', () => {
       test.each([['foo', '@scope/foo']])('should publish a new package', async (pkgName) => {
         const pkgMetadata = generatePackageMetadata(pkgName, '1.0.0');
         const app = await initializeServer('publish.yaml');
-        return new Promise((resolve) => {
+        new Promise((resolve) => {
           supertest(app)
             .put(`/${encodeURIComponent(pkgName)}`)
             .set(HEADER_TYPE.CONTENT_TYPE, HEADERS.JSON)

package/test/integration/star.spec.ts

@@ -65,7 +65,7 @@ describe('star', () => {
     const app = await initializeServer('star.yaml');
     const token = await getNewToken(app, { name: userLogged, password: 'secretPass' });
     await publishVersion(app, pkgName, '1.0.0', undefined, token).expect(HTTP_STATUS.CREATED);
-    return supertest(app)
+    await supertest(app)
       .get(`/-/_view/starredByUser?key_xxxxx=other`)
       .set('Accept', HEADERS.JSON)
       .expect(HEADER_TYPE.CONTENT_TYPE, HEADERS.JSON_CHARSET)