prostgles-server 4.2.291 → 4.2.293

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 (9) hide show
  1. package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.js +1 -0
  2. package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.js.map +1 -1
  3. package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.d.ts +0 -1
  4. package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.d.ts.map +1 -1
  5. package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.js +4 -13
  6. package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.js.map +1 -1
  7. package/lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts +1 -0
  8. package/lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts +13 -11
  9. package/package.json +1 -1
package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.js CHANGED
@@ -51,6 +51,7 @@ function setMagicLinkOrOTPRequestHandler(onMagicLink, app) {
51
51
  }
52
52
  exports.setMagicLinkOrOTPRequestHandler = setMagicLinkOrOTPRequestHandler;
53
53
  const parseMagicLinkOrOTPData = (res, data) => {
54
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
54
55
  const { id, code, email, returnToken = false } = data;
55
56
  if (typeof returnToken !== "boolean") {
56
57
  res.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST).json({
package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"setMagicLinkOrOTPRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"setMagicLinkOrOTPRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts"],"names":[],"mappings":"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"}
package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.d.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  import { type AuthHandler } from "../AuthHandler";
2
2
  import type { ExpressReq } from "../AuthTypes";
3
3
  import type { LoginResponseHandler } from "../endpoints/setLoginRequestHandler";
4
- export type NewSessionRedirect = "isAnonimous" | "normalUser";
5
4
  export declare function validateSessionAndSetCookie(this: AuthHandler, cookie: {
6
5
  sid: string;
7
6
  expires: number;
package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"setCookieAndGoToReturnURLIFSet.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAKhF,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG,YAAY,CAAC;AAC9D,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EACxC,cAAc,EAAE;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,oBAAoB,CAAA;CAAE,QAa/D;AAED,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EACxC,cAAc,EAAE;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,oBAAoB,CAAA;CAAE,QAoD/D"}
1
+ {"version":3,"file":"setCookieAndGoToReturnURLIFSet.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,WAAW,EACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAKhF,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EACxC,cAAc,EAAE;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,oBAAoB,CAAA;CAAE,QAY/D;AAED,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EACxC,cAAc,EAAE;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,oBAAoB,CAAA;CAAE,QAkD/D"}
package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.js CHANGED
@@ -5,9 +5,7 @@ const AuthHandler_1 = require("../AuthHandler");
5
5
  const login_1 = require("../login");
6
6
  const getReturnUrl_1 = require("./getReturnUrl");
7
7
  const getSafeReturnURL_1 = require("./getSafeReturnURL");
8
- function validateSessionAndSetCookie(cookie, requestHandler
9
- // newSessionRedirect: NewSessionRedirect | undefined
10
- ) {
8
+ function validateSessionAndSetCookie(cookie, requestHandler) {
11
9
  const sessionErrorCode = (0, login_1.getBasicSessionErrorCode)(cookie);
12
10
  if (sessionErrorCode) {
13
11
  const { res } = requestHandler;
@@ -20,9 +18,7 @@ function validateSessionAndSetCookie(cookie, requestHandler
20
18
  return this.setCookieAndGoToReturnURLIFSet(cookie, requestHandler);
21
19
  }
22
20
  exports.validateSessionAndSetCookie = validateSessionAndSetCookie;
23
- function setCookieAndGoToReturnURLIFSet(cookie, requestHandler
24
- // newSessionRedirect: NewSessionRedirect | undefined
25
- ) {
21
+ function setCookieAndGoToReturnURLIFSet(cookie, requestHandler) {
26
22
  const { sid, expires } = cookie;
27
23
  const { res, req } = requestHandler;
28
24
  if (!sid) {
@@ -55,13 +51,8 @@ function setCookieAndGoToReturnURLIFSet(cookie, requestHandler
55
51
  return res.redirect(safeReturnUrl);
56
52
  }
57
53
  const safeOriginalUrl = (0, getSafeReturnURL_1.getSafeReturnURL)(req.originalUrl, AuthHandler_1.AUTH_ROUTES_AND_PARAMS.returnUrlParamName);
58
- if (safeOriginalUrl) {
59
- // if (safeOriginalUrl === AUTH_ROUTES_AND_PARAMS.login) {
60
- // if (newSessionRedirect === "isAnonimous") {
61
- // return res.redirect(AUTH_ROUTES_AND_PARAMS.login);
62
- // }
63
- // } else {
64
- // }
54
+ if (safeOriginalUrl &&
55
+ ![AuthHandler_1.AUTH_ROUTES_AND_PARAMS.magicLinks].some((authRoute) => (0, AuthHandler_1.matchesRoute)(authRoute, safeOriginalUrl))) {
65
56
  return res.redirect(safeOriginalUrl);
66
57
  }
67
58
  return res.redirect("/");
package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"setCookieAndGoToReturnURLIFSet.js","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":";;;AAAA,gDAA2F;AAG3F,oCAAoD;AACpD,iDAA8C;AAC9C,yDAAsD;AAGtD,SAAgB,2BAA2B,CAEzC,MAAwC,EACxC,cAA8D;AAC9D,qDAAqD;;IAErD,MAAM,gBAAgB,GAAG,IAAA,gCAAwB,EAAC,MAAM,CAAC,CAAC;IAC1D,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;QAC/B,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;YAC5C,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,gBAAgB;SACvB,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACD,OAAO,IAAI,CAAC,8BAA8B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AACrE,CAAC;AAhBD,kEAgBC;AAED,SAAgB,8BAA8B,CAE5C,MAAwC,EACxC,cAA8D;AAC9D,qDAAqD;;IAErD,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAChC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;IACpC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,QAAQ,CAAC;IACjB,CAAC;IAED,MAAM,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,YAAY;IAE/C,IAAI,cAAc,GAA4B;QAC5C,MAAM,EAAE,YAAY;KACrB,CAAC;IAEF,IAAI,OAAO,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QACtE,cAAc,GAAG,EAAE,OAAO,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,CAAC,CAAC,cAAc,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QACvE,IAAI,IAAI,IAAI,GAAG,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC,8DAA8D,IAAI,MAAM,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG;QACjB,GAAG,cAAc;QACjB,+CAA+C;QAC/C,QAAQ,EAAE,IAAI;QACd,cAAc;QACd,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE,QAAiB;QAC3B,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,IAAI,EAAE,CAAC;KACtD,CAAC;IACF,MAAM,UAAU,GAAG,GAAG,CAAC;IACvB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,IAAA,2BAAY,EAAC,GAAG,CAAC,CAAC;IACxC,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IACrC,CAAC;IACD,MAAM,eAAe,GAAG,IAAA,mCAAgB,EACtC,GAAG,CAAC,WAAW,EACf,oCAAsB,CAAC,kBAAkB,CAC1C,CAAC;IACF,IAAI,eAAe,EAAE,CAAC;QACpB,0DAA0D;QAC1D,gDAAgD;QAChD,yDAAyD;QACzD,MAAM;QACN,WAAW;QACX,IAAI;QACJ,OAAO,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC;AAvDD,wEAuDC"}
1
+ {"version":3,"file":"setCookieAndGoToReturnURLIFSet.js","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":";;;AACA,gDAKwB;AAGxB,oCAAoD;AACpD,iDAA8C;AAC9C,yDAAsD;AAEtD,SAAgB,2BAA2B,CAEzC,MAAwC,EACxC,cAA8D;IAE9D,MAAM,gBAAgB,GAAG,IAAA,gCAAwB,EAAC,MAAM,CAAC,CAAC;IAC1D,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;QAC/B,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;YAC5C,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,gBAAgB;SACvB,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACD,OAAO,IAAI,CAAC,8BAA8B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AACrE,CAAC;AAfD,kEAeC;AAED,SAAgB,8BAA8B,CAE5C,MAAwC,EACxC,cAA8D;IAE9D,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAChC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;IACpC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,QAAQ,CAAC;IACjB,CAAC;IAED,MAAM,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,YAAY;IAE/C,IAAI,cAAc,GAA4B;QAC5C,MAAM,EAAE,YAAY;KACrB,CAAC;IAEF,IAAI,OAAO,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QACtE,cAAc,GAAG,EAAE,OAAO,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,CAAC,CAAC,cAAc,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QACvE,IAAI,IAAI,IAAI,GAAG,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC,8DAA8D,IAAI,MAAM,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG;QACjB,GAAG,cAAc;QACjB,+CAA+C;QAC/C,QAAQ,EAAE,IAAI;QACd,cAAc;QACd,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE,QAAiB;QAC3B,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,IAAI,EAAE,CAAC;KACtD,CAAC;IACF,MAAM,UAAU,GAAG,GAAG,CAAC;IACvB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,IAAA,2BAAY,EAAC,GAAG,CAAC,CAAC;IACxC,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IACrC,CAAC;IACD,MAAM,eAAe,GAAG,IAAA,mCAAgB,EACtC,GAAG,CAAC,WAAW,EACf,oCAAsB,CAAC,kBAAkB,CAC1C,CAAC;IACF,IACE,eAAe;QACf,CAAC,CAAC,oCAAsB,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CACtD,IAAA,0BAAY,EAAC,SAAS,EAAE,eAAe,CAAC,CACzC,EACD,CAAC;QACD,OAAO,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC;AArDD,wEAqDC"}
package/lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts CHANGED
@@ -79,6 +79,7 @@ export function setMagicLinkOrOTPRequestHandler(
79
79
  }
80
80
 
81
81
  const parseMagicLinkOrOTPData = (res: Response, data: any): MagicLinkOrOTPData | undefined => {
82
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
82
83
  const { id, code, email, returnToken = false } = data;
83
84
 
84
85
  if (typeof returnToken !== "boolean") {
package/lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts CHANGED
@@ -1,16 +1,20 @@
1
- import { AUTH_ROUTES_AND_PARAMS, HTTP_FAIL_CODES, type AuthHandler } from "../AuthHandler";
1
+ import { includes } from "prostgles-types";
2
+ import {
3
+ AUTH_ROUTES_AND_PARAMS,
4
+ HTTP_FAIL_CODES,
5
+ matchesRoute,
6
+ type AuthHandler,
7
+ } from "../AuthHandler";
2
8
  import type { ExpressReq } from "../AuthTypes";
3
9
  import type { LoginResponseHandler } from "../endpoints/setLoginRequestHandler";
4
10
  import { getBasicSessionErrorCode } from "../login";
5
11
  import { getReturnUrl } from "./getReturnUrl";
6
12
  import { getSafeReturnURL } from "./getSafeReturnURL";
7
13
 
8
- export type NewSessionRedirect = "isAnonimous" | "normalUser";
9
14
  export function validateSessionAndSetCookie(
10
15
  this: AuthHandler,
11
16
  cookie: { sid: string; expires: number },
12
17
  requestHandler: { req: ExpressReq; res: LoginResponseHandler }
13
- // newSessionRedirect: NewSessionRedirect | undefined
14
18
  ) {
15
19
  const sessionErrorCode = getBasicSessionErrorCode(cookie);
16
20
  if (sessionErrorCode) {
@@ -28,7 +32,6 @@ export function setCookieAndGoToReturnURLIFSet(
28
32
  this: AuthHandler,
29
33
  cookie: { sid: string; expires: number },
30
34
  requestHandler: { req: ExpressReq; res: LoginResponseHandler }
31
- // newSessionRedirect: NewSessionRedirect | undefined
32
35
  ) {
33
36
  const { sid, expires } = cookie;
34
37
  const { res, req } = requestHandler;
@@ -69,13 +72,12 @@ export function setCookieAndGoToReturnURLIFSet(
69
72
  req.originalUrl,
70
73
  AUTH_ROUTES_AND_PARAMS.returnUrlParamName
71
74
  );
72
- if (safeOriginalUrl) {
73
- // if (safeOriginalUrl === AUTH_ROUTES_AND_PARAMS.login) {
74
- // if (newSessionRedirect === "isAnonimous") {
75
- // return res.redirect(AUTH_ROUTES_AND_PARAMS.login);
76
- // }
77
- // } else {
78
- // }
75
+ if (
76
+ safeOriginalUrl &&
77
+ ![AUTH_ROUTES_AND_PARAMS.magicLinks].some((authRoute) =>
78
+ matchesRoute(authRoute, safeOriginalUrl)
79
+ )
80
+ ) {
79
81
  return res.redirect(safeOriginalUrl);
80
82
  }
81
83
  return res.redirect("/");
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "prostgles-server",
3
- "version": "4.2.291",
3
+ "version": "4.2.293",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",