@miqro/core 1.3.9 → 1.3.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (48) hide show
  1. package/dist/handler/common/context.d.ts +2 -10
  2. package/dist/handler/common/context.js +4 -4
  3. package/dist/handler/common/context.js.map +1 -1
  4. package/dist/handler/middleware/cookie.js +2 -2
  5. package/dist/handler/middleware/cookie.js.map +1 -1
  6. package/dist/util/index.js +0 -2
  7. package/dist/util/index.js.map +1 -1
  8. package/dist/util/session/service.js +2 -2
  9. package/dist/util/session/service.js.map +1 -1
  10. package/package.json +8 -2
  11. package/src/handler/common/context.ts +5 -14
  12. package/src/handler/middleware/cookie.ts +12 -12
  13. package/src/util/index.ts +0 -2
  14. package/src/util/session/service.ts +126 -126
  15. package/dist/util/cookie/cookie.d.ts +0 -50
  16. package/dist/util/cookie/cookie.js +0 -168
  17. package/dist/util/cookie/cookie.js.map +0 -1
  18. package/dist/util/cookie/index.d.ts +0 -16
  19. package/dist/util/cookie/index.js +0 -9
  20. package/dist/util/cookie/index.js.map +0 -1
  21. package/dist/util/uuid/index.d.ts +0 -7
  22. package/dist/util/uuid/index.js +0 -8
  23. package/dist/util/uuid/index.js.map +0 -1
  24. package/dist/util/uuid/regex.d.ts +0 -2
  25. package/dist/util/uuid/regex.js +0 -5
  26. package/dist/util/uuid/regex.js.map +0 -1
  27. package/dist/util/uuid/rng.d.ts +0 -1
  28. package/dist/util/uuid/rng.js +0 -18
  29. package/dist/util/uuid/rng.js.map +0 -1
  30. package/dist/util/uuid/stringify.d.ts +0 -2
  31. package/dist/util/uuid/stringify.js +0 -50
  32. package/dist/util/uuid/stringify.js.map +0 -1
  33. package/dist/util/uuid/v4.d.ts +0 -5
  34. package/dist/util/uuid/v4.js +0 -27
  35. package/dist/util/uuid/v4.js.map +0 -1
  36. package/dist/util/uuid/validate.d.ts +0 -2
  37. package/dist/util/uuid/validate.js +0 -12
  38. package/dist/util/uuid/validate.js.map +0 -1
  39. package/src/util/cookie/cookie.ts +0 -207
  40. package/src/util/cookie/index.ts +0 -6
  41. package/src/util/uuid/index.ts +0 -5
  42. package/src/util/uuid/regex.ts +0 -2
  43. package/src/util/uuid/rng.ts +0 -14
  44. package/src/util/uuid/stringify.ts +0 -53
  45. package/src/util/uuid/v4.ts +0 -30
  46. package/src/util/uuid/validate.ts +0 -8
  47. package/test.md +0 -0
  48. package/tsconfig-test.json +0 -13
@@ -3,6 +3,7 @@ import { Logger } from "../../util/logger";
3
3
  import { Session } from "../../util/session";
4
4
  import { IncomingHttpHeaders, IncomingMessage, OutgoingHttpHeaders, ServerResponse } from "http";
5
5
  import { URL } from "url";
6
+ import { CookieSerializeOptions } from "cookie";
6
7
  export declare type Method = "get" | "post" | "put" | "delete" | "patch" | "options" | "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS";
7
8
  export declare type Handler<T = boolean | void | any> = ((ctx: Context) => Promise<T>) | ((ctx: Context) => T);
8
9
  export declare type ErrorHandler<T = boolean | void | any> = ((e: unknown, ctx: Context) => Promise<T>) | ((e: unknown, ctx: Context) => T);
@@ -35,16 +36,7 @@ export declare class Context {
35
36
  close(): Promise<void>;
36
37
  addVaryHeader(value: number | string | ReadonlyArray<string>): ServerResponse;
37
38
  setHeader(name: string, value: number | string | ReadonlyArray<string>): ServerResponse;
38
- setCookie(name: string, value: string, options?: {
39
- encode?: (uriComponent: string | number | boolean) => string;
40
- maxAge?: number | null;
41
- domain?: string;
42
- httpOnly?: boolean;
43
- secure?: boolean;
44
- path?: string;
45
- expires?: Date;
46
- sameSite?: "lax" | "strict" | "none" | true;
47
- }): ServerResponse;
39
+ setCookie(name: string, value: string, options?: CookieSerializeOptions): ServerResponse;
48
40
  end({ status, headers, body }: {
49
41
  body?: any;
50
42
  status: number;
@@ -5,8 +5,8 @@ const logger_1 = require("../../util/logger");
5
5
  const tokenize_match_1 = require("./tokenize-match");
6
6
  const formatter_1 = require("../../util/logger/formatter");
7
7
  const helpers_1 = require("./helpers");
8
- const uuid_1 = require("../../util/uuid");
9
- const cookie_1 = require("../../util/cookie");
8
+ const uuid_1 = require("uuid");
9
+ const cookie_1 = require("cookie");
10
10
  class Context {
11
11
  constructor(req, res, logger) {
12
12
  this.req = req;
@@ -24,7 +24,7 @@ class Context {
24
24
  this.cookies = {}; // a middleware will fill
25
25
  this.headers = req.headers;
26
26
  this.startMS = Date.now();
27
- this.uuid = uuid_1.UUID.v4().toString("utf-8");
27
+ this.uuid = (0, uuid_1.v4)().toString();
28
28
  this.results = []; // handlers will fill this
29
29
  const pathToEnv = this.path.replace(/\//ig, "_").toUpperCase();
30
30
  const identifier = `${pathToEnv === "_" ? "" : pathToEnv.substring(1)}${this.method.toUpperCase()}`;
@@ -57,7 +57,7 @@ class Context {
57
57
  return this.res.setHeader(name, value);
58
58
  }
59
59
  setCookie(name, value, options) {
60
- return this.setHeader('Set-Cookie', cookie_1.COOKIE.serialize(name, String(value), options));
60
+ return this.setHeader('Set-Cookie', (0, cookie_1.serialize)(name, String(value), options));
61
61
  }
62
62
  async end({ status, headers, body }) {
63
63
  return new Promise((resolve, reject) => {
@@ -1 +1 @@
1
- {"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/handler/common/context.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/handler/common/context.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.CookieParser = void 0;
4
- const cookie_1 = require("../../util/cookie");
4
+ const cookie_1 = require("cookie");
5
5
  const CookieParser = (options) => {
6
6
  return async (ctx) => {
7
- const cookies = cookie_1.COOKIE.parse(ctx.headers.cookie || '', options);
7
+ const cookies = (0, cookie_1.parse)(ctx.headers.cookie || '', options);
8
8
  const cookieList = Object.keys(cookies);
9
9
  for (const name of cookieList) {
10
10
  const value = cookies[name];
@@ -1 +1 @@
1
- {"version":3,"file":"cookie.js","sourceRoot":"","sources":["../../../src/handler/middleware/cookie.ts"],"names":[],"mappings":";;;AAEA,8CAA2C;AAEpC,MAAM,YAAY,GAAG,CAAC,OAE5B,EAAiB,EAAE;IAChB,OAAO,KAAK,EAAE,GAAY,EAAiB,EAAE;QACzC,MAAM,OAAO,GAAG,eAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;YAC3B,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;YAC5B,IAAI,KAAK,EAAE;gBACP,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;aAC7B;SACJ;IACL,CAAC,CAAC;AACN,CAAC,CAAA;AAbY,QAAA,YAAY,gBAaxB"}
1
+ {"version":3,"file":"cookie.js","sourceRoot":"","sources":["../../../src/handler/middleware/cookie.ts"],"names":[],"mappings":";;;AAEA,mCAA+B;AAExB,MAAM,YAAY,GAAG,CAAC,OAE5B,EAAiB,EAAE;IAClB,OAAO,KAAK,EAAE,GAAY,EAAiB,EAAE;QAC3C,MAAM,OAAO,GAAG,IAAA,cAAK,EAAC,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;YAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;YAC5B,IAAI,KAAK,EAAE;gBACT,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;aAC3B;SACF;IACH,CAAC,CAAC;AACJ,CAAC,CAAA;AAbY,QAAA,YAAY,gBAaxB"}
@@ -18,6 +18,4 @@ __exportStar(require("./config"), exports);
18
18
  __exportStar(require("./logger"), exports);
19
19
  __exportStar(require("./session"), exports);
20
20
  __exportStar(require("./loader"), exports);
21
- //export * from "./uuid";
22
- //export * from "./cookie";
23
21
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAwB;AACxB,2CAAyB;AACzB,4CAA0B;AAC1B,wCAAsB;AACtB,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,2CAAyB;AACzB,yBAAyB;AACzB,2BAA2B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAwB;AACxB,2CAAyB;AACzB,4CAA0B;AAC1B,wCAAsB;AACtB,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,2CAAyB"}
@@ -5,7 +5,7 @@ const config_1 = require("../config");
5
5
  const error_1 = require("../error");
6
6
  const request_1 = require("../request");
7
7
  const parser_1 = require("../parser");
8
- const cookie_1 = require("../cookie");
8
+ const cookie_1 = require("cookie");
9
9
  const DEFAULT_TOKEN_LOCATION = "header";
10
10
  const DEFAULT_TOKEN_HEADER = "Authorization";
11
11
  const DEFAULT_TOKEN_QUERY = "token";
@@ -97,7 +97,7 @@ class VerifyEndpointService {
97
97
  ctx.logger.trace("token [%s]authorized!", token);
98
98
  if (tokenVerifyLocation === "cookie" && response.headers["set-cookie"]) {
99
99
  const tokenCookieLocation = typeof this.options.tokenLocationName === "string" ? this.options.tokenLocationName : await this.options.tokenLocationName(ctx);
100
- const cookies = response.headers["set-cookie"].map(c => cookie_1.COOKIE.parse(c)).filter(c => c[tokenCookieLocation] !== undefined);
100
+ const cookies = response.headers["set-cookie"].map(c => (0, cookie_1.parse)(c)).filter(c => c[tokenCookieLocation] !== undefined);
101
101
  if (cookies.length === 1) {
102
102
  const value = cookies[0][tokenCookieLocation];
103
103
  if (value) {
@@ -1 +1 @@
1
- {"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/util/session/service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/util/session/service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@miqro/core",
3
- "version": "1.3.9",
3
+ "version": "1.3.11",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -20,11 +20,17 @@
20
20
  "author": "claukers",
21
21
  "license": "ISC",
22
22
  "devDependencies": {
23
+ "@types/cookie": "^0.4.1",
23
24
  "@types/node": "^16.7.10",
24
- "typescript": "^4.5.3"
25
+ "@types/uuid": "^8.3.3",
26
+ "typescript": "^4.5.4"
25
27
  },
26
28
  "engines": {
27
29
  "node": ">=14.0.0",
28
30
  "npm": ">=6.0.0"
31
+ },
32
+ "dependencies": {
33
+ "cookie": "0.4.1",
34
+ "uuid": "8.3.2"
29
35
  }
30
36
  }
@@ -5,8 +5,8 @@ import { normalizePath, parseSearchParams } from "./tokenize-match";
5
5
  import { URL } from "url";
6
6
  import { defaultLoggerFormatter } from "../../util/logger/formatter";
7
7
  import { newURL } from "./helpers";
8
- import { UUID } from "../../util/uuid";
9
- import { COOKIE } from "../../util/cookie";
8
+ import { v4 } from "uuid";
9
+ import { CookieSerializeOptions, serialize } from "cookie";
10
10
 
11
11
  export type Method = "get" | "post" | "put" | "delete" | "patch" | "options" | "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS";
12
12
 
@@ -46,7 +46,7 @@ export class Context {
46
46
  this.cookies = {}; // a middleware will fill
47
47
  this.headers = req.headers;
48
48
  this.startMS = Date.now();
49
- this.uuid = UUID.v4().toString("utf-8");
49
+ this.uuid = v4().toString();
50
50
  this.results = []; // handlers will fill this
51
51
  const pathToEnv = this.path.replace(/\//ig, "_").toUpperCase();
52
52
  const identifier = `${pathToEnv === "_" ? "" : pathToEnv.substring(1)}${this.method.toUpperCase()}`;
@@ -83,17 +83,8 @@ export class Context {
83
83
  public setHeader(name: string, value: number | string | ReadonlyArray<string>): ServerResponse {
84
84
  return this.res.setHeader(name, value);
85
85
  }
86
- public setCookie(name: string, value: string, options?: {
87
- encode?: (uriComponent: string | number | boolean) => string;
88
- maxAge?: number | null;
89
- domain?: string;
90
- httpOnly?: boolean;
91
- secure?: boolean;
92
- path?: string;
93
- expires?: Date;
94
- sameSite?: "lax" | "strict" | "none" | true;
95
- }): ServerResponse {
96
- return this.setHeader('Set-Cookie', COOKIE.serialize(name, String(value), options));
86
+ public setCookie(name: string, value: string, options?: CookieSerializeOptions): ServerResponse {
87
+ return this.setHeader('Set-Cookie', serialize(name, String(value), options));
97
88
  }
98
89
  public async end({ status, headers, body }: {
99
90
  body?: any;
@@ -1,19 +1,19 @@
1
1
  import { Handler, Context } from "../common";
2
2
 
3
- import { COOKIE } from "../../util/cookie";
3
+ import { parse } from "cookie";
4
4
 
5
5
  export const CookieParser = (options?: {
6
- decode?(value: string): string;
6
+ decode?(value: string): string;
7
7
  }): Handler<void> => {
8
- return async (ctx: Context): Promise<void> => {
9
- const cookies = COOKIE.parse(ctx.headers.cookie || '', options);
10
- const cookieList = Object.keys(cookies);
11
- for (const name of cookieList) {
12
- const value = cookies[name];
13
- if (value) {
14
- ctx.cookies[name] = value;
15
- }
16
- }
17
- };
8
+ return async (ctx: Context): Promise<void> => {
9
+ const cookies = parse(ctx.headers.cookie || '', options);
10
+ const cookieList = Object.keys(cookies);
11
+ for (const name of cookieList) {
12
+ const value = cookies[name];
13
+ if (value) {
14
+ ctx.cookies[name] = value;
15
+ }
16
+ }
17
+ };
18
18
  }
19
19
 
package/src/util/index.ts CHANGED
@@ -6,5 +6,3 @@ export * from "./config";
6
6
  export * from "./logger";
7
7
  export * from "./session";
8
8
  export * from "./loader";
9
- //export * from "./uuid";
10
- //export * from "./cookie";
@@ -4,7 +4,7 @@ import { checkEnvVariables } from "../config";
4
4
  import { UnAuthorizedError } from "../error";
5
5
  import { request, RequestOptions, RequestResponse } from "../request";
6
6
  import { parse } from "../parser";
7
- import { COOKIE } from "../cookie";
7
+ import { parse as cookieParse } from "cookie";
8
8
 
9
9
  const DEFAULT_TOKEN_LOCATION = "header";
10
10
  const DEFAULT_TOKEN_HEADER = "Authorization";
@@ -12,143 +12,143 @@ const DEFAULT_TOKEN_QUERY = "token";
12
12
  const DEFAULT_TOKEN_COOKIE = "Authorization";
13
13
 
14
14
  export interface VerifyTokenService {
15
- verify(args: { token: string; ctx: Context }): Promise<Session | null>;
15
+ verify(args: { token: string; ctx: Context }): Promise<Session | null>;
16
16
  }
17
17
 
18
18
  export interface VerifyEndpointServiceOptions {
19
- url: string;
20
- method: string;
21
- tokenLocation: "header" | "query" | "cookie";
22
- tokenLocationName: string | ((ctx: Context) => Promise<string>);
19
+ url: string;
20
+ method: string;
21
+ tokenLocation: "header" | "query" | "cookie";
22
+ tokenLocationName: string | ((ctx: Context) => Promise<string>);
23
23
  }
24
24
 
25
25
  export class VerifyEndpointService implements VerifyTokenService {
26
26
 
27
- protected options: VerifyEndpointServiceOptions;
27
+ protected options: VerifyEndpointServiceOptions;
28
28
 
29
- constructor(options?: VerifyEndpointServiceOptions) {
30
- if (!options) {
31
- const [url, method] = checkEnvVariables(["TOKEN_VERIFY_ENDPOINT", "TOKEN_VERIFY_ENDPOINT_METHOD"]);
32
- const [tokenVerifyLocation] = checkEnvVariables(["TOKEN_VERIFY_LOCATION"], [DEFAULT_TOKEN_LOCATION]);
33
- let tokenLocationName;
34
- switch (tokenVerifyLocation) {
35
- case "header":
36
- tokenLocationName = checkEnvVariables(["TOKEN_HEADER"], [DEFAULT_TOKEN_HEADER])[0];
37
- break;
38
- case "query":
39
- tokenLocationName = checkEnvVariables(["TOKEN_QUERY"], [DEFAULT_TOKEN_QUERY])[0];
40
- break;
41
- case "cookie":
42
- tokenLocationName = checkEnvVariables(["TOKEN_COOKIE"], [DEFAULT_TOKEN_COOKIE])[0];
43
- break;
44
- default:
45
- throw new Error(`TOKEN_VERIFY_LOCATION=${tokenVerifyLocation} not supported use (header or query)`);
46
- }
47
- this.options = {
48
- url, method,
49
- tokenLocation: tokenVerifyLocation,
50
- tokenLocationName
51
- }
52
- } else {
53
- this.options = parse("options", options as any, [
54
- { name: "url", required: true, type: "string", stringMinLength: 1 },
55
- { name: "method", required: true, type: "string", stringMinLength: 1 },
56
- { name: "tokenLocation", required: true, type: "enum", enumValues: ["header", "query", "cookie"] },
57
- { name: "tokenLocationName", required: true, type: "any" }
58
- ], "no_extra") as any;
59
- }
29
+ constructor(options?: VerifyEndpointServiceOptions) {
30
+ if (!options) {
31
+ const [url, method] = checkEnvVariables(["TOKEN_VERIFY_ENDPOINT", "TOKEN_VERIFY_ENDPOINT_METHOD"]);
32
+ const [tokenVerifyLocation] = checkEnvVariables(["TOKEN_VERIFY_LOCATION"], [DEFAULT_TOKEN_LOCATION]);
33
+ let tokenLocationName;
34
+ switch (tokenVerifyLocation) {
35
+ case "header":
36
+ tokenLocationName = checkEnvVariables(["TOKEN_HEADER"], [DEFAULT_TOKEN_HEADER])[0];
37
+ break;
38
+ case "query":
39
+ tokenLocationName = checkEnvVariables(["TOKEN_QUERY"], [DEFAULT_TOKEN_QUERY])[0];
40
+ break;
41
+ case "cookie":
42
+ tokenLocationName = checkEnvVariables(["TOKEN_COOKIE"], [DEFAULT_TOKEN_COOKIE])[0];
43
+ break;
44
+ default:
45
+ throw new Error(`TOKEN_VERIFY_LOCATION=${tokenVerifyLocation} not supported use (header or query)`);
46
+ }
47
+ this.options = {
48
+ url, method,
49
+ tokenLocation: tokenVerifyLocation,
50
+ tokenLocationName
51
+ }
52
+ } else {
53
+ this.options = parse("options", options as any, [
54
+ { name: "url", required: true, type: "string", stringMinLength: 1 },
55
+ { name: "method", required: true, type: "string", stringMinLength: 1 },
56
+ { name: "tokenLocation", required: true, type: "enum", enumValues: ["header", "query", "cookie"] },
57
+ { name: "tokenLocationName", required: true, type: "any" }
58
+ ], "no_extra") as any;
60
59
  }
60
+ }
61
61
 
62
- public async verify({ token, ctx }: { token: string; ctx: Context }): Promise<Session | null> {
63
- try {
64
- let response = null;
65
- const tokenVerifyLocation = this.options.tokenLocation;
66
- const url = this.options.url;
67
- const method = this.options.method;
68
- switch (tokenVerifyLocation) {
69
- case "header":
70
- const tokenHeaderLocation = typeof this.options.tokenLocationName === "string" ? this.options.tokenLocationName : await this.options.tokenLocationName(ctx);
71
- ctx.logger.trace(`verifying [${token}] on TOKEN_VERIFY_ENDPOINT=[${process.env.TOKEN_VERIFY_ENDPOINT}] TOKEN_HEADER=[${tokenHeaderLocation}]`);
72
- response = await this.getResponse({
73
- url,
74
- headers: {
75
- [tokenHeaderLocation]: token
76
- },
77
- method
78
- }, ctx);
79
- break;
80
- case "query":
81
- const tokenQueryLocation = typeof this.options.tokenLocationName === "string" ? this.options.tokenLocationName : await this.options.tokenLocationName(ctx);
82
- ctx.logger.trace(`verifying [${token}] on TOKEN_VERIFY_ENDPOINT=[${process.env.TOKEN_VERIFY_ENDPOINT}] TOKEN_QUERY=[${tokenQueryLocation}]`);
83
- response = await this.getResponse({
84
- url,
85
- query: {
86
- [tokenQueryLocation]: token
87
- },
88
- method
89
- }, ctx);
90
- break;
91
- case "cookie":
92
- const tokenCookieLocation = typeof this.options.tokenLocationName === "string" ? this.options.tokenLocationName : await this.options.tokenLocationName(ctx);
93
- ctx.logger.trace(`verifying [${token}] on TOKEN_VERIFY_ENDPOINT=[${process.env.TOKEN_VERIFY_ENDPOINT}] TOKEN_COOKIE=[${tokenCookieLocation}]`);
94
- response = await this.getResponse({
95
- url,
96
- method,
97
- headers: {
98
- Cookie: `${tokenCookieLocation}=${token}; Path=/; HttpOnly;`
99
- }
100
- }, ctx);
101
- break;
102
- default:
103
- throw new Error(`TOKEN_VERIFY_LOCATION=${tokenVerifyLocation} not supported use (header, query or cookie)`);
62
+ public async verify({ token, ctx }: { token: string; ctx: Context }): Promise<Session | null> {
63
+ try {
64
+ let response = null;
65
+ const tokenVerifyLocation = this.options.tokenLocation;
66
+ const url = this.options.url;
67
+ const method = this.options.method;
68
+ switch (tokenVerifyLocation) {
69
+ case "header":
70
+ const tokenHeaderLocation = typeof this.options.tokenLocationName === "string" ? this.options.tokenLocationName : await this.options.tokenLocationName(ctx);
71
+ ctx.logger.trace(`verifying [${token}] on TOKEN_VERIFY_ENDPOINT=[${process.env.TOKEN_VERIFY_ENDPOINT}] TOKEN_HEADER=[${tokenHeaderLocation}]`);
72
+ response = await this.getResponse({
73
+ url,
74
+ headers: {
75
+ [tokenHeaderLocation]: token
76
+ },
77
+ method
78
+ }, ctx);
79
+ break;
80
+ case "query":
81
+ const tokenQueryLocation = typeof this.options.tokenLocationName === "string" ? this.options.tokenLocationName : await this.options.tokenLocationName(ctx);
82
+ ctx.logger.trace(`verifying [${token}] on TOKEN_VERIFY_ENDPOINT=[${process.env.TOKEN_VERIFY_ENDPOINT}] TOKEN_QUERY=[${tokenQueryLocation}]`);
83
+ response = await this.getResponse({
84
+ url,
85
+ query: {
86
+ [tokenQueryLocation]: token
87
+ },
88
+ method
89
+ }, ctx);
90
+ break;
91
+ case "cookie":
92
+ const tokenCookieLocation = typeof this.options.tokenLocationName === "string" ? this.options.tokenLocationName : await this.options.tokenLocationName(ctx);
93
+ ctx.logger.trace(`verifying [${token}] on TOKEN_VERIFY_ENDPOINT=[${process.env.TOKEN_VERIFY_ENDPOINT}] TOKEN_COOKIE=[${tokenCookieLocation}]`);
94
+ response = await this.getResponse({
95
+ url,
96
+ method,
97
+ headers: {
98
+ Cookie: `${tokenCookieLocation}=${token}; Path=/; HttpOnly;`
104
99
  }
105
- if (response) {
106
- const session = await this.decodeSession(response, token, ctx);
107
- if (!this.checkSession(session, ctx)) {
108
- ctx.logger.warn(`unauthorized token not valid [${token}]`);
109
- return null;
110
- } else {
111
- ctx.logger.trace("token [%s]authorized!", token);
100
+ }, ctx);
101
+ break;
102
+ default:
103
+ throw new Error(`TOKEN_VERIFY_LOCATION=${tokenVerifyLocation} not supported use (header, query or cookie)`);
104
+ }
105
+ if (response) {
106
+ const session = await this.decodeSession(response, token, ctx);
107
+ if (!this.checkSession(session, ctx)) {
108
+ ctx.logger.warn(`unauthorized token not valid [${token}]`);
109
+ return null;
110
+ } else {
111
+ ctx.logger.trace("token [%s]authorized!", token);
112
112
 
113
- if (tokenVerifyLocation === "cookie" && response.headers["set-cookie"]) {
114
- const tokenCookieLocation = typeof this.options.tokenLocationName === "string" ? this.options.tokenLocationName : await this.options.tokenLocationName(ctx);
115
- const cookies = response.headers["set-cookie"].map(c => COOKIE.parse(c)).filter(c => c[tokenCookieLocation] !== undefined);
116
- if (cookies.length === 1) {
117
- const value = cookies[0][tokenCookieLocation];
118
- if (value) {
119
- session.token = value; // replace token because token update via set-cookie
120
- }
121
- }
122
- }
123
- return {
124
- token,
125
- ...session
126
- } as Session;
127
- }
128
- } else {
129
- ctx.logger.warn(`unauthorized token not valid [${token}]`);
130
- return null;
113
+ if (tokenVerifyLocation === "cookie" && response.headers["set-cookie"]) {
114
+ const tokenCookieLocation = typeof this.options.tokenLocationName === "string" ? this.options.tokenLocationName : await this.options.tokenLocationName(ctx);
115
+ const cookies = response.headers["set-cookie"].map(c => cookieParse(c)).filter(c => c[tokenCookieLocation] !== undefined);
116
+ if (cookies.length === 1) {
117
+ const value = cookies[0][tokenCookieLocation];
118
+ if (value) {
119
+ session.token = value; // replace token because token update via set-cookie
120
+ }
131
121
  }
132
- } catch (e: any) {
133
- throw new UnAuthorizedError(`Fail to authenticate token! error verifying [${token}] [${e.status}][${e.config ? e.config.url : ""}]`);
122
+ }
123
+ return {
124
+ token,
125
+ ...session
126
+ } as Session;
134
127
  }
128
+ } else {
129
+ ctx.logger.warn(`unauthorized token not valid [${token}]`);
130
+ return null;
131
+ }
132
+ } catch (e: any) {
133
+ throw new UnAuthorizedError(`Fail to authenticate token! error verifying [${token}] [${e.status}][${e.config ? e.config.url : ""}]`);
135
134
  }
136
- /* eslint-disable @typescript-eslint/no-unused-vars */
137
- protected async getResponse(config: RequestOptions, ctx?: Context): Promise<RequestResponse> {
138
- return request(config);
139
- }
140
- /* eslint-disable @typescript-eslint/no-unused-vars */
141
- protected checkSession(session: NoTokenSession, ctx?: Context): boolean {
142
- parse("session", session, [
143
- { name: "username", required: true, type: "string" },
144
- { name: "account", required: true, type: "string" },
145
- { name: "groups", required: true, type: "array", arrayType: "string" }
146
- ], "add_extra");
147
- return true;
148
- }
149
- /* eslint-disable @typescript-eslint/no-unused-vars */
150
- protected async decodeSession(response: RequestResponse, token: string, ctx?: Context): Promise<NoTokenSession> {
151
- const session = response.data;
152
- return session as NoTokenSession;
153
- }
154
- }
135
+ }
136
+ /* eslint-disable @typescript-eslint/no-unused-vars */
137
+ protected async getResponse(config: RequestOptions, ctx?: Context): Promise<RequestResponse> {
138
+ return request(config);
139
+ }
140
+ /* eslint-disable @typescript-eslint/no-unused-vars */
141
+ protected checkSession(session: NoTokenSession, ctx?: Context): boolean {
142
+ parse("session", session, [
143
+ { name: "username", required: true, type: "string" },
144
+ { name: "account", required: true, type: "string" },
145
+ { name: "groups", required: true, type: "array", arrayType: "string" }
146
+ ], "add_extra");
147
+ return true;
148
+ }
149
+ /* eslint-disable @typescript-eslint/no-unused-vars */
150
+ protected async decodeSession(response: RequestResponse, token: string, ctx?: Context): Promise<NoTokenSession> {
151
+ const session = response.data;
152
+ return session as NoTokenSession;
153
+ }
154
+ }
@@ -1,50 +0,0 @@
1
- /*!
2
- * cookie
3
- * Copyright(c) 2012-2014 Roman Shtylman
4
- * Copyright(c) 2015 Douglas Christopher Wilson
5
- * MIT Licensed
6
- */
7
- /// <reference types="node" />
8
- /**
9
- * Module exports.
10
- * @public
11
- */
12
- /**
13
- * Parse a cookie header.
14
- *
15
- * Parse the given cookie header string into an object
16
- * The object has the various cookies as keys(names) => values
17
- *
18
- * @param {string} str
19
- * @param {object} [options]
20
- * @return {object}
21
- * @public
22
- */
23
- export declare const parse: (str: string, options?: {
24
- decode?: ((value: string) => string) | undefined;
25
- } | undefined) => NodeJS.Dict<string>;
26
- /**
27
- * Serialize data into a cookie header.
28
- *
29
- * Serialize the a name value pair into a cookie string suitable for
30
- * http headers. An optional options object specified cookie parameters.
31
- *
32
- * serialize('foo', 'bar', { httpOnly: true })
33
- * => "foo=bar; httpOnly"
34
- *
35
- * @param {string} name
36
- * @param {string} val
37
- * @param {object} [options]
38
- * @return {string}
39
- * @public
40
- */
41
- export declare const serialize: (name: string, val: string, options?: {
42
- encode?: ((uriComponent: string | number | boolean) => string) | undefined;
43
- maxAge?: number | null | undefined;
44
- domain?: string | undefined;
45
- httpOnly?: boolean | undefined;
46
- secure?: boolean | undefined;
47
- path?: string | undefined;
48
- expires?: Date | undefined;
49
- sameSite?: true | "lax" | "strict" | "none" | undefined;
50
- } | undefined) => string;