prostgles-server 4.2.270 → 4.2.272

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 (67) hide show
  1. package/dist/Auth/AuthHandler.d.ts +15 -8
  2. package/dist/Auth/AuthHandler.d.ts.map +1 -1
  3. package/dist/Auth/AuthHandler.js +34 -58
  4. package/dist/Auth/AuthHandler.js.map +1 -1
  5. package/dist/Auth/AuthTypes.d.ts +12 -2
  6. package/dist/Auth/AuthTypes.d.ts.map +1 -1
  7. package/dist/Auth/AuthTypes.js.map +1 -1
  8. package/dist/Auth/endpoints/setCatchAllRequestHandler.d.ts.map +1 -1
  9. package/dist/Auth/endpoints/setCatchAllRequestHandler.js +26 -19
  10. package/dist/Auth/endpoints/setCatchAllRequestHandler.js.map +1 -1
  11. package/dist/Auth/getClientAuth.d.ts +1 -1
  12. package/dist/Auth/getClientAuth.d.ts.map +1 -1
  13. package/dist/Auth/getClientAuth.js +12 -4
  14. package/dist/Auth/getClientAuth.js.map +1 -1
  15. package/dist/Auth/login.d.ts +2 -1
  16. package/dist/Auth/login.d.ts.map +1 -1
  17. package/dist/Auth/login.js +20 -13
  18. package/dist/Auth/login.js.map +1 -1
  19. package/dist/Auth/setupAuthRoutes.d.ts.map +1 -1
  20. package/dist/Auth/setupAuthRoutes.js +11 -3
  21. package/dist/Auth/setupAuthRoutes.js.map +1 -1
  22. package/dist/Auth/utils/getSidAndUserFromRequest.d.ts +4 -2
  23. package/dist/Auth/utils/getSidAndUserFromRequest.d.ts.map +1 -1
  24. package/dist/Auth/utils/getSidAndUserFromRequest.js +40 -25
  25. package/dist/Auth/utils/getSidAndUserFromRequest.js.map +1 -1
  26. package/dist/Auth/utils/getUserOrError.d.ts +10 -0
  27. package/dist/Auth/utils/getUserOrError.d.ts.map +1 -0
  28. package/dist/Auth/utils/getUserOrError.js +48 -0
  29. package/dist/Auth/utils/getUserOrError.js.map +1 -0
  30. package/dist/Auth/utils/handleGetUser.d.ts +7 -0
  31. package/dist/Auth/utils/handleGetUser.d.ts.map +1 -0
  32. package/dist/Auth/utils/handleGetUser.js +47 -0
  33. package/dist/Auth/utils/handleGetUser.js.map +1 -0
  34. package/dist/DboBuilder/DboBuilderTypes.d.ts +2 -1
  35. package/dist/DboBuilder/DboBuilderTypes.d.ts.map +1 -1
  36. package/dist/Prostgles.d.ts.map +1 -1
  37. package/dist/Prostgles.js +6 -0
  38. package/dist/Prostgles.js.map +1 -1
  39. package/dist/PublishParser/PublishParser.d.ts +2 -2
  40. package/dist/PublishParser/PublishParser.d.ts.map +1 -1
  41. package/dist/PublishParser/PublishParser.js +11 -5
  42. package/dist/PublishParser/PublishParser.js.map +1 -1
  43. package/dist/PublishParser/getSchemaFromPublish.d.ts.map +1 -1
  44. package/dist/PublishParser/getSchemaFromPublish.js +70 -69
  45. package/dist/PublishParser/getSchemaFromPublish.js.map +1 -1
  46. package/dist/onSocketConnected.d.ts.map +1 -1
  47. package/dist/onSocketConnected.js +15 -14
  48. package/dist/onSocketConnected.js.map +1 -1
  49. package/dist/runClientRequest.d.ts.map +1 -1
  50. package/dist/runClientRequest.js +3 -0
  51. package/dist/runClientRequest.js.map +1 -1
  52. package/lib/Auth/AuthHandler.ts +42 -83
  53. package/lib/Auth/AuthTypes.ts +13 -3
  54. package/lib/Auth/endpoints/setCatchAllRequestHandler.ts +29 -24
  55. package/lib/Auth/getClientAuth.ts +28 -14
  56. package/lib/Auth/login.ts +24 -17
  57. package/lib/Auth/setupAuthRoutes.ts +12 -3
  58. package/lib/Auth/utils/getSidAndUserFromRequest.ts +42 -33
  59. package/lib/Auth/utils/getUserOrError.ts +56 -0
  60. package/lib/Auth/utils/handleGetUser.ts +63 -0
  61. package/lib/DboBuilder/DboBuilderTypes.ts +2 -1
  62. package/lib/Prostgles.ts +7 -0
  63. package/lib/PublishParser/PublishParser.ts +14 -6
  64. package/lib/PublishParser/getSchemaFromPublish.ts +97 -94
  65. package/lib/onSocketConnected.ts +15 -12
  66. package/lib/runClientRequest.ts +3 -0
  67. package/package.json +2 -2
@@ -1,6 +1,6 @@
1
1
  import { PRGLIOSocket } from "../DboBuilder/DboBuilder";
2
2
  import { DB, DBHandlerServer, Prostgles } from "../Prostgles";
3
- import { AuthClientRequest, AuthConfig, AuthResult, AuthResultWithSID, BasicSession, ExpressReq } from "./AuthTypes";
3
+ import { AuthClientRequest, AuthConfig, BasicSession, ExpressReq } from "./AuthTypes";
4
4
  import { LoginResponseHandler } from "./endpoints/setLoginRequestHandler";
5
5
  import { getClientRequestIPsInfo } from "./utils/getClientRequestIPsInfo";
6
6
  export { getClientRequestIPsInfo };
@@ -36,6 +36,13 @@ export declare class AuthHandler {
36
36
  get sidKeyName(): string;
37
37
  validateSid: (sid: string | undefined) => string | undefined;
38
38
  isUserRoute: (pathname: string) => boolean;
39
+ validateSessionAndSetCookie: (cookie: {
40
+ sid: string;
41
+ expires: number;
42
+ }, requestHandler: {
43
+ req: ExpressReq;
44
+ res: LoginResponseHandler;
45
+ }) => void;
39
46
  setCookieAndGoToReturnURLIFSet: (cookie: {
40
47
  sid: string;
41
48
  expires: number;
@@ -43,7 +50,8 @@ export declare class AuthHandler {
43
50
  req: ExpressReq;
44
51
  res: LoginResponseHandler;
45
52
  }) => void;
46
- getUserOrError: (localParams: AuthClientRequest) => Promise<AuthResultWithSID>;
53
+ handleGetUser: (clientReq: AuthClientRequest) => Promise<import("./utils/handleGetUser").GetUserOrRedirected>;
54
+ getUserOrError: (clientReq: AuthClientRequest) => Promise<import("./utils/handleGetUser").GetUserOrRedirected>;
47
55
  init: () => void;
48
56
  destroy: () => void;
49
57
  login: (req: ExpressReq, res: LoginResponseHandler, loginParams: import("./AuthTypes").LoginParams) => Promise<LoginResponseHandler | undefined>;
@@ -54,18 +62,17 @@ export declare class AuthHandler {
54
62
  * - query params
55
63
  * Based on sidKeyName from auth
56
64
  */
57
- getSID(maybeClientReq: AuthClientRequest | undefined): string | undefined;
65
+ getValidatedSid(maybeClientReq: AuthClientRequest | undefined): string | undefined;
58
66
  /**
59
67
  * Used for logging
60
68
  */
61
69
  getSIDNoError: (clientReq: AuthClientRequest | undefined) => string | undefined;
62
- getUserFromRequest: (clientReq: AuthClientRequest) => Promise<AuthResult>;
63
- getSidAndUserFromRequest: (clientReq: AuthClientRequest) => Promise<AuthResultWithSID>;
70
+ getSidAndUserFromRequest: (clientReq: AuthClientRequest) => Promise<import("./utils/handleGetUser").GetUserOrRedirected>;
64
71
  isNonExpiredSocketSession: (socket: PRGLIOSocket, session: BasicSession | undefined) => boolean;
65
- getClientAuth: (clientReq: AuthClientRequest) => Promise<{
72
+ getClientAuth: (clientReq: AuthClientRequest) => Promise<"new-session-redirect" | {
66
73
  auth: import("prostgles-types").AuthSocketSchema;
67
- userData: AuthResultWithSID;
74
+ userData: import("./AuthTypes").AuthResultWithSID;
68
75
  }>;
69
76
  }
70
- export declare const matchesRoute: (shorterRoute: string | undefined, longerRoute: string) => boolean | "" | undefined;
77
+ export declare const matchesRoute: (baseRoute: string | undefined, fullRoute: string) => boolean;
71
78
  //# sourceMappingURL=AuthHandler.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EACL,iBAAiB,EACjB,UAAU,EACV,UAAU,EACV,iBAAiB,EACjB,YAAY,EACZ,UAAU,EACX,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAI1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAK1E,OAAO,EAAE,uBAAuB,EAAE,CAAC;AACnC,eAAO,MAAM,eAAe;;;;;;;CAOlB,CAAC;AAEX,eAAO,MAAM,kBAAkB;;;CAGrB,CAAC;AAEX,eAAO,MAAM,sBAAsB;;;;;;;;;;CAUzB,CAAC;AAEX,qBAAa,WAAW;IACtB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IACpC,GAAG,EAAE,eAAe,CAAC;IACrB,EAAE,EAAE,EAAE,CAAC;gBAEK,SAAS,EAAE,SAAS;IAShC,IAAI,UAAU,WAEb;IAED,WAAW,QAAS,MAAM,GAAG,SAAS,wBAIpC;IAEF,WAAW,aAAc,MAAM,aAkB7B;IAEF,8BAA8B,WACpB;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,kBACxB;QAAE,GAAG,EAAE,UAAU,CAAC;QAAC,GAAG,EAAE,oBAAoB,CAAA;KAAE,UAmC9D;IAEF,cAAc,gBAAuB,iBAAiB,KAAG,QAAQ,iBAAiB,CAAC,CA2CjF;IAEF,IAAI,aAA8B;IAElC,OAAO,aAqBL;IAEF,KAAK,4IAAoB;IAEzB;;;;;;OAMG;IACH,MAAM,CAAC,cAAc,EAAE,iBAAiB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;IA6BzE;;OAEG;IACH,aAAa,cAAe,iBAAiB,GAAG,SAAS,KAAG,MAAM,GAAG,SAAS,CAO5E;IAEF,kBAAkB,cAAqB,iBAAiB,KAAG,QAAQ,UAAU,CAAC,CAK5E;IACF,wBAAwB,+DAAuC;IAE/D,yBAAyB,WACf,YAAY,WACX,YAAY,GAAG,SAAS,KAChC,OAAO,CAiBR;IAEF,aAAa;;;OAA4B;CAC1C;AAED,eAAO,MAAM,YAAY,iBAAkB,MAAM,GAAG,SAAS,eAAe,MAAM,6BAQjF,CAAC"}
1
+ {"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAc,YAAY,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAClG,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAI1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAM1E,OAAO,EAAE,uBAAuB,EAAE,CAAC;AACnC,eAAO,MAAM,eAAe;;;;;;;CAOlB,CAAC;AAEX,eAAO,MAAM,kBAAkB;;;CAGrB,CAAC;AAEX,eAAO,MAAM,sBAAsB;;;;;;;;;;CAUzB,CAAC;AAEX,qBAAa,WAAW;IACtB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IACpC,GAAG,EAAE,eAAe,CAAC;IACrB,EAAE,EAAE,EAAE,CAAC;gBAEK,SAAS,EAAE,SAAS;IAShC,IAAI,UAAU,WAEb;IAED,WAAW,QAAS,MAAM,GAAG,SAAS,wBAIpC;IAEF,WAAW,aAAc,MAAM,aAkB7B;IAEF,2BAA2B,WACjB;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,kBACxB;QAAE,GAAG,EAAE,UAAU,CAAC;QAAC,GAAG,EAAE,oBAAoB,CAAA;KAAE,UAY9D;IAEF,8BAA8B,WACpB;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,kBACxB;QAAE,GAAG,EAAE,UAAU,CAAC;QAAC,GAAG,EAAE,oBAAoB,CAAA;KAAE,UAmC9D;IACF,aAAa,iGAAqC;IAClD,cAAc,iGAA6B;IAE3C,IAAI,aAA8B;IAElC,OAAO,aAqBL;IAEF,KAAK,4IAAoB;IAEzB;;;;;;OAMG;IACH,eAAe,CAAC,cAAc,EAAE,iBAAiB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;IA+BlF;;OAEG;IACH,aAAa,cAAe,iBAAiB,GAAG,SAAS,KAAG,MAAM,GAAG,SAAS,CAO5E;IAEF,wBAAwB,iGAAuC;IAE/D,yBAAyB,WACf,YAAY,WACX,YAAY,GAAG,SAAS,KAChC,OAAO,CAiBR;IAEF,aAAa;;;OAA4B;CAC1C;AAED,eAAO,MAAM,YAAY,cAAe,MAAM,GAAG,SAAS,aAAa,MAAM,YAK5E,CAAC"}
@@ -10,7 +10,8 @@ const getClientRequestIPsInfo_1 = require("./utils/getClientRequestIPsInfo");
10
10
  Object.defineProperty(exports, "getClientRequestIPsInfo", { enumerable: true, get: function () { return getClientRequestIPsInfo_1.getClientRequestIPsInfo; } });
11
11
  const getReturnUrl_1 = require("./utils/getReturnUrl");
12
12
  const getSidAndUserFromRequest_1 = require("./utils/getSidAndUserFromRequest");
13
- const throttledReject_1 = require("./utils/throttledReject");
13
+ const getUserOrError_1 = require("./utils/getUserOrError");
14
+ const handleGetUser_1 = require("./utils/handleGetUser");
14
15
  exports.HTTP_FAIL_CODES = {
15
16
  UNAUTHORIZED: 401,
16
17
  NOT_FOUND: 404,
@@ -72,6 +73,18 @@ class AuthHandler {
72
73
  return (0, exports.matchesRoute)(publicRoute, pathname);
73
74
  });
74
75
  };
76
+ validateSessionAndSetCookie = (cookie, requestHandler) => {
77
+ const sessionErrorCode = (0, login_1.getBasicSessionErrorCode)(cookie);
78
+ if (sessionErrorCode) {
79
+ const { res } = requestHandler;
80
+ res.status(exports.HTTP_FAIL_CODES.UNAUTHORIZED).json({
81
+ success: false,
82
+ code: sessionErrorCode,
83
+ });
84
+ return;
85
+ }
86
+ return this.setCookieAndGoToReturnURLIFSet(cookie, requestHandler);
87
+ };
75
88
  setCookieAndGoToReturnURLIFSet = (cookie, requestHandler) => {
76
89
  const { sid, expires } = cookie;
77
90
  const { res, req } = requestHandler;
@@ -103,40 +116,8 @@ class AuthHandler {
103
116
  const successURL = (0, getReturnUrl_1.getReturnUrl)(req) || "/";
104
117
  res.redirect(successURL);
105
118
  };
106
- getUserOrError = async (localParams) => {
107
- const sid = this.getSID(localParams);
108
- if (!sid)
109
- return { sid };
110
- const isError = (dataOrError) => {
111
- return Boolean(typeof dataOrError === "string" || (dataOrError && "success" in dataOrError));
112
- };
113
- try {
114
- const userOrErrorCode = await (0, throttledReject_1.throttledAuthCall)(async () => {
115
- return this.opts.getUser(this.validateSid(sid), this.dbo, this.db, (0, getClientRequestIPsInfo_1.getClientRequestIPsInfo)(localParams), localParams);
116
- }, 50);
117
- if (isError(userOrErrorCode)) {
118
- const error = typeof userOrErrorCode === "string" ?
119
- { success: false, code: userOrErrorCode }
120
- : userOrErrorCode;
121
- return {
122
- sid,
123
- error,
124
- };
125
- }
126
- if (sid && userOrErrorCode?.user) {
127
- return { sid, ...userOrErrorCode };
128
- }
129
- return {
130
- sid,
131
- };
132
- }
133
- catch (_err) {
134
- return {
135
- sid,
136
- error: { success: false, code: "server-error" },
137
- };
138
- }
139
- };
119
+ handleGetUser = handleGetUser_1.handleGetUserThrottled.bind(this);
120
+ getUserOrError = getUserOrError_1.getUserOrError.bind(this);
140
121
  init = setupAuthRoutes_1.setupAuthRoutes.bind(this);
141
122
  destroy = () => {
142
123
  const app = this.opts.loginSignupConfig?.app;
@@ -159,7 +140,7 @@ class AuthHandler {
159
140
  * - query params
160
141
  * Based on sidKeyName from auth
161
142
  */
162
- getSID(maybeClientReq) {
143
+ getValidatedSid(maybeClientReq) {
163
144
  if (!maybeClientReq)
164
145
  return undefined;
165
146
  const { sidKeyName } = this;
@@ -174,17 +155,17 @@ class AuthHandler {
174
155
  }
175
156
  return this.validateSid(rawSid);
176
157
  }
177
- else {
178
- const [tokenType, base64Token] = maybeClientReq.httpReq.headers.authorization?.split(" ") ?? [];
179
- let bearerSid;
180
- if (tokenType && base64Token) {
181
- if (tokenType.trim() !== "Bearer") {
182
- throw "Only Bearer Authorization header allowed";
183
- }
184
- bearerSid = Buffer.from(base64Token, "base64").toString();
158
+ const [tokenType, base64Token] = maybeClientReq.httpReq.headers.authorization?.split(" ") ?? [];
159
+ let bearerSid;
160
+ if (tokenType && base64Token) {
161
+ if (tokenType.trim() !== "Bearer") {
162
+ throw "Only Bearer Authorization header allowed";
185
163
  }
186
- return this.validateSid(bearerSid ?? maybeClientReq.httpReq.cookies?.[sidKeyName]);
164
+ bearerSid = Buffer.from(base64Token, "base64").toString();
187
165
  }
166
+ return this.validateSid(
167
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
168
+ bearerSid ?? maybeClientReq.httpReq.cookies?.[sidKeyName]);
188
169
  }
189
170
  /**
190
171
  * Used for logging
@@ -193,18 +174,12 @@ class AuthHandler {
193
174
  if (!clientReq)
194
175
  return undefined;
195
176
  try {
196
- return this.getSID(clientReq);
177
+ return this.getValidatedSid(clientReq);
197
178
  }
198
179
  catch {
199
180
  return undefined;
200
181
  }
201
182
  };
202
- getUserFromRequest = async (clientReq) => {
203
- const sidAndUser = await this.getSidAndUserFromRequest(clientReq);
204
- if (sidAndUser.sid && sidAndUser.user) {
205
- return sidAndUser;
206
- }
207
- };
208
183
  getSidAndUserFromRequest = getSidAndUserFromRequest_1.getSidAndUserFromRequest.bind(this);
209
184
  isNonExpiredSocketSession = (socket, session) => {
210
185
  const hasExpired = Boolean(session && session.expires <= Date.now());
@@ -225,12 +200,13 @@ class AuthHandler {
225
200
  getClientAuth = getClientAuth_1.getClientAuth.bind(this);
226
201
  }
227
202
  exports.AuthHandler = AuthHandler;
228
- const matchesRoute = (shorterRoute, longerRoute) => {
229
- return (shorterRoute &&
230
- longerRoute &&
231
- (shorterRoute === longerRoute ||
232
- (longerRoute.startsWith(shorterRoute) &&
233
- ["/", "?", "#"].includes(longerRoute[shorterRoute.length] ?? ""))));
203
+ const matchesRoute = (baseRoute, fullRoute) => {
204
+ if (!baseRoute || !fullRoute)
205
+ return false;
206
+ if (baseRoute === fullRoute)
207
+ return true;
208
+ const nextChar = fullRoute[baseRoute.length] ?? "";
209
+ return fullRoute.startsWith(baseRoute) && ["/", "?", "#"].includes(nextChar);
234
210
  };
235
211
  exports.matchesRoute = matchesRoute;
236
212
  const parseCookieStr = (cookie_str) => {
@@ -1 +1 @@
1
- {"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":";;;AAAA,qDAAoE;AAGpE,4DAAgE;AAWhE,mDAAgD;AAChD,mCAAgC;AAChC,uDAAoD;AACpD,6EAA0E;AAKjE,wGALA,iDAAuB,OAKA;AAJhC,uDAAoD;AACpD,+EAA4E;AAC5E,6DAA4D;AAG/C,QAAA,eAAe,GAAG;IAC7B,YAAY,EAAE,GAAG;IACjB,SAAS,EAAE,GAAG;IACd,WAAW,EAAE,GAAG;IAChB,qBAAqB,EAAE,GAAG;IAC1B,QAAQ,EAAE,GAAG;IACb,iBAAiB,EAAE,GAAG;CACd,CAAC;AAEE,QAAA,kBAAkB,GAAG;IAChC,EAAE,EAAE,GAAG;IACP,OAAO,EAAE,GAAG;CACJ,CAAC;AAEE,QAAA,sBAAsB,GAAG;IACpC,KAAK,EAAE,QAAQ;IACf,iBAAiB,EAAE,QAAQ;IAC3B,iBAAiB,EAAE,WAAW;IAC9B,kBAAkB,EAAE,WAAW;IAC/B,UAAU,EAAE,YAAY;IACxB,MAAM,EAAE,SAAS;IACjB,UAAU,EAAE,aAAa;IACzB,eAAe,EAAE,iBAAiB;IAClC,QAAQ,EAAE,GAAG;CACL,CAAC;AAEX,MAAa,WAAW;IACH,SAAS,CAAY;IACrB,IAAI,CAAa;IACpC,GAAG,CAAkB;IACrB,EAAE,CAAK;IAEP,YAAY,SAAoB;QAC9B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACzE,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;QAChC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAC1E,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC;QACzB,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;IACzB,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,8BAAsB,CAAC,UAAU,CAAC;IACnE,CAAC;IAED,WAAW,GAAG,CAAC,GAAuB,EAAE,EAAE;QACxC,IAAI,CAAC,GAAG;YAAE,OAAO,SAAS,CAAC;QAC3B,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAC5E,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;IAEF,WAAW,GAAG,CAAC,QAAgB,EAAE,EAAE;QACjC,MAAM,EACJ,KAAK,EACL,MAAM,EAAE,WAAW,EACnB,UAAU,EAAE,eAAe,EAC3B,iBAAiB,GAClB,GAAG,8BAAsB,CAAC;QAC3B,MAAM,SAAS,GAAG;YAChB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,YAAY,IAAI,EAAE,CAAC;YACpD,KAAK;YACL,WAAW;YACX,eAAe;YACf,iBAAiB;SAClB,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC;QAEvC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;YACrC,OAAO,IAAA,oBAAY,EAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,8BAA8B,GAAG,CAC/B,MAAwC,EACxC,cAA8D,EAC9D,EAAE;QACF,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QAChC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;QACpC,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,QAAQ,CAAC;QACjB,CAAC;QAED,MAAM,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,YAAY;QAE/C,IAAI,cAAc,GAA4B;YAC5C,MAAM,EAAE,YAAY;SACrB,CAAC;QAEF,IAAI,OAAO,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;YACtE,cAAc,GAAG,EAAE,OAAO,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,GAAG,CAAC,CAAC,cAAc,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;YACvE,IAAI,IAAI,IAAI,GAAG,EAAE,CAAC;gBAChB,OAAO,CAAC,IAAI,CAAC,8DAA8D,IAAI,MAAM,CAAC,CAAC;YACzF,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GAAG;YACjB,GAAG,cAAc;YACjB,+CAA+C;YAC/C,QAAQ,EAAE,IAAI;YACd,cAAc;YACd,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,QAAiB;YAC3B,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,IAAI,EAAE,CAAC;SACtD,CAAC;QACF,MAAM,UAAU,GAAG,GAAG,CAAC;QACvB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QACpD,MAAM,UAAU,GAAG,IAAA,2BAAY,EAAC,GAAG,CAAC,IAAI,GAAG,CAAC;QAC5C,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC3B,CAAC,CAAC;IAEF,cAAc,GAAG,KAAK,EAAE,WAA8B,EAA8B,EAAE;QACpF,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACrC,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,GAAG,EAAE,CAAC;QAEzB,MAAM,OAAO,GAAG,CACd,WAAgB,EAC4D,EAAE;YAC9E,OAAO,OAAO,CAAC,OAAO,WAAW,KAAK,QAAQ,IAAI,CAAC,WAAW,IAAI,SAAS,IAAI,WAAW,CAAC,CAAC,CAAC;QAC/F,CAAC,CAAC;QACF,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,MAAM,IAAA,mCAAiB,EAAC,KAAK,IAAI,EAAE;gBACzD,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CACtB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EACrB,IAAI,CAAC,GAAoB,EACzB,IAAI,CAAC,EAAE,EACP,IAAA,iDAAuB,EAAC,WAAW,CAAC,EACpC,WAAW,CACZ,CAAC;YACJ,CAAC,EAAE,EAAE,CAAC,CAAC;YAEP,IAAI,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;gBAC7B,MAAM,KAAK,GACT,OAAO,eAAe,KAAK,QAAQ,CAAC,CAAC;oBACnC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE;oBAC3C,CAAC,CAAC,eAAe,CAAC;gBAEpB,OAAO;oBACL,GAAG;oBACH,KAAK;iBACN,CAAC;YACJ,CAAC;YACD,IAAI,GAAG,IAAI,eAAe,EAAE,IAAI,EAAE,CAAC;gBACjC,OAAO,EAAE,GAAG,EAAE,GAAG,eAAe,EAAE,CAAC;YACrC,CAAC;YACD,OAAO;gBACL,GAAG;aACJ,CAAC;QACJ,CAAC;QAAC,OAAO,IAAI,EAAE,CAAC;YACd,OAAO;gBACL,GAAG;gBACH,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE;aAChD,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,GAAG,iCAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAElC,OAAO,GAAG,GAAG,EAAE;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,CAAC;QAC7C,MAAM,EACJ,KAAK,EACL,MAAM,EACN,eAAe,EAAE,iBAAiB,EAClC,QAAQ,EACR,iBAAiB,EACjB,iBAAiB,EACjB,UAAU,GACX,GAAG,8BAAsB,CAAC;QAE3B,IAAA,gCAAkB,EAAC,GAAG,EAAE;YACtB,KAAK;YACL,MAAM;YACN,iBAAiB;YACjB,QAAQ;YACR,iBAAiB;YACjB,iBAAiB;YACjB,UAAU;SACX,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,KAAK,GAAG,aAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEzB;;;;;;OAMG;IACH,MAAM,CAAC,cAA6C;QAClD,IAAI,CAAC,cAAc;YAAE,OAAO,SAAS,CAAC;QACtC,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAC5B,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;YAC1B,MAAM,EAAE,SAAS,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC;YAC5C,MAAM,QAAQ,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC,UAAU,CAAC,CAElE,CAAC;YACd,IAAI,MAAM,GAAG,QAAQ,CAAC;YACtB,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;gBACnE,MAAM,MAAM,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;gBAC1C,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;YAC9B,CAAC;YACD,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,GAC5B,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YACjE,IAAI,SAA6B,CAAC;YAClC,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;gBAC7B,IAAI,SAAS,CAAC,IAAI,EAAE,KAAK,QAAQ,EAAE,CAAC;oBAClC,MAAM,0CAA0C,CAAC;gBACnD,CAAC;gBACD,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC5D,CAAC;YACD,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,IAAI,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;QACrF,CAAC;IACH,CAAC;IAED;;OAEG;IACH,aAAa,GAAG,CAAC,SAAwC,EAAsB,EAAE;QAC/E,IAAI,CAAC,SAAS;YAAE,OAAO,SAAS,CAAC;QACjC,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAChC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC,CAAC;IAEF,kBAAkB,GAAG,KAAK,EAAE,SAA4B,EAAuB,EAAE;QAC/E,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QAClE,IAAI,UAAU,CAAC,GAAG,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;YACtC,OAAO,UAAU,CAAC;QACpB,CAAC;IACH,CAAC,CAAC;IACF,wBAAwB,GAAG,mDAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE/D,yBAAyB,GAAG,CAC1B,MAAoB,EACpB,OAAiC,EACxB,EAAE;QACX,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QACrE,IACE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,YAAY;YACzC,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,EACnD,CAAC;YACD,MAAM,KAAK,GAAG,qBAAqB,CAAC;YACpC,IAAI,UAAU,EAAE,CAAC;gBACf,IAAI,OAAO,EAAE,YAAY,KAAK,UAAU;oBACtC,MAAM,CAAC,IAAI,CAAC,0BAAQ,CAAC,SAAS,EAAE;wBAC9B,YAAY,EAAE,IAAI;wBAClB,KAAK;qBACN,CAAC,CAAC;gBACL,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC;IACzC,CAAC,CAAC;IAEF,aAAa,GAAG,6BAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;CAC1C;AA3OD,kCA2OC;AAEM,MAAM,YAAY,GAAG,CAAC,YAAgC,EAAE,WAAmB,EAAE,EAAE;IACpF,OAAO,CACL,YAAY;QACZ,WAAW;QACX,CAAC,YAAY,KAAK,WAAW;YAC3B,CAAC,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC;gBACnC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CACvE,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,YAAY,gBAQvB;AAEF,MAAM,cAAc,GAAG,CAAC,UAA8B,EAA0B,EAAE;IAChF,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QAClD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,UAAU;SACd,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;SAClB,KAAK,CAAC,GAAG,CAAC;SACV,MAAM,CAAY,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACnC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,IAAK,CAAC,GAAG,KAAK,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAE,CAAC,CAAC;AACX,CAAC,CAAC"}
1
+ {"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"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"}
@@ -223,7 +223,13 @@ export type AuthResultWithSID<SU = SessionUser> = (SU & {
223
223
  export type AuthResult<SU = SessionUser> = SU | undefined | (AllNeverAndOptional<SU> & {
224
224
  preferredLogin?: NonNullable<ClientSchema["auth"]>["preferredLogin"];
225
225
  });
226
- export type AuthResultOrError<SU = SessionUser> = AuthResponse.AuthFailure | AuthResponse.AuthFailure["code"] | AuthResult<SU>;
226
+ export type AuthResultOrError<SU = SessionUser> = AuthResponse.AuthFailure | AuthResponse.AuthFailure["code"] | AuthResult<SU> | {
227
+ type: "new-session";
228
+ /**
229
+ * If provided must login the user. Used for passwordless admin and public users
230
+ */
231
+ session: BasicSession;
232
+ };
227
233
  export type AuthRequestParams<S, SUser extends SessionUser> = {
228
234
  db: DB;
229
235
  dbo: DBOFullyTyped<S>;
@@ -236,11 +242,15 @@ export type AuthConfig<S = void, SUser extends SessionUser = SessionUser> = {
236
242
  */
237
243
  sidKeyName?: string;
238
244
  /**
239
- * Awaited before any auth actions. Failure will stop the auth process
245
+ * Awaited before any auth actions.
246
+ * If session is returned then will set cookie and redirect
247
+ * Failure will stop the auth process
240
248
  */
241
249
  onUseOrSocketConnected?: (sid: string | undefined, client: LoginClientInfo, reqInfo: AuthClientRequest) => Awaitable<void | {
242
250
  error: string;
243
251
  httpCode: 400 | 401 | 403;
252
+ } | {
253
+ session: BasicSession;
244
254
  }>;
245
255
  /**
246
256
  * Required to allow self-managed or managed (by setting up loginSignupConfig) authentication.
@@ -1 +1 @@
1
- {"version":3,"file":"AuthTypes.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AuthTypes.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"AuthTypes.js","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":";;;AA2BA,+CAAuD;AAsUhD,MAAM,eAAe,GAAG,CAAC,UAAkB,EAAE,IAAwB,EAAE,EAAE;IAC9E,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAC/B,OAAO,GAAG,oCAAsB,CAAC,eAAe,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;IAChE,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAC7B,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,GAAG,UAAU,GAAG,oCAAsB,CAAC,UAAU,EAAE,CAAC,CAAC;IACrF,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACjD,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC/C,OAAO,eAAe,CAAC,QAAQ,EAAE,CAAC;AACpC,CAAC,CAAC;AATW,QAAA,eAAe,mBAS1B"}
1
+ {"version":3,"file":"AuthTypes.js","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":";;;AA2BA,+CAAuD;AAgVhD,MAAM,eAAe,GAAG,CAAC,UAAkB,EAAE,IAAwB,EAAE,EAAE;IAC9E,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAC/B,OAAO,GAAG,oCAAsB,CAAC,eAAe,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;IAChE,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAC7B,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,GAAG,UAAU,GAAG,oCAAsB,CAAC,UAAU,EAAE,CAAC,CAAC;IACrF,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACjD,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC/C,OAAO,eAAe,CAAC,QAAQ,EAAE,CAAC;AACpC,CAAC,CAAC;AATW,QAAA,eAAe,mBAS1B"}
@@ -1 +1 @@
1
- {"version":3,"file":"setCatchAllRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setCatchAllRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,CAAqB,MAAM,SAAS,CAAC;AAE5C,OAAO,EAA0B,WAAW,EAAiC,MAAM,gBAAgB,CAAC;AAIpG,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,QAgF1E"}
1
+ {"version":3,"file":"setCatchAllRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setCatchAllRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,CAAqB,MAAM,SAAS,CAAC;AAE5C,OAAO,EAA0B,WAAW,EAAiC,MAAM,gBAAgB,CAAC;AAIpG,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,QAqF1E"}
@@ -6,33 +6,38 @@ const getReturnUrl_1 = require("../utils/getReturnUrl");
6
6
  function setCatchAllRequestHandler(app) {
7
7
  const requestHandlerCatchAll = async (req, res, next) => {
8
8
  const { onGetRequestOK } = this.opts.loginSignupConfig ?? {};
9
- const clientReq = { httpReq: req, res };
10
- const getUser = async () => {
11
- return this.getUserOrError(clientReq);
12
- };
13
- const isLoggedInUser = async () => {
14
- const userInfo = await getUser();
15
- return !!userInfo.user;
16
- };
17
- if (this.prostgles.restApi) {
18
- if (Object.values(this.prostgles.restApi.routes).some((restRoute) => (0, AuthHandler_1.matchesRoute)(restRoute.split("/:")[0], req.path))) {
19
- next();
20
- return;
21
- }
9
+ if (this.prostgles.restApi &&
10
+ Object.values(this.prostgles.restApi.routes).some((restRoute) => (0, AuthHandler_1.matchesRoute)(restRoute.split("/:")[0], req.path))) {
11
+ next();
12
+ return;
22
13
  }
14
+ if ((0, AuthHandler_1.matchesRoute)(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.loginWithProvider, req.path)) {
15
+ next();
16
+ return;
17
+ }
18
+ let newSessionRedirect = false;
23
19
  try {
20
+ const clientReq = { httpReq: req, res };
21
+ const getUser = async () => {
22
+ const res = await this.getUserOrError(clientReq);
23
+ if (res === "new-session-redirect") {
24
+ newSessionRedirect = true;
25
+ throw "new-session-redirect";
26
+ }
27
+ return res;
28
+ };
29
+ const isLoggedInUser = async () => {
30
+ const userInfo = await getUser();
31
+ return !!userInfo.user;
32
+ };
24
33
  const returnURL = (0, getReturnUrl_1.getReturnUrl)(req);
25
- if ((0, AuthHandler_1.matchesRoute)(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.loginWithProvider, req.path)) {
26
- next();
27
- return;
28
- }
29
34
  /**
30
35
  * Requesting a User route
31
36
  */
32
37
  if (this.isUserRoute(req.path)) {
33
38
  /* Check auth. Redirect to login if unauthorized */
34
- const u = await isLoggedInUser();
35
- if (!u) {
39
+ const isLoggedIn = await isLoggedInUser();
40
+ if (!isLoggedIn) {
36
41
  res.redirect(`${AuthHandler_1.AUTH_ROUTES_AND_PARAMS.login}?returnURL=${encodeURIComponent(req.originalUrl)}`);
37
42
  return;
38
43
  }
@@ -65,6 +70,8 @@ function setCatchAllRequestHandler(app) {
65
70
  const errorMessage = typeof error === "string" ? error
66
71
  : error instanceof Error ? error.message
67
72
  : "";
73
+ if (newSessionRedirect)
74
+ return;
68
75
  res.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST).json({
69
76
  error: "Something went wrong when processing your request" +
70
77
  (errorMessage ? ": " + errorMessage : ""),
@@ -1 +1 @@
1
- {"version":3,"file":"setCatchAllRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setCatchAllRequestHandler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"setCatchAllRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setCatchAllRequestHandler.ts"],"names":[],"mappings":"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"}
@@ -4,5 +4,5 @@ import { AuthHandler } from "./AuthHandler";
4
4
  export declare function getClientAuth(this: AuthHandler, clientReq: AuthClientRequest): Promise<{
5
5
  auth: AuthSocketSchema;
6
6
  userData: AuthResultWithSID;
7
- }>;
7
+ } | "new-session-redirect">;
8
8
  //# sourceMappingURL=getClientAuth.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"getClientAuth.d.ts","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,gBAAgB,EAIjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAwB,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACzF,OAAO,EAA0B,WAAW,EAAE,MAAM,eAAe,CAAC;AAEpE,wBAAsB,aAAa,CACjC,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,QAAQ,EAAE,iBAAiB,CAAA;CAAE,CAAC,CAuElE"}
1
+ {"version":3,"file":"getClientAuth.d.ts","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,gBAAgB,EAKjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,iBAAiB,EAEjB,iBAAiB,EAElB,MAAM,aAAa,CAAC;AACrB,OAAO,EAA0B,WAAW,EAAE,MAAM,eAAe,CAAC;AAEpE,wBAAsB,aAAa,CACjC,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,QAAQ,EAAE,iBAAiB,CAAA;CAAE,GAAG,sBAAsB,CAAC,CA+E3F"}
@@ -5,13 +5,19 @@ const prostgles_types_1 = require("prostgles-types");
5
5
  const AuthHandler_1 = require("./AuthHandler");
6
6
  async function getClientAuth(clientReq) {
7
7
  let pathGuard = false;
8
- if (this.opts.loginSignupConfig?.publicRoutes &&
9
- !this.opts.loginSignupConfig.disableSocketAuthGuard) {
8
+ const { loginWithOAuth, signupWithEmail: signupWithEmailAndPassword, localLoginMode, login, publicRoutes, disableSocketAuthGuard, } = this.opts.loginSignupConfig ?? {};
9
+ if (publicRoutes && !disableSocketAuthGuard) {
10
10
  pathGuard = true;
11
11
  /**
12
12
  * Due to SPA nature of some clients, we need to check if the connected client ends up on a protected route
13
13
  */
14
14
  if (clientReq.socket) {
15
+ const getUserFromRequest = async (clientReq) => {
16
+ const sidAndUser = await this.getSidAndUserFromRequest(clientReq);
17
+ if ((0, prostgles_types_1.isObject)(sidAndUser) && sidAndUser.sid && sidAndUser.user) {
18
+ return sidAndUser;
19
+ }
20
+ };
15
21
  const { socket } = clientReq;
16
22
  socket.removeAllListeners(prostgles_types_1.CHANNELS.AUTHGUARD);
17
23
  socket.on(prostgles_types_1.CHANNELS.AUTHGUARD, async (params, cb = (_err, _res) => {
@@ -28,7 +34,7 @@ async function getClientAuth(clientReq) {
28
34
  pathname &&
29
35
  typeof pathname === "string" &&
30
36
  this.isUserRoute(pathname) &&
31
- !(await this.getUserFromRequest({ socket }))) {
37
+ !(await getUserFromRequest({ socket }))) {
32
38
  cb(null, { shouldReload: true });
33
39
  }
34
40
  else {
@@ -43,7 +49,9 @@ async function getClientAuth(clientReq) {
43
49
  }
44
50
  }
45
51
  const userData = await this.getSidAndUserFromRequest(clientReq);
46
- const { loginWithOAuth, signupWithEmail: signupWithEmailAndPassword, localLoginMode, login, } = this.opts.loginSignupConfig ?? {};
52
+ if (userData === "new-session-redirect") {
53
+ return userData;
54
+ }
47
55
  const auth = {
48
56
  providers: getOAuthProviders(loginWithOAuth),
49
57
  signupWithEmailAndPassword: signupWithEmailAndPassword && {
@@ -1 +1 @@
1
- {"version":3,"file":"getClientAuth.js","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getClientAuth.js","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import { AuthHandler } from "./AuthHandler";
2
- import { ExpressReq, LoginParams } from "./AuthTypes";
2
+ import { ExpressReq, LoginParams, type BasicSession } from "./AuthTypes";
3
3
  import { LoginResponseHandler } from "./endpoints/setLoginRequestHandler";
4
4
  export declare function login(this: AuthHandler, req: ExpressReq, res: LoginResponseHandler, loginParams: LoginParams): Promise<LoginResponseHandler | undefined>;
5
+ export declare const getBasicSessionErrorCode: (session: Pick<BasicSession, "expires" | "sid">) => "server-error" | undefined;
5
6
  //# sourceMappingURL=login.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../lib/Auth/login.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAA4C,MAAM,eAAe,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAG1E,wBAAsB,KAAK,CACzB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,oBAAoB,EACzB,WAAW,EAAE,WAAW,6CAmEzB"}
1
+ {"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../lib/Auth/login.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAA4C,MAAM,eAAe,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAG1E,wBAAsB,KAAK,CACzB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,oBAAoB,EACzB,WAAW,EAAE,WAAW,6CAsDzB;AAED,eAAO,MAAM,wBAAwB,YAAa,KAAK,YAAY,EAAE,SAAS,GAAG,KAAK,CAAC,+BAkBtF,CAAC"}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.login = void 0;
3
+ exports.getBasicSessionErrorCode = exports.login = void 0;
4
4
  const AuthHandler_1 = require("./AuthHandler");
5
5
  const throttledReject_1 = require("./utils/throttledReject");
6
6
  async function login(req, res, loginParams) {
@@ -16,18 +16,9 @@ async function login(req, res, loginParams) {
16
16
  if (typeof result === "string" || !result.session) {
17
17
  return result;
18
18
  }
19
- const { sid, expires } = result.session;
20
- if (!sid) {
21
- console.error("Invalid sid");
22
- return "server-error";
23
- }
24
- if (sid && (typeof sid !== "string" || typeof expires !== "number")) {
25
- console.error("Bad login result type. \nExpecting: undefined | null | { sid: string; expires: number }");
26
- return "server-error";
27
- }
28
- if (expires < Date.now()) {
29
- console.error("auth.login() is returning an expired session. Can only login with a session.expires greater than Date.now()");
30
- return "server-error";
19
+ const sessionErrorCode = (0, exports.getBasicSessionErrorCode)(result.session);
20
+ if (sessionErrorCode) {
21
+ return sessionErrorCode;
31
22
  }
32
23
  return result;
33
24
  }, responseThrottle);
@@ -54,4 +45,20 @@ async function login(req, res, loginParams) {
54
45
  this.setCookieAndGoToReturnURLIFSet(loginResponse.session, { req, res });
55
46
  }
56
47
  exports.login = login;
48
+ const getBasicSessionErrorCode = (session) => {
49
+ const { sid, expires } = session;
50
+ if (!sid) {
51
+ console.error("Invalid sid");
52
+ return "server-error";
53
+ }
54
+ if (sid && (typeof sid !== "string" || typeof expires !== "number")) {
55
+ console.error("Bad login result type. \nExpecting: undefined | null | { sid: string; expires: number }");
56
+ return "server-error";
57
+ }
58
+ if (expires < Date.now()) {
59
+ console.error("auth.login() is returning an expired session. Can only login with a session.expires greater than Date.now()");
60
+ return "server-error";
61
+ }
62
+ };
63
+ exports.getBasicSessionErrorCode = getBasicSessionErrorCode;
57
64
  //# sourceMappingURL=login.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"login.js","sourceRoot":"","sources":["../../lib/Auth/login.ts"],"names":[],"mappings":";;;AACA,+CAAsF;AAGtF,6DAA4D;AAErD,KAAK,UAAU,KAAK,CAEzB,GAAe,EACf,GAAyB,EACzB,WAAwB;IAExB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,MAAM,EAAE,gBAAgB,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;IAE7C,MAAM,gBAAgB,GAAG,MAAM,IAAA,mCAAiB,EAAC,KAAK,IAAI,EAAE;QAC1D,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,IAAI,EAAE,CAAC;QACpD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAC3C,OAAO,cAAc,CAAC;QACxB,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,KAAK,CACxB,WAAW,EACX,IAAI,CAAC,GAAoB,EACzB,IAAI,CAAC,EAAE,EACP,IAAA,qCAAuB,EAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAC1C,CAAC;QAEF,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAClD,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;QACxC,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAC7B,OAAO,cAAc,CAAC;QACxB,CAAC;QACD,IAAI,GAAG,IAAI,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,CAAC,EAAE,CAAC;YACpE,OAAO,CAAC,KAAK,CACX,yFAAyF,CAC1F,CAAC;YACF,OAAO,cAAc,CAAC;QACxB,CAAC;QACD,IAAI,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YACzB,OAAO,CAAC,KAAK,CACX,6GAA6G,CAC9G,CAAC;YACF,OAAO,cAAc,CAAC;QACxB,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAErB,MAAM,aAAa,GACjB,OAAO,gBAAgB,KAAK,QAAQ,CAAC,CAAC;QACpC;YACE,OAAO,EAAE,SAAS;YAClB,QAAQ,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAW;SAC9D;QACH,CAAC,CAAC,gBAAgB,CAAC;IAErB,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE,CAAC,CAAC,aAAa,CAAC,OAAO;QAChC,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;QAC5B,GAAG,EAAE,aAAa,CAAC,OAAO,EAAE,GAAG;QAC/B,QAAQ,EAAE,SAAS;KACpB,CAAC,CAAC;IAEH,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;YACpC,OAAO,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC9E,CAAC;QACD,OAAO,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,8BAA8B,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;AAC3E,CAAC;AAvED,sBAuEC"}
1
+ {"version":3,"file":"login.js","sourceRoot":"","sources":["../../lib/Auth/login.ts"],"names":[],"mappings":";;;AACA,+CAAsF;AAGtF,6DAA4D;AAErD,KAAK,UAAU,KAAK,CAEzB,GAAe,EACf,GAAyB,EACzB,WAAwB;IAExB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,MAAM,EAAE,gBAAgB,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;IAE7C,MAAM,gBAAgB,GAAG,MAAM,IAAA,mCAAiB,EAAC,KAAK,IAAI,EAAE;QAC1D,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,IAAI,EAAE,CAAC;QACpD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAC3C,OAAO,cAAc,CAAC;QACxB,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,KAAK,CACxB,WAAW,EACX,IAAI,CAAC,GAAoB,EACzB,IAAI,CAAC,EAAE,EACP,IAAA,qCAAuB,EAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAC1C,CAAC;QAEF,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAClD,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,gBAAgB,GAAG,IAAA,gCAAwB,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAClE,IAAI,gBAAgB,EAAE,CAAC;YACrB,OAAO,gBAAgB,CAAC;QAC1B,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAErB,MAAM,aAAa,GACjB,OAAO,gBAAgB,KAAK,QAAQ,CAAC,CAAC;QACpC;YACE,OAAO,EAAE,SAAS;YAClB,QAAQ,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAW;SAC9D;QACH,CAAC,CAAC,gBAAgB,CAAC;IAErB,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE,CAAC,CAAC,aAAa,CAAC,OAAO;QAChC,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;QAC5B,GAAG,EAAE,aAAa,CAAC,OAAO,EAAE,GAAG;QAC/B,QAAQ,EAAE,SAAS;KACpB,CAAC,CAAC;IAEH,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;YACpC,OAAO,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC9E,CAAC;QACD,OAAO,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,8BAA8B,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;AAC3E,CAAC;AA1DD,sBA0DC;AAEM,MAAM,wBAAwB,GAAG,CAAC,OAA8C,EAAE,EAAE;IACzF,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACjC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC7B,OAAO,cAAc,CAAC;IACxB,CAAC;IACD,IAAI,GAAG,IAAI,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,CAAC,EAAE,CAAC;QACpE,OAAO,CAAC,KAAK,CACX,yFAAyF,CAC1F,CAAC;QACF,OAAO,cAAc,CAAC;IACxB,CAAC;IACD,IAAI,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QACzB,OAAO,CAAC,KAAK,CACX,6GAA6G,CAC9G,CAAC;QACF,OAAO,cAAc,CAAC;IACxB,CAAC;AACH,CAAC,CAAC;AAlBW,QAAA,wBAAwB,4BAkBnC"}
@@ -1 +1 @@
1
- {"version":3,"file":"setupAuthRoutes.d.ts","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAA4C,MAAM,eAAe,CAAC;AAStF,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,QAgFhD"}
1
+ {"version":3,"file":"setupAuthRoutes.d.ts","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAA4C,MAAM,eAAe,CAAC;AAStF,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,QAyFhD"}
@@ -30,12 +30,17 @@ function setupAuthRoutes() {
30
30
  if (onUseOrSocketConnected) {
31
31
  const prostglesUseMiddleware = async (req, res, next) => {
32
32
  const reqInfo = { httpReq: req, res };
33
- const errorInfo = await onUseOrSocketConnected(this.getSIDNoError(reqInfo), (0, AuthHandler_1.getClientRequestIPsInfo)(reqInfo), reqInfo);
34
- if (errorInfo) {
35
- const { error, httpCode } = errorInfo;
33
+ const errorInfoOrSession = await onUseOrSocketConnected(this.getSIDNoError(reqInfo), (0, AuthHandler_1.getClientRequestIPsInfo)(reqInfo), reqInfo);
34
+ if (errorInfoOrSession && "error" in errorInfoOrSession) {
35
+ const { error, httpCode } = errorInfoOrSession;
36
36
  res.status(httpCode).json({ error });
37
37
  return;
38
38
  }
39
+ if (errorInfoOrSession && "session" in errorInfoOrSession) {
40
+ const { session } = errorInfoOrSession;
41
+ this.validateSessionAndSetCookie(session, { req, res });
42
+ return;
43
+ }
39
44
  next();
40
45
  };
41
46
  (0, upsertNamedExpressMiddleware_1.upsertNamedExpressMiddleware)(app, prostglesUseMiddleware, "prostglesonUseOrSocketConnected");
@@ -48,6 +53,9 @@ function setupAuthRoutes() {
48
53
  next,
49
54
  getUser: async () => {
50
55
  const userOrErr = await this.getUserOrError({ httpReq: req, res });
56
+ if (userOrErr === "new-session-redirect") {
57
+ throw "new-session-redirect";
58
+ }
51
59
  if (userOrErr.error) {
52
60
  res.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST).json(userOrErr.error);
53
61
  throw userOrErr.error;