Merge pull request #29 from tibber/upgrade-gts-4

Upgrade GTS
tibber · Aug 17, 2022 · 49dc96e · 49dc96e
2 parents b29d6e3 + 093c708
commit 49dc96e
Show file tree

Hide file tree

Showing 16 changed files with 218 additions and 392 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [3.3.1-upgrade-gts-4.1](https://github.com/tibber/tibber-express-utils/compare/v3.3.0...v3.3.1-upgrade-gts-4.1) (2022-08-17)
+
+
+### Bug Fixes
+
+* upgrade gts to avoid got vulnerability ([b29d6e3](https://github.com/tibber/tibber-express-utils/commit/b29d6e3a7152c086a257512c9669b32c6819af42))
+
 # [3.3.0](https://github.com/tibber/tibber-express-utils/compare/v3.2.0...v3.3.0) (2022-08-15)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tibber-express-utils",
-  "version": "3.3.0",
+  "version": "3.3.1-upgrade-gts-4.1",
   "description": "",
   "main": "./dist/src/index.js",
   "scripts": {
@@ -36,7 +36,6 @@
     "conventional-commits": "^1.6.0",
     "cz-conventional-changelog": "^3.3.0",
     "dotenv-cli": "^6.0.0",
-    "eslint": "7.14.0",
     "eslint-plugin-jest": "^26.8.2",
     "eslint-plugin-node": "^11.1.0",
     "express": "^4.18.1",

diff --git a/src/handlers/jsonDelete.ts b/src/handlers/jsonDelete.ts
@@ -8,20 +8,22 @@ import {
   Logger,
 } from '../types';
 
-export const jsonDelete = <TContext>(
-  jsonRouter: JsonRouter<TContext>,
-  _contextSelector: ContextSelector<TContext>,
-  logger?: Logger
-) => <TPayload>(
-  path: PathParams,
-  handler: JsonRequestHandler<TContext, TPayload>
-) =>
-  jsonRouter.delete(
-    path,
-    jsonMiddleware(
-      NoContentIfNoCodeOtherwiseOk,
-      _contextSelector,
-      handler,
-      logger
-    )
-  );
+export const jsonDelete =
+  <TContext>(
+    jsonRouter: JsonRouter<TContext>,
+    _contextSelector: ContextSelector<TContext>,
+    logger?: Logger
+  ) =>
+  <TPayload>(
+    path: PathParams,
+    handler: JsonRequestHandler<TContext, TPayload>
+  ) =>
+    jsonRouter.delete(
+      path,
+      jsonMiddleware(
+        NoContentIfNoCodeOtherwiseOk,
+        _contextSelector,
+        handler,
+        logger
+      )
+    );
diff --git a/src/handlers/jsonGet.ts b/src/handlers/jsonGet.ts
@@ -8,20 +8,22 @@ import {
   Logger,
 } from '../types';
 
-export const jsonGet = <TContext>(
-  jsonRouter: JsonRouter<TContext>,
-  _contextSelector: ContextSelector<TContext>,
-  logger?: Logger
-) => <TPayload>(
-  path: PathParams,
-  handler: JsonRequestHandler<TContext, TPayload>
-) =>
-  jsonRouter.get(
-    path,
-    jsonMiddleware(
-      NotFoundIfNoCodeOtherwiseOk,
-      _contextSelector,
-      handler,
-      logger
-    )
-  );
+export const jsonGet =
+  <TContext>(
+    jsonRouter: JsonRouter<TContext>,
+    _contextSelector: ContextSelector<TContext>,
+    logger?: Logger
+  ) =>
+  <TPayload>(
+    path: PathParams,
+    handler: JsonRequestHandler<TContext, TPayload>
+  ) =>
+    jsonRouter.get(
+      path,
+      jsonMiddleware(
+        NotFoundIfNoCodeOtherwiseOk,
+        _contextSelector,
+        handler,
+        logger
+      )
+    );
diff --git a/src/handlers/jsonPatch.ts b/src/handlers/jsonPatch.ts
@@ -8,20 +8,22 @@ import {
   Logger,
 } from '../types';
 
-export const jsonPatch = <TContext>(
-  jsonRouter: JsonRouter<TContext>,
-  _contextSelector: ContextSelector<TContext>,
-  logger?: Logger
-) => <TPayload>(
-  path: PathParams,
-  handler: JsonRequestHandler<TContext, TPayload>
-) =>
-  jsonRouter.patch(
-    path,
-    jsonMiddleware(
-      NoContentIfNoCodeOtherwiseOk,
-      _contextSelector,
-      handler,
-      logger
-    )
-  );
+export const jsonPatch =
+  <TContext>(
+    jsonRouter: JsonRouter<TContext>,
+    _contextSelector: ContextSelector<TContext>,
+    logger?: Logger
+  ) =>
+  <TPayload>(
+    path: PathParams,
+    handler: JsonRequestHandler<TContext, TPayload>
+  ) =>
+    jsonRouter.patch(
+      path,
+      jsonMiddleware(
+        NoContentIfNoCodeOtherwiseOk,
+        _contextSelector,
+        handler,
+        logger
+      )
+    );
diff --git a/src/handlers/jsonPost.ts b/src/handlers/jsonPost.ts
@@ -8,20 +8,22 @@ import {
   Logger,
 } from '../types';
 
-export const jsonPost = <TContext>(
-  jsonRouter: JsonRouter<TContext>,
-  _contextSelector: ContextSelector<TContext>,
-  logger?: Logger
-) => <TPayload>(
-  path: PathParams,
-  handler: JsonRequestHandler<TContext, TPayload>
-) =>
-  jsonRouter.post(
-    path,
-    jsonMiddleware(
-      NoContentIfNoCodeOtherwiseOk,
-      _contextSelector,
-      handler,
-      logger
-    )
-  );
+export const jsonPost =
+  <TContext>(
+    jsonRouter: JsonRouter<TContext>,
+    _contextSelector: ContextSelector<TContext>,
+    logger?: Logger
+  ) =>
+  <TPayload>(
+    path: PathParams,
+    handler: JsonRequestHandler<TContext, TPayload>
+  ) =>
+    jsonRouter.post(
+      path,
+      jsonMiddleware(
+        NoContentIfNoCodeOtherwiseOk,
+        _contextSelector,
+        handler,
+        logger
+      )
+    );
diff --git a/src/handlers/jsonPut.ts b/src/handlers/jsonPut.ts
@@ -8,20 +8,22 @@ import {
   Logger,
 } from '../types';
 
-export const jsonPut = <TContext>(
-  jsonRouter: JsonRouter<TContext>,
-  _contextSelector: ContextSelector<TContext>,
-  logger?: Logger
-) => <TPayload>(
-  path: PathParams,
-  handler: JsonRequestHandler<TContext, TPayload>
-) =>
-  jsonRouter.put(
-    path,
-    jsonMiddleware(
-      NoContentIfNoCodeOtherwiseOk,
-      _contextSelector,
-      handler,
-      logger
-    )
-  );
+export const jsonPut =
+  <TContext>(
+    jsonRouter: JsonRouter<TContext>,
+    _contextSelector: ContextSelector<TContext>,
+    logger?: Logger
+  ) =>
+  <TPayload>(
+    path: PathParams,
+    handler: JsonRequestHandler<TContext, TPayload>
+  ) =>
+    jsonRouter.put(
+      path,
+      jsonMiddleware(
+        NoContentIfNoCodeOtherwiseOk,
+        _contextSelector,
+        handler,
+        logger
+      )
+    );
diff --git a/src/index.ts b/src/index.ts
@@ -1,5 +1,5 @@
 export * from './HttpResult';
-export * from './jsonRouting';
-export * from './jsonMiddleware';
 export * as Errors from './errors';
+export * from './jsonMiddleware';
+export * from './jsonRouting';
 export * from './types';
diff --git a/src/utils/ContextOf.ts b/src/utils/ContextOf.ts
@@ -4,6 +4,5 @@ import {ContextSelector} from '../types';
  * Given a concrete ContextSelector function, infers the type of the context
  * that it selects.
  */
-export type ContextOf<
-  TContextSelector extends ContextSelector<unknown>
-> = TContextSelector extends ContextSelector<infer U> ? U : never;
+export type ContextOf<TContextSelector extends ContextSelector<unknown>> =
+  TContextSelector extends ContextSelector<infer U> ? U : never;
diff --git a/src/utils/hasOwnProperty.ts b/src/utils/hasOwnProperty.ts
@@ -11,6 +11,6 @@ export const hasOwnProperty = <
 >(
   target: TTarget,
   propertyKey: TPropertyKey
-): target is TTarget & Record<TPropertyKey, unknown> => {
+): target is Record<TPropertyKey, unknown> & TTarget => {
   return Object.prototype.hasOwnProperty.call(target, propertyKey);
 };
diff --git a/test/handlers/jsonDelete.spec.ts b/test/handlers/jsonDelete.spec.ts
@@ -5,26 +5,28 @@ import {JsonRequestHandlerResult} from '../../src';
 import {jsonRouting} from '../../src';
 import {HttpError, ProblemDetailsError} from '../../src/errors';
 
-const run = <TResult, TPayload>(
-  type: 'return' | 'throw',
-  result: JsonRequestHandlerResult<TResult>,
-  expectCode: number,
-  expectPayload: TPayload
-) => async () => {
-  const router = Router({});
-  const jsonRouter = jsonRouting({expressRouter: router});
+const run =
+  <TResult, TPayload>(
+    type: 'return' | 'throw',
+    result: JsonRequestHandlerResult<TResult>,
+    expectCode: number,
+    expectPayload: TPayload
+  ) =>
+  async () => {
+    const router = Router({});
+    const jsonRouter = jsonRouting({expressRouter: router});
 
-  jsonRouter.jsonDelete('/test', () => {
-    if (type === 'throw') throw result;
-    return result;
-  });
+    jsonRouter.jsonDelete('/test', () => {
+      if (type === 'throw') throw result;
+      return result;
+    });
 
-  const app = express();
-  app.use(jsonRouter);
+    const app = express();
+    app.use(jsonRouter);
 
-  const response = await request(app).delete('/test').expect(expectCode);
-  expect(response.body).toStrictEqual(expectPayload);
-};
+    const response = await request(app).delete('/test').expect(expectCode);
+    expect(response.body).toStrictEqual(expectPayload);
+  };
 
 describe('jsonDelete', () => {
   it(

diff --git a/test/handlers/jsonGet.spec.ts b/test/handlers/jsonGet.spec.ts
@@ -13,29 +13,31 @@ class TestLogger {
   }
 }
 
-const run = <TResult, TPayload>(
-  type: 'return' | 'throw',
-  result: JsonRequestHandlerResult<TResult>,
-  expectCode: number,
-  expectPayload: TPayload,
-  expectLogMsg?: string
-) => async () => {
-  const router = Router({});
-  const logger = new TestLogger();
-  const jsonRouter = jsonRouting({expressRouter: router, logger});
+const run =
+  <TResult, TPayload>(
+    type: 'return' | 'throw',
+    result: JsonRequestHandlerResult<TResult>,
+    expectCode: number,
+    expectPayload: TPayload,
+    expectLogMsg?: string
+  ) =>
+  async () => {
+    const router = Router({});
+    const logger = new TestLogger();
+    const jsonRouter = jsonRouting({expressRouter: router, logger});
 
-  jsonRouter.jsonGet('/test', () => {
-    if (type === 'throw') throw result;
-    return result;
-  });
+    jsonRouter.jsonGet('/test', () => {
+      if (type === 'throw') throw result;
+      return result;
+    });
 
-  const app = express();
-  app.use(jsonRouter);
+    const app = express();
+    app.use(jsonRouter);
 
-  const response = await request(app).get('/test').expect(expectCode);
-  expect(response.body).toStrictEqual(expectPayload);
-  expect(logger.lastError).toBe(expectLogMsg);
-};
+    const response = await request(app).get('/test').expect(expectCode);
+    expect(response.body).toStrictEqual(expectPayload);
+    expect(logger.lastError).toBe(expectLogMsg);
+  };
 
 describe('jsonGet', () => {
   it(

diff --git a/test/handlers/jsonPatch.spec.ts b/test/handlers/jsonPatch.spec.ts
@@ -5,26 +5,28 @@ import {JsonRequestHandlerResult} from '../../src';
 import {jsonRouting} from '../../src';
 import {HttpError, ProblemDetailsError} from '../../src/errors';
 
-const run = <TResult, TPayload>(
-  type: 'return' | 'throw',
-  result: JsonRequestHandlerResult<TResult>,
-  expectCode: number,
-  expectPayload: TPayload
-) => async () => {
-  const router = Router({});
-  const jsonRouter = jsonRouting({expressRouter: router});
+const run =
+  <TResult, TPayload>(
+    type: 'return' | 'throw',
+    result: JsonRequestHandlerResult<TResult>,
+    expectCode: number,
+    expectPayload: TPayload
+  ) =>
+  async () => {
+    const router = Router({});
+    const jsonRouter = jsonRouting({expressRouter: router});
 
-  jsonRouter.jsonPatch('/test', () => {
-    if (type === 'throw') throw result;
-    return result;
-  });
+    jsonRouter.jsonPatch('/test', () => {
+      if (type === 'throw') throw result;
+      return result;
+    });
 
-  const app = express();
-  app.use(jsonRouter);
+    const app = express();
+    app.use(jsonRouter);
 
-  const response = await request(app).patch('/test').expect(expectCode);
-  expect(response.body).toStrictEqual(expectPayload);
-};
+    const response = await request(app).patch('/test').expect(expectCode);
+    expect(response.body).toStrictEqual(expectPayload);
+  };
 
 describe('jsonPatch', () => {
   it(