@verdaccio/api 6.0.0-6-next.12 → 6.0.0-6-next.16

package/src/v1/token.ts

@@ -1,13 +1,13 @@
 import _ from 'lodash';
-import { HTTP_STATUS, SUPPORT_ERRORS, getInternalError } from '@verdaccio/commons-api';
-import { ErrorCode, stringToMD5, mask } from '@verdaccio/utils';
+import { errorUtils, HTTP_STATUS, SUPPORT_ERRORS } from '@verdaccio/core';
+import { stringToMD5, mask } from '@verdaccio/utils';
 import { getApiToken } from '@verdaccio/auth';
 import { logger } from '@verdaccio/logger';
 import { Response, Router } from 'express';
 
 import { Config, RemoteUser, Token } from '@verdaccio/types';
 import { IAuth } from '@verdaccio/auth';
-import { IStorageHandler } from '@verdaccio/store';
+import { Storage } from '@verdaccio/store';
 import { $RequestExtend, $NextFunctionVer } from '../../types/custom';
 
 export type NormalizeToken = Token & {
@@ -22,12 +22,7 @@ function normalizeToken(token: Token): NormalizeToken {
 }
 
 // https://github.com/npm/npm-profile/blob/latest/lib/index.js
-export default function (
-  route: Router,
-  auth: IAuth,
-  storage: IStorageHandler,
-  config: Config
-): void {
+export default function (route: Router, auth: IAuth, storage: Storage, config: Config): void {
   route.get(
     '/-/npm/v1/tokens',
     async function (req: $RequestExtend, res: Response, next: $NextFunctionVer) {
@@ -48,10 +43,10 @@ export default function (
           });
         } catch (error: any) {
           logger.error({ error: error.msg }, 'token list has failed: @{error}');
-          return next(ErrorCode.getCode(HTTP_STATUS.INTERNAL_ERROR, error.message));
+          return next(errorUtils.getCode(HTTP_STATUS.INTERNAL_ERROR, error.message));
         }
       }
-      return next(ErrorCode.getUnauthorized());
+      return next(errorUtils.getUnauthorized());
     }
   );
 
@@ -62,27 +57,27 @@ export default function (
       const { name } = req.remote_user;
 
       if (!_.isBoolean(readonly) || !_.isArray(cidr_whitelist)) {
-        return next(ErrorCode.getCode(HTTP_STATUS.BAD_DATA, SUPPORT_ERRORS.PARAMETERS_NOT_VALID));
+        return next(errorUtils.getCode(HTTP_STATUS.BAD_DATA, SUPPORT_ERRORS.PARAMETERS_NOT_VALID));
       }
 
       auth.authenticate(name, password, async (err, user: RemoteUser) => {
         if (err) {
           const errorCode = err.message ? HTTP_STATUS.UNAUTHORIZED : HTTP_STATUS.INTERNAL_ERROR;
-          return next(ErrorCode.getCode(errorCode, err.message));
+          return next(errorUtils.getCode(errorCode, err.message));
         }
 
         req.remote_user = user;
 
         if (!_.isFunction(storage.saveToken)) {
           return next(
-            ErrorCode.getCode(HTTP_STATUS.NOT_IMPLEMENTED, SUPPORT_ERRORS.STORAGE_NOT_IMPLEMENT)
+            errorUtils.getCode(HTTP_STATUS.NOT_IMPLEMENTED, SUPPORT_ERRORS.STORAGE_NOT_IMPLEMENT)
           );
         }
 
         try {
           const token = await getApiToken(auth, config, user, password);
           if (!token) {
-            throw getInternalError();
+            throw errorUtils.getInternalError();
           }
 
           const key = stringToMD5(token);
@@ -118,7 +113,7 @@ export default function (
           );
         } catch (error: any) {
           logger.error({ error: error.msg }, 'token creation has failed: @{error}');
-          return next(ErrorCode.getCode(HTTP_STATUS.INTERNAL_ERROR, error.message));
+          return next(errorUtils.getInternalError(error.message));
         }
       });
     }
@@ -140,10 +135,10 @@ export default function (
           return next({});
         } catch (error: any) {
           logger.error({ error: error.msg }, 'token creation has failed: @{error}');
-          return next(ErrorCode.getCode(HTTP_STATUS.INTERNAL_ERROR, error.message));
+          return next(errorUtils.getCode(HTTP_STATUS.INTERNAL_ERROR, error.message));
         }
       }
-      return next(ErrorCode.getUnauthorized());
+      return next(errorUtils.getUnauthorized());
     }
   );
 }

package/src/whoami.ts

@@ -1,7 +1,6 @@
 import { Response, Router } from 'express';
 import buildDebug from 'debug';
 import { $RequestExtend, $NextFunctionVer } from '../types/custom';
-// import { getUnauthorized } from '@verdaccio/commons-api';
 
 const debug = buildDebug('verdaccio:api:user');
 

package/test/integration/_helper.ts

@@ -5,9 +5,10 @@ import bodyParser from 'body-parser';
 
 import { Config, parseConfigFile } from '@verdaccio/config';
 import { Storage } from '@verdaccio/store';
+import { generatePackageMetadata } from '@verdaccio/helper';
 import { final, handleError, errorReportingMiddleware } from '@verdaccio/middleware';
 import { Auth, IAuth } from '@verdaccio/auth';
-import { HEADERS, HEADER_TYPE, HTTP_STATUS, generatePackageMetadata } from '@verdaccio/commons-api';
+import { HEADERS, HEADER_TYPE, HTTP_STATUS } from '@verdaccio/core';
 import apiEndpoints from '../../src';
 
 const getConf = (conf) => {
@@ -42,7 +43,7 @@ export async function initializeServer(configName): Promise<Application> {
   return app;
 }
 
-export function publishVersion(app, configFile, pkgName, version): supertest.Test {
+export function publishVersion(app, _configFile, pkgName, version): supertest.Test {
   const pkgMetadata = generatePackageMetadata(pkgName, version);
 
   return supertest(app)

package/test/integration/package.spec.ts

@@ -1,6 +1,6 @@
 import supertest from 'supertest';
 
-import { HEADER_TYPE, HEADERS, HTTP_STATUS } from '@verdaccio/commons-api';
+import { HEADER_TYPE, HEADERS, HTTP_STATUS } from '@verdaccio/core';
 import { $ResponseExtend, $RequestExtend } from '../../types/custom';
 import { initializeServer, publishTaggedVersion, publishVersion } from './_helper';
 
@@ -64,7 +64,7 @@ describe('package', () => {
     });
   });
 
-  // TODO: investigate the 404
+  // FIXME: investigate the 404
   test.skip('should return a package by dist-tag', async (done) => {
     // await publishVersion(app, 'package.yaml', 'foo3', '1.0.0');
     await publishVersion(app, 'package.yaml', 'foo-tagged', '1.0.0');
@@ -80,7 +80,7 @@ describe('package', () => {
       });
   });
 
-  test.skip('should return 404', async () => {
+  test('should return 404', async () => {
     return supertest(app)
       .get('/404-not-found')
       .set('Accept', HEADERS.JSON)

package/test/integration/ping.spec.ts

@@ -1,6 +1,6 @@
 import supertest from 'supertest';
 
-import { HEADER_TYPE, HEADERS, HTTP_STATUS } from '@verdaccio/commons-api';
+import { HEADER_TYPE, HEADERS, HTTP_STATUS } from '@verdaccio/core';
 import { initializeServer } from './_helper';
 
 describe('ping', () => {

package/test/integration/publish.spec.ts

@@ -1,12 +1,7 @@
-import { HTTP_STATUS } from '@verdaccio/commons-api';
+import { HTTP_STATUS } from '@verdaccio/core';
 import supertest from 'supertest';
-import {
-  API_ERROR,
-  API_MESSAGE,
-  generatePackageMetadata,
-  HEADER_TYPE,
-  HEADERS,
-} from '@verdaccio/commons-api';
+import { API_ERROR, API_MESSAGE, HEADER_TYPE, HEADERS } from '@verdaccio/core';
+import { generatePackageMetadata } from '@verdaccio/helper';
 import { $ResponseExtend, $RequestExtend } from '../../types/custom';
 import { initializeServer, publishVersion } from './_helper';
 

package/test/integration/user.spec.ts

@@ -2,15 +2,13 @@ import supertest from 'supertest';
 import _ from 'lodash';
 
 import {
-  getBadRequest,
-  getConflict,
-  getUnauthorized,
+  errorUtils,
   HEADERS,
   HEADER_TYPE,
   API_MESSAGE,
   HTTP_STATUS,
   API_ERROR,
-} from '@verdaccio/commons-api';
+} from '@verdaccio/core';
 
 import { $RequestExtend, $ResponseExtend } from '../../types/custom';
 import { initializeServer } from './_helper';
@@ -28,7 +26,7 @@ const mockAuthenticate = jest.fn(() => (_name, _password, callback): void => {
 });
 
 const mockAddUser = jest.fn(() => (_name, _password, callback): void => {
-  return callback(getConflict(API_ERROR.USERNAME_ALREADY_REGISTERED));
+  return callback(errorUtils.getConflict(API_ERROR.USERNAME_ALREADY_REGISTERED));
 });
 
 jest.mock('@verdaccio/auth', () => ({
@@ -143,7 +141,7 @@ describe('user', () => {
         }
     );
     mockAddUser.mockImplementationOnce(() => (_name, _password, callback): void => {
-      return callback(getBadRequest(API_ERROR.USERNAME_PASSWORD_REQUIRED));
+      return callback(errorUtils.getBadRequest(API_ERROR.USERNAME_PASSWORD_REQUIRED));
     });
     const credentialsShort = _.cloneDeep(credentials);
     delete credentialsShort.name;
@@ -208,7 +206,7 @@ describe('user', () => {
         }
     );
     mockAuthenticate.mockImplementationOnce(() => (_name, _password, callback): void => {
-      return callback(getUnauthorized(API_ERROR.BAD_USERNAME_PASSWORD));
+      return callback(errorUtils.getUnauthorized(API_ERROR.BAD_USERNAME_PASSWORD));
     });
     const credentialsShort = _.cloneDeep(credentials);
     credentialsShort.password = 'failPassword';
@@ -240,7 +238,7 @@ describe('user', () => {
         }
     );
     mockAuthenticate.mockImplementationOnce(() => (_name, _password, callback): void => {
-      return callback(getUnauthorized(API_ERROR.BAD_USERNAME_PASSWORD));
+      return callback(errorUtils.getUnauthorized(API_ERROR.BAD_USERNAME_PASSWORD));
     });
     const credentialsShort = _.cloneDeep(credentials);
     credentialsShort.password = 'failPassword';

package/test/integration/whoami.spec.ts

@@ -1,6 +1,6 @@
 import supertest from 'supertest';
 
-import { HEADERS, HTTP_STATUS } from '@verdaccio/commons-api';
+import { HEADERS, HTTP_STATUS } from '@verdaccio/core';
 
 import { $RequestExtend, $ResponseExtend } from '../../types/custom';
 import { initializeServer } from './_helper';

package/test/unit/publish.spec.ts

@@ -1,4 +1,4 @@
-import { HTTP_STATUS, API_ERROR } from '@verdaccio/commons-api';
+import { errorUtils, HTTP_STATUS, API_ERROR } from '@verdaccio/core';
 import {
   addVersion,
   uploadPackageTarball,
@@ -183,35 +183,31 @@ describe('Publish endpoints - un-publish package', () => {
     next = jest.fn();
   });
 
-  test('should un-publish package successfully', (done) => {
+  test('should un-publish package successfully', async () => {
     const storage = {
-      removePackage(packageName, cb) {
+      removePackage(packageName) {
         expect(packageName).toEqual(req.params.package);
-        cb();
-        done();
+        return Promise.resolve();
       },
     };
 
     // @ts-ignore
-    unPublishPackage(storage)(req, res, next);
+    await unPublishPackage(storage)(req, res, next);
     expect(res.status).toHaveBeenCalledWith(HTTP_STATUS.CREATED);
     expect(next).toHaveBeenCalledWith({ ok: 'package removed' });
   });
 
-  test('un-publish failed', (done) => {
-    const error = {
-      message: 'un-publish failed',
-    };
+  test('un-publish failed', async () => {
     const storage = {
-      removePackage(packageName, cb) {
-        cb(error);
-        done();
+      removePackage(packageName) {
+        expect(packageName).toEqual(req.params.package);
+        return Promise.reject(errorUtils.getInternalError());
       },
     };
 
     // @ts-ignore
-    unPublishPackage(storage)(req, res, next);
-    expect(next).toHaveBeenCalledWith(error);
+    await unPublishPackage(storage)(req, res, next);
+    expect(next).toHaveBeenCalledWith(errorUtils.getInternalError());
   });
 });
 

package/tsconfig.json

@@ -14,7 +14,7 @@
       "path": "../config"
     },
     {
-      "path": "../core/commons-api"
+      "path": "../core/core"
     },
     {
       "path": "../core/tarball"