prostgles-server 4.2.292 → 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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setCookieAndGoToReturnURLIFSet.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.setCookieAndGoToReturnURLIFSet = exports.validateSessionAndSetCookie = void 0;
|
|
4
|
-
const prostgles_types_1 = require("prostgles-types");
|
|
5
4
|
const AuthHandler_1 = require("../AuthHandler");
|
|
6
5
|
const login_1 = require("../login");
|
|
7
6
|
const getReturnUrl_1 = require("./getReturnUrl");
|
|
@@ -52,7 +51,8 @@ function setCookieAndGoToReturnURLIFSet(cookie, requestHandler) {
|
|
|
52
51
|
return res.redirect(safeReturnUrl);
|
|
53
52
|
}
|
|
54
53
|
const safeOriginalUrl = (0, getSafeReturnURL_1.getSafeReturnURL)(req.originalUrl, AuthHandler_1.AUTH_ROUTES_AND_PARAMS.returnUrlParamName);
|
|
55
|
-
if (safeOriginalUrl &&
|
|
54
|
+
if (safeOriginalUrl &&
|
|
55
|
+
![AuthHandler_1.AUTH_ROUTES_AND_PARAMS.magicLinks].some((authRoute) => (0, AuthHandler_1.matchesRoute)(authRoute, safeOriginalUrl))) {
|
|
56
56
|
return res.redirect(safeOriginalUrl);
|
|
57
57
|
}
|
|
58
58
|
return res.redirect("/");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setCookieAndGoToReturnURLIFSet.js","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":";;;
|
|
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"}
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import { includes } from "prostgles-types";
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
AUTH_ROUTES_AND_PARAMS,
|
|
4
|
+
HTTP_FAIL_CODES,
|
|
5
|
+
matchesRoute,
|
|
6
|
+
type AuthHandler,
|
|
7
|
+
} from "../AuthHandler";
|
|
3
8
|
import type { ExpressReq } from "../AuthTypes";
|
|
4
9
|
import type { LoginResponseHandler } from "../endpoints/setLoginRequestHandler";
|
|
5
10
|
import { getBasicSessionErrorCode } from "../login";
|
|
@@ -67,7 +72,12 @@ export function setCookieAndGoToReturnURLIFSet(
|
|
|
67
72
|
req.originalUrl,
|
|
68
73
|
AUTH_ROUTES_AND_PARAMS.returnUrlParamName
|
|
69
74
|
);
|
|
70
|
-
if (
|
|
75
|
+
if (
|
|
76
|
+
safeOriginalUrl &&
|
|
77
|
+
![AUTH_ROUTES_AND_PARAMS.magicLinks].some((authRoute) =>
|
|
78
|
+
matchesRoute(authRoute, safeOriginalUrl)
|
|
79
|
+
)
|
|
80
|
+
) {
|
|
71
81
|
return res.redirect(safeOriginalUrl);
|
|
72
82
|
}
|
|
73
83
|
return res.redirect("/");
|