prostgles-server 4.2.200 → 4.2.202
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.
- package/dist/Auth/AuthHandler.d.ts +4 -3
- package/dist/Auth/AuthHandler.d.ts.map +1 -1
- package/dist/Auth/AuthHandler.js +4 -1
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +12 -6
- package/dist/Auth/AuthTypes.d.ts.map +1 -1
- package/dist/Auth/authProviders/setOAuthProviders.js +1 -1
- package/dist/Auth/authProviders/setOAuthProviders.js.map +1 -1
- package/dist/Auth/endpoints/setCatchAllRequestHandler.js +6 -4
- package/dist/Auth/endpoints/setCatchAllRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setConfirmEmailRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setConfirmEmailRequestHandler.js +3 -0
- package/dist/Auth/endpoints/setConfirmEmailRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.d.ts +7 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.js +42 -3
- package/dist/Auth/endpoints/setLoginRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setMagicLinkRequestHandler.d.ts +4 -4
- package/dist/Auth/endpoints/setMagicLinkRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setMagicLinkRequestHandler.js.map +1 -1
- package/dist/Auth/utils/getSidAndUserFromRequest.d.ts.map +1 -1
- package/dist/Auth/utils/getSidAndUserFromRequest.js +3 -5
- package/dist/Auth/utils/getSidAndUserFromRequest.js.map +1 -1
- package/dist/DboBuilder/DboBuilderTypes.d.ts +2 -4
- package/dist/DboBuilder/DboBuilderTypes.d.ts.map +1 -1
- package/lib/Auth/AuthHandler.ts +9 -3
- package/lib/Auth/AuthTypes.ts +19 -9
- package/lib/Auth/authProviders/setOAuthProviders.ts +1 -1
- package/lib/Auth/endpoints/setCatchAllRequestHandler.ts +6 -6
- package/lib/Auth/endpoints/setConfirmEmailRequestHandler.ts +4 -0
- package/lib/Auth/endpoints/setLoginRequestHandler.ts +61 -6
- package/lib/Auth/endpoints/setMagicLinkRequestHandler.ts +5 -8
- package/lib/Auth/utils/getSidAndUserFromRequest.ts +4 -6
- package/lib/DboBuilder/DboBuilderTypes.ts +2 -4
- package/package.json +1 -1
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { AuthSocketSchema } from "prostgles-types";
|
|
2
2
|
import { PRGLIOSocket } from "../DboBuilder/DboBuilder";
|
|
3
3
|
import { DB, DBHandlerServer, Prostgles } from "../Prostgles";
|
|
4
|
-
import { Auth, AuthClientRequest, AuthResult, AuthResultWithSID, BasicSession, ExpressReq,
|
|
4
|
+
import { Auth, AuthClientRequest, AuthResult, AuthResultWithSID, BasicSession, ExpressReq, LoginClientInfo, LoginParams, LoginResponse } from "./AuthTypes";
|
|
5
5
|
import { getClientRequestIPsInfo } from "./utils/getClientRequestIPsInfo";
|
|
6
|
+
import { LoginResponseHandler } from "./endpoints/setLoginRequestHandler";
|
|
6
7
|
export { getClientRequestIPsInfo };
|
|
7
8
|
export declare const HTTP_FAIL_CODES: {
|
|
8
9
|
readonly UNAUTHORIZED: 401;
|
|
@@ -44,14 +45,14 @@ export declare class AuthHandler {
|
|
|
44
45
|
expires: number;
|
|
45
46
|
}, r: {
|
|
46
47
|
req: ExpressReq;
|
|
47
|
-
res:
|
|
48
|
+
res: LoginResponseHandler;
|
|
48
49
|
}) => void;
|
|
49
50
|
getUserAndHandleError: (localParams: AuthClientRequest) => Promise<AuthResultWithSID>;
|
|
50
51
|
init: () => Promise<void>;
|
|
51
52
|
destroy: () => void;
|
|
52
53
|
throttledFunc: <T>(func: () => Promise<T>, throttle?: number) => Promise<T>;
|
|
53
54
|
loginThrottledAndValidate: (params: LoginParams, client: LoginClientInfo) => Promise<LoginResponse>;
|
|
54
|
-
loginThrottledAndSetCookie: (req: ExpressReq, res:
|
|
55
|
+
loginThrottledAndSetCookie: (req: ExpressReq, res: LoginResponseHandler, loginParams: LoginParams) => Promise<LoginResponseHandler | undefined>;
|
|
55
56
|
/**
|
|
56
57
|
* Will return first sid value found in:
|
|
57
58
|
* Bearer header
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EACL,IAAI,EACJ,iBAAiB,EACjB,UAAU,EACV,iBAAiB,EACjB,YAAY,EACZ,UAAU,EAEV,eAAe,EACf,WAAW,EACX,aAAa,EACd,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAI1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1E,OAAO,EAAE,uBAAuB,EAAE,CAAC;AACnC,eAAO,MAAM,eAAe;;;;;;;CAOlB,CAAC;AAEX,eAAO,MAAM,kBAAkB;;;CAGrB,CAAC;AAEX,eAAO,MAAM,sBAAsB;;;;;;;;;;;;CAYzB,CAAC;AAEX,qBAAa,WAAW;IACtB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IAC9B,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,YAAY,UAAW,MAAM,GAAG,SAAS,mBAAmB,MAAM,8BAQhE;IAEF,WAAW,aAAc,MAAM,aAa7B;IAEF,8BAA8B,WACpB;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KACrC;QAAE,GAAG,EAAE,UAAU,CAAC;QAAC,GAAG,EAAE,oBAAoB,CAAA;KAAE,UAkCjD;IAEF,qBAAqB,gBAAuB,iBAAiB,KAAG,QAAQ,iBAAiB,CAAC,CAiCxF;IAEF,IAAI,sBAA8B;IAElC,OAAO,aAwBL;IAEF,aAAa,+DA+BX;IAEF,yBAAyB,WACf,WAAW,UACX,eAAe,KACtB,QAAQ,aAAa,CAAC,CA+BvB;IAEF,0BAA0B,QACnB,UAAU,OACV,oBAAoB,eACZ,WAAW,+CA0BxB;IAEF;;;;;;OAMG;IACH,MAAM,CAAC,cAAc,EAAE,iBAAiB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;IA0CzE;;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,CAcR;IAEF,aAAa,cACA,iBAAiB;cACX,gBAAgB;kBAAY,iBAAiB;OA6D9D;CACH"}
|
package/dist/Auth/AuthHandler.js
CHANGED
|
@@ -222,7 +222,10 @@ class AuthHandler {
|
|
|
222
222
|
const start = Date.now();
|
|
223
223
|
const errCodeOrSession = await this.loginThrottledAndValidate(loginParams, (0, getClientRequestIPsInfo_1.getClientRequestIPsInfo)({ httpReq: req, res }));
|
|
224
224
|
const loginResponse = typeof errCodeOrSession === "string" ?
|
|
225
|
-
{
|
|
225
|
+
{
|
|
226
|
+
session: undefined,
|
|
227
|
+
response: { success: false, code: errCodeOrSession },
|
|
228
|
+
}
|
|
226
229
|
: errCodeOrSession;
|
|
227
230
|
await this.prostgles.opts.onLog?.({
|
|
228
231
|
type: "auth",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"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"}
|
package/dist/Auth/AuthTypes.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ import type { Profile as FacebookProfile, StrategyOptions as FacebookStrategy }
|
|
|
5
5
|
import type { Profile as GitHubProfile, StrategyOptions as GitHubStrategy } from "passport-github2";
|
|
6
6
|
import type { Profile as GoogleProfile, StrategyOptions as GoogleStrategy } from "passport-google-oauth20";
|
|
7
7
|
import type { MicrosoftStrategyOptions } from "passport-microsoft";
|
|
8
|
-
import { AnyObject,
|
|
8
|
+
import { AnyObject, AuthFailure, AuthRequest, AuthResponse, FieldFilter, IdentityProvider, UserLike } from "prostgles-types";
|
|
9
9
|
import { DBOFullyTyped } from "../DBSchemaBuilder";
|
|
10
10
|
import { PRGLIOSocket } from "../DboBuilder/DboBuilderTypes";
|
|
11
11
|
import { DB } from "../Prostgles";
|
|
@@ -198,6 +198,10 @@ export type SessionUser<ServerUser extends UserLike = UserLike, ClientUser exten
|
|
|
198
198
|
* id and type values will be available in the prostgles.user session variable in postgres
|
|
199
199
|
* */
|
|
200
200
|
user: ServerUser;
|
|
201
|
+
/**
|
|
202
|
+
* If true, this is a public/non registered user that can login. Used in UI
|
|
203
|
+
*/
|
|
204
|
+
isAnonymous?: boolean;
|
|
201
205
|
/**
|
|
202
206
|
* Controls which fields from user are available in postgres session variable
|
|
203
207
|
*/
|
|
@@ -207,14 +211,14 @@ export type SessionUser<ServerUser extends UserLike = UserLike, ClientUser exten
|
|
|
207
211
|
*/
|
|
208
212
|
clientUser: ClientUser;
|
|
209
213
|
};
|
|
214
|
+
type AllNeverAndOptional<T> = {
|
|
215
|
+
[P in keyof T]?: never;
|
|
216
|
+
};
|
|
210
217
|
export type AuthResultWithSID<SU = SessionUser> = (SU & {
|
|
211
218
|
sid: string;
|
|
212
|
-
}) | {
|
|
219
|
+
}) | (AllNeverAndOptional<SU> & {
|
|
213
220
|
sid: string | undefined;
|
|
214
|
-
|
|
215
|
-
sessionFields?: never;
|
|
216
|
-
clientUser?: never;
|
|
217
|
-
};
|
|
221
|
+
});
|
|
218
222
|
export type AuthResult<SU = SessionUser> = SU | undefined;
|
|
219
223
|
export type AuthResultOrError<SU = SessionUser> = AuthFailure["code"] | AuthResult<SU>;
|
|
220
224
|
export type AuthRequestParams<S, SUser extends SessionUser> = {
|
|
@@ -262,6 +266,8 @@ export type LoginResponse = {
|
|
|
262
266
|
} | AuthResponse.PasswordLoginFailure["code"] | AuthResponse.MagicLinkAuthFailure["code"];
|
|
263
267
|
export type LoginParams = ({
|
|
264
268
|
type: "username";
|
|
269
|
+
signupType: undefined | EmailProvider["signupType"];
|
|
270
|
+
magicLinkUrlPath: undefined | string;
|
|
265
271
|
} & AuthRequest.LoginData) | ({
|
|
266
272
|
type: "provider";
|
|
267
273
|
} & AuthProviderUserData);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthTypes.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnE,OAAO,IAAI,MAAM,uBAAuB,CAAC;AACzC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,KAAK,EACV,OAAO,IAAI,eAAe,EAC1B,eAAe,IAAI,gBAAgB,EACpC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,OAAO,IAAI,aAAa,EAAE,eAAe,IAAI,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACpG,OAAO,KAAK,EACV,OAAO,IAAI,aAAa,EACxB,eAAe,IAAI,cAAc,EAClC,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EACL,SAAS,EACT,WAAW,EACX,
|
|
1
|
+
{"version":3,"file":"AuthTypes.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,9 +59,9 @@ function setOAuthProviders(app, registrations) {
|
|
|
59
59
|
}
|
|
60
60
|
else {
|
|
61
61
|
this.loginThrottledAndSetCookie(req, res, {
|
|
62
|
+
...authInfo,
|
|
62
63
|
type: "provider",
|
|
63
64
|
provider: providerName,
|
|
64
|
-
...authInfo,
|
|
65
65
|
}).catch((e) => {
|
|
66
66
|
res.status(500).json((0, dboBuilderUtils_1.getErrorAsObject)(e));
|
|
67
67
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setOAuthProviders.js","sourceRoot":"","sources":["../../../lib/Auth/authProviders/setOAuthProviders.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"setOAuthProviders.js","sourceRoot":"","sources":["../../../lib/Auth/authProviders/setOAuthProviders.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,10 +66,12 @@ function setCatchAllRequestHandler(app) {
|
|
|
66
66
|
return;
|
|
67
67
|
/** If Logged in and requesting login then redirect to main page */
|
|
68
68
|
}
|
|
69
|
-
else if (this.matchesRoute(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.login, req.path)
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
69
|
+
else if (this.matchesRoute(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.login, req.path)) {
|
|
70
|
+
const { user, isAnonymous } = await getUser();
|
|
71
|
+
if (user && !isAnonymous) {
|
|
72
|
+
res.redirect("/");
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
73
75
|
}
|
|
74
76
|
onGetRequestOK?.(req, res, {
|
|
75
77
|
getUser,
|
|
@@ -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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setConfirmEmailRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setConfirmEmailRequestHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAA0B,WAAW,EAAmB,MAAM,gBAAgB,CAAC;AACtF,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,CAAC,MAAM,SAAS,CAAC;AAExB,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,WAAW,EACjB,eAAe,EAAE,OAAO,CACtB,QAAQ,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EAC/C;IAAE,UAAU,EAAE,cAAc,CAAA;CAAE,CAC/B,EACD,GAAG,EAAE,CAAC,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"setConfirmEmailRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setConfirmEmailRequestHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAA0B,WAAW,EAAmB,MAAM,gBAAgB,CAAC;AACtF,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,CAAC,MAAM,SAAS,CAAC;AAExB,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,WAAW,EACjB,eAAe,EAAE,OAAO,CACtB,QAAQ,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EAC/C;IAAE,UAAU,EAAE,cAAc,CAAA;CAAE,CAC/B,EACD,GAAG,EAAE,CAAC,CAAC,OAAO,QAwCf"}
|
|
@@ -21,6 +21,9 @@ function setConfirmEmailRequestHandler(emailAuthConfig, app) {
|
|
|
21
21
|
.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST)
|
|
22
22
|
.json({ success: false, code: "something-went-wrong" });
|
|
23
23
|
}
|
|
24
|
+
/**
|
|
25
|
+
* This approach requires correct handling in setCatchAllRequestHandler to not redirect user.type=public res.redirect("/");
|
|
26
|
+
*/
|
|
24
27
|
if (response.redirect_to) {
|
|
25
28
|
return res.redirect(response.redirect_to);
|
|
26
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setConfirmEmailRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setConfirmEmailRequestHandler.ts"],"names":[],"mappings":";;;AAEA,gDAAsF;AAEtF,8EAA2E;AAG3E,SAAgB,6BAA6B,CAE3C,eAGC,EACD,GAAc;IAEd,MAAM,cAAc,GAAG,KAAK,EAC1B,GAAY,EACZ,GAAqD,EACrD,EAAE;QACF,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC;YACH,IAAI,CAAC,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;gBAClC,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;YAC7F,CAAC;YACD,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,GAAG,IAAA,iDAAuB,EAAC,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YAClF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,IAAI,EAAE,CACnD,eAAe,CAAC,mBAAmB,CAAC;gBAClC,gBAAgB,EAAE,EAAE;gBACpB,UAAU;gBACV,GAAG,EAAE,OAAO;aACb,CAAC,CACH,CAAC;YACF,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBACjC,OAAO,GAAG;qBACP,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC;qBACnC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC,CAAC;YAC5D,CAAC;
|
|
1
|
+
{"version":3,"file":"setConfirmEmailRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setConfirmEmailRequestHandler.ts"],"names":[],"mappings":";;;AAEA,gDAAsF;AAEtF,8EAA2E;AAG3E,SAAgB,6BAA6B,CAE3C,eAGC,EACD,GAAc;IAEd,MAAM,cAAc,GAAG,KAAK,EAC1B,GAAY,EACZ,GAAqD,EACrD,EAAE;QACF,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC;YACH,IAAI,CAAC,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;gBAClC,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;YAC7F,CAAC;YACD,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,GAAG,IAAA,iDAAuB,EAAC,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YAClF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,IAAI,EAAE,CACnD,eAAe,CAAC,mBAAmB,CAAC;gBAClC,gBAAgB,EAAE,EAAE;gBACpB,UAAU;gBACV,GAAG,EAAE,OAAO;aACb,CAAC,CACH,CAAC;YACF,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBACjC,OAAO,GAAG;qBACP,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC;qBACnC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC,CAAC;YAC5D,CAAC;YAED;;eAEG;YACH,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;gBACzB,OAAO,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC5C,CAAC;YACD,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrB,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACZ,GAAG;iBACA,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC;iBACnC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAC;QACxF,CAAC;IACH,CAAC,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,oCAAsB,CAAC,wBAAwB,EAAE,cAAc,CAAC,CAAC;AAC3E,CAAC;AA9CD,sEA8CC"}
|
|
@@ -1,4 +1,10 @@
|
|
|
1
|
-
import e from "express";
|
|
1
|
+
import e, { Response } from "express";
|
|
2
2
|
import { AuthHandler } from "../AuthHandler";
|
|
3
|
+
import { BasicSession } from "../AuthTypes";
|
|
4
|
+
import { AuthFailure, AuthResponse } from "prostgles-types";
|
|
5
|
+
export type LoginResponseHandler = Response<{
|
|
6
|
+
session: BasicSession;
|
|
7
|
+
response?: AuthResponse.PasswordLoginSuccess | AuthResponse.MagicLinkAuthSuccess;
|
|
8
|
+
} | AuthFailure | AuthResponse.PasswordLoginFailure | AuthResponse.MagicLinkAuthFailure>;
|
|
3
9
|
export declare function setLoginRequestHandler(this: AuthHandler, app: e.Express): void;
|
|
4
10
|
//# sourceMappingURL=setLoginRequestHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setLoginRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"setLoginRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAA0B,WAAW,EAAmB,MAAM,gBAAgB,CAAC;AACtF,OAAO,EAAE,YAAY,EAAe,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,WAAW,EAAe,YAAY,EAAuB,MAAM,iBAAiB,CAAC;AAE9F,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CACvC;IACE,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,CAAC,EAAE,YAAY,CAAC,oBAAoB,GAAG,YAAY,CAAC,oBAAoB,CAAC;CAClF,GACD,WAAW,GACX,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,CACpC,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,QAwBvE"}
|
|
@@ -2,19 +2,58 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.setLoginRequestHandler = void 0;
|
|
4
4
|
const AuthHandler_1 = require("../AuthHandler");
|
|
5
|
+
const prostgles_types_1 = require("prostgles-types");
|
|
5
6
|
function setLoginRequestHandler(app) {
|
|
7
|
+
const { registrations } = this.opts.expressConfig ?? {};
|
|
6
8
|
app.post(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.login, async (req, res) => {
|
|
9
|
+
const loginData = parseLoginData(req.body);
|
|
10
|
+
if ("error" in loginData) {
|
|
11
|
+
return res
|
|
12
|
+
.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST)
|
|
13
|
+
.json({ success: false, code: "something-went-wrong", message: loginData.error });
|
|
14
|
+
}
|
|
7
15
|
try {
|
|
8
16
|
const loginParams = {
|
|
17
|
+
...loginData,
|
|
18
|
+
magicLinkUrlPath: registrations?.websiteUrl &&
|
|
19
|
+
`${registrations.websiteUrl}/${AuthHandler_1.AUTH_ROUTES_AND_PARAMS.magicLinksRoute}`,
|
|
20
|
+
signupType: registrations?.email?.signupType,
|
|
9
21
|
type: "username",
|
|
10
|
-
...req.body,
|
|
11
22
|
};
|
|
12
23
|
await this.loginThrottledAndSetCookie(req, res, loginParams);
|
|
13
24
|
}
|
|
14
|
-
catch (
|
|
15
|
-
res.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST).json({ error });
|
|
25
|
+
catch (_error) {
|
|
26
|
+
res.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST).json({ success: false, code: "server-error" });
|
|
16
27
|
}
|
|
17
28
|
});
|
|
18
29
|
}
|
|
19
30
|
exports.setLoginRequestHandler = setLoginRequestHandler;
|
|
31
|
+
const parseLoginData = (bodyData) => {
|
|
32
|
+
const loginData = {
|
|
33
|
+
username: "",
|
|
34
|
+
remember_me: !!bodyData?.remember_me,
|
|
35
|
+
};
|
|
36
|
+
["username", "password", "totp_token", "totp_recovery_code"].forEach((prop) => {
|
|
37
|
+
const valOrError = getStringOrUndefined(bodyData[prop], prop);
|
|
38
|
+
if ((0, prostgles_types_1.isObject)(valOrError)) {
|
|
39
|
+
return valOrError;
|
|
40
|
+
}
|
|
41
|
+
if (prop === "username") {
|
|
42
|
+
if (!(0, prostgles_types_1.isDefined)(valOrError)) {
|
|
43
|
+
return { error: "username error: Expected non-empty string" };
|
|
44
|
+
}
|
|
45
|
+
loginData[prop] = valOrError;
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
loginData[prop] = valOrError;
|
|
49
|
+
}
|
|
50
|
+
});
|
|
51
|
+
return loginData;
|
|
52
|
+
};
|
|
53
|
+
const getStringOrUndefined = (val, propName) => {
|
|
54
|
+
const isStringOrUndefined = typeof val === "string" || val === undefined;
|
|
55
|
+
if (!isStringOrUndefined)
|
|
56
|
+
return { error: `${propName} error: Expected string or undefined` };
|
|
57
|
+
return val;
|
|
58
|
+
};
|
|
20
59
|
//# sourceMappingURL=setLoginRequestHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setLoginRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":";;;AACA,gDAAsF;
|
|
1
|
+
{"version":3,"file":"setLoginRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":";;;AACA,gDAAsF;AAEtF,qDAA8F;AAY9F,SAAgB,sBAAsB,CAAoB,GAAc;IACtE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC;IACxD,GAAG,CAAC,IAAI,CAAC,oCAAsB,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,GAAyB,EAAE,EAAE;QAC9E,MAAM,SAAS,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,OAAO,IAAI,SAAS,EAAE,CAAC;YACzB,OAAO,GAAG;iBACP,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC;iBACnC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC;QACtF,CAAC;QACD,IAAI,CAAC;YACH,MAAM,WAAW,GAAgB;gBAC/B,GAAG,SAAS;gBACZ,gBAAgB,EACd,aAAa,EAAE,UAAU;oBACzB,GAAG,aAAa,CAAC,UAAU,IAAI,oCAAsB,CAAC,eAAe,EAAE;gBACzE,UAAU,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU;gBAC5C,IAAI,EAAE,UAAU;aACjB,CAAC;YAEF,MAAM,IAAI,CAAC,0BAA0B,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;QAC/D,CAAC;QAAC,OAAO,MAAM,EAAE,CAAC;YAChB,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC;QACzF,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAxBD,wDAwBC;AAED,MAAM,cAAc,GAAG,CAAC,QAAa,EAA6C,EAAE;IAClF,MAAM,SAAS,GAA0B;QACvC,QAAQ,EAAE,EAAE;QACZ,WAAW,EAAE,CAAC,CAAC,QAAQ,EAAE,WAAW;KACrC,CAAC;IAED,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,oBAAoB,CAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACvF,MAAM,UAAU,GAAG,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;QAC9D,IAAI,IAAA,0BAAQ,EAAC,UAAU,CAAC,EAAE,CAAC;YACzB,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YACxB,IAAI,CAAC,IAAA,2BAAS,EAAC,UAAU,CAAC,EAAE,CAAC;gBAC3B,OAAO,EAAE,KAAK,EAAE,2CAA2C,EAAE,CAAC;YAChE,CAAC;YACD,SAAS,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;QAC/B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAC3B,GAAQ,EACR,QAAgB,EACwB,EAAE;IAC1C,MAAM,mBAAmB,GAAG,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,SAAS,CAAC;IACzE,IAAI,CAAC,mBAAmB;QAAE,OAAO,EAAE,KAAK,EAAE,GAAG,QAAQ,sCAAsC,EAAE,CAAC;IAC9F,OAAO,GAAG,CAAC;AACb,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import e
|
|
2
|
-
import { ExpressConfig, ExpressReq, SessionUser } from "../AuthTypes";
|
|
3
|
-
import { AuthResponse } from "prostgles-types";
|
|
1
|
+
import e from "express";
|
|
4
2
|
import { AuthHandler } from "../AuthHandler";
|
|
5
|
-
|
|
3
|
+
import { ExpressConfig, ExpressReq, SessionUser } from "../AuthTypes";
|
|
4
|
+
import { LoginResponseHandler } from "./setLoginRequestHandler";
|
|
5
|
+
export declare function setMagicLinkRequestHandler(this: AuthHandler, onMagicLink: Required<ExpressConfig<void, SessionUser>>["onMagicLink"], app: e.Express): (req: ExpressReq, res: LoginResponseHandler) => Promise<void>;
|
|
6
6
|
//# sourceMappingURL=setMagicLinkRequestHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setMagicLinkRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"setMagicLinkRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,SAAS,CAAC;AAExB,OAAO,EAEL,WAAW,EAGZ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,EACtE,GAAG,EAAE,CAAC,CAAC,OAAO,SAEa,UAAU,OAAO,oBAAoB,mBA+BjE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setMagicLinkRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkRequestHandler.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"setMagicLinkRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkRequestHandler.ts"],"names":[],"mappings":";;;AAEA,gDAKwB;AAIxB,SAAgB,0BAA0B,CAExC,WAAsE,EACtE,GAAc;IAEd,MAAM,MAAM,GAAG,KAAK,EAAE,GAAe,EAAE,GAAyB,EAAE,EAAE;QAClE,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAE1B,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,CAAC,EAAE,EAAE,CAAC;YAClC,GAAG;iBACA,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC;iBACnC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAC;QAC3F,CAAC;aAAM,CAAC;YACN,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,IAAI,EAAE;oBACnD,OAAO,WAAW,CAChB,EAAE,EACF,IAAI,CAAC,GAAoB,EACzB,IAAI,CAAC,EAAE,EACP,IAAA,qCAAuB,EAAC,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAC/C,CAAC;gBACJ,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;oBACtB,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBACnE,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,8BAA8B,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;gBACtE,CAAC;YACH,CAAC;YAAC,OAAO,EAAE,EAAE,CAAC;gBACZ,GAAG;qBACA,MAAM,CAAC,6BAAe,CAAC,YAAY,CAAC;qBACpC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IACF,GAAG,CAAC,GAAG,CAAC,oCAAsB,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;IAC/D,OAAO,MAAM,CAAC;AAChB,CAAC;AApCD,gEAoCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSidAndUserFromRequest.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/getSidAndUserFromRequest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAA2B,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEpE;;;GAGG;AACH,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"getSidAndUserFromRequest.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/getSidAndUserFromRequest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAA2B,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEpE;;;GAGG;AACH,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC,iBAAiB,CAAC,CA0D5B"}
|
|
@@ -12,13 +12,12 @@ async function getSidAndUserFromRequest(clientReq) {
|
|
|
12
12
|
*/
|
|
13
13
|
const getSession = this.opts.cacheSession?.getSession;
|
|
14
14
|
if (clientReq.socket && getSession && clientReq.socket.__prglCache) {
|
|
15
|
-
const { session,
|
|
15
|
+
const { session, ...userData } = clientReq.socket.__prglCache;
|
|
16
16
|
const isValid = this.isNonExpiredSocketSession(clientReq.socket, session);
|
|
17
17
|
if (isValid) {
|
|
18
18
|
return {
|
|
19
|
+
...userData,
|
|
19
20
|
sid: session.sid,
|
|
20
|
-
user,
|
|
21
|
-
clientUser,
|
|
22
21
|
};
|
|
23
22
|
}
|
|
24
23
|
else
|
|
@@ -41,9 +40,8 @@ async function getSidAndUserFromRequest(clientReq) {
|
|
|
41
40
|
const session = await getSession(sid, this.dbo, this.db);
|
|
42
41
|
if (session && session.expires && clientInfo?.user) {
|
|
43
42
|
clientReq.socket.__prglCache = {
|
|
43
|
+
...clientInfo,
|
|
44
44
|
session,
|
|
45
|
-
user: clientInfo.user,
|
|
46
|
-
clientUser: clientInfo.clientUser,
|
|
47
45
|
};
|
|
48
46
|
}
|
|
49
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSidAndUserFromRequest.js","sourceRoot":"","sources":["../../../lib/Auth/utils/getSidAndUserFromRequest.ts"],"names":[],"mappings":";;;AACA,gDAAsE;AAGtE;;;GAGG;AACI,KAAK,UAAU,wBAAwB,CAE5C,SAA4B;IAE5B;;OAEG;IACH,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC;IACtD,IAAI,SAAS,CAAC,MAAM,IAAI,UAAU,IAAI,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QACnE,MAAM,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"getSidAndUserFromRequest.js","sourceRoot":"","sources":["../../../lib/Auth/utils/getSidAndUserFromRequest.ts"],"names":[],"mappings":";;;AACA,gDAAsE;AAGtE;;;GAGG;AACI,KAAK,UAAU,wBAAwB,CAE5C,SAA4B;IAE5B;;OAEG;IACH,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC;IACtD,IAAI,SAAS,CAAC,MAAM,IAAI,UAAU,IAAI,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QACnE,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC;QAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC1E,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO;gBACL,GAAG,QAAQ;gBACX,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC;QACJ,CAAC;;YACC,OAAO;gBACL,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC;IACN,CAAC;IAED;;OAEG;IACH,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,IAAI,EAAE;QACjD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAE9B,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACnC,MAAM,eAAe,GACnB,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CACjB,MAAM,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,GAAoB,EAAE,IAAI,CAAC,EAAE,EAAE,IAAA,qCAAuB,EAAC,SAAS,CAAC,CAAC,CAC3F,CAAC;QACJ,IAAI,OAAO,eAAe,KAAK,QAAQ;YAAE,MAAM,eAAe,CAAC;QAC/D,MAAM,UAAU,GAAG,eAAe,CAAC;QACnC,IAAI,UAAU,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACnC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,GAAoB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YAC1E,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,IAAI,UAAU,EAAE,IAAI,EAAE,CAAC;gBACnD,SAAS,CAAC,MAAM,CAAC,WAAW,GAAG;oBAC7B,GAAG,UAAU;oBACb,OAAO;iBACR,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,UAAU,EAAE,IAAI,IAAI,GAAG,EAAE,CAAC;YAC5B,OAAO,EAAE,GAAG,EAAE,GAAG,UAAU,EAAE,CAAC;QAChC,CAAC;QAED,OAAO,EAAE,GAAG,EAAE,CAAC;IACjB,CAAC,EAAE,GAAG,CAAC,CAAC;IAER,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,eAAe;QACxB,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;QAChC,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,QAAQ,EAAE,SAAS,CAAC,MAAM,EAAE,EAAE;KAC/B,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AA7DD,4DA6DC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as pgPromise from "pg-promise";
|
|
2
2
|
import { AnyObject, ClientSchema, ColumnInfo, DbJoinMaker, EXISTS_KEY, RawJoinPath, SQLHandler, TableInfo as TInfo, UserLike } from "prostgles-types";
|
|
3
|
-
import { AuthClientRequest, BasicSession } from "../Auth/AuthTypes";
|
|
3
|
+
import { AuthClientRequest, BasicSession, SessionUser } from "../Auth/AuthTypes";
|
|
4
4
|
import { BasicCallback } from "../PubSubManager/PubSubManager";
|
|
5
5
|
import { PublishAllOrNothing } from "../PublishParser/PublishParser";
|
|
6
6
|
import { FieldSpec } from "./QueryBuilder/Functions";
|
|
@@ -128,10 +128,8 @@ export type PRGLIOSocket = {
|
|
|
128
128
|
};
|
|
129
129
|
};
|
|
130
130
|
/** Used for session caching */
|
|
131
|
-
__prglCache?: {
|
|
131
|
+
__prglCache?: SessionUser & {
|
|
132
132
|
session: BasicSession;
|
|
133
|
-
user: UserLike;
|
|
134
|
-
clientUser: UserLike;
|
|
135
133
|
};
|
|
136
134
|
_user?: AnyObject;
|
|
137
135
|
/** Used for publish error caching */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DboBuilderTypes.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilderTypes.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,EACL,SAAS,EACT,YAAY,EACZ,UAAU,EACV,WAAW,EACX,UAAU,EACV,WAAW,EACX,UAAU,EACV,SAAS,IAAI,KAAK,EAClB,QAAQ,EACT,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"DboBuilderTypes.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilderTypes.ts"],"names":[],"mappings":"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"}
|
package/lib/Auth/AuthHandler.ts
CHANGED
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
AuthFailure,
|
|
4
4
|
AuthGuardLocation,
|
|
5
5
|
AuthGuardLocationResponse,
|
|
6
|
+
AuthResponse,
|
|
6
7
|
AuthSocketSchema,
|
|
7
8
|
CHANNELS,
|
|
8
9
|
} from "prostgles-types";
|
|
@@ -27,6 +28,8 @@ import { setupAuthRoutes } from "./setupAuthRoutes";
|
|
|
27
28
|
import { getClientRequestIPsInfo } from "./utils/getClientRequestIPsInfo";
|
|
28
29
|
import { getReturnUrl } from "./utils/getReturnUrl";
|
|
29
30
|
import { getSidAndUserFromRequest } from "./utils/getSidAndUserFromRequest";
|
|
31
|
+
import type { Response } from "express";
|
|
32
|
+
import { LoginResponseHandler } from "./endpoints/setLoginRequestHandler";
|
|
30
33
|
|
|
31
34
|
export { getClientRequestIPsInfo };
|
|
32
35
|
export const HTTP_FAIL_CODES = {
|
|
@@ -109,7 +112,7 @@ export class AuthHandler {
|
|
|
109
112
|
|
|
110
113
|
setCookieAndGoToReturnURLIFSet = (
|
|
111
114
|
cookie: { sid: string; expires: number },
|
|
112
|
-
r: { req: ExpressReq; res:
|
|
115
|
+
r: { req: ExpressReq; res: LoginResponseHandler }
|
|
113
116
|
) => {
|
|
114
117
|
const { sid, expires } = cookie;
|
|
115
118
|
const { res, req } = r;
|
|
@@ -279,7 +282,7 @@ export class AuthHandler {
|
|
|
279
282
|
|
|
280
283
|
loginThrottledAndSetCookie = async (
|
|
281
284
|
req: ExpressReq,
|
|
282
|
-
res:
|
|
285
|
+
res: LoginResponseHandler,
|
|
283
286
|
loginParams: LoginParams
|
|
284
287
|
) => {
|
|
285
288
|
const start = Date.now();
|
|
@@ -289,7 +292,10 @@ export class AuthHandler {
|
|
|
289
292
|
);
|
|
290
293
|
const loginResponse =
|
|
291
294
|
typeof errCodeOrSession === "string" ?
|
|
292
|
-
{
|
|
295
|
+
{
|
|
296
|
+
session: undefined,
|
|
297
|
+
response: { success: false, code: errCodeOrSession } as const,
|
|
298
|
+
}
|
|
293
299
|
: errCodeOrSession;
|
|
294
300
|
await this.prostgles.opts.onLog?.({
|
|
295
301
|
type: "auth",
|
package/lib/Auth/AuthTypes.ts
CHANGED
|
@@ -13,12 +13,12 @@ import type {
|
|
|
13
13
|
import type { MicrosoftStrategyOptions } from "passport-microsoft";
|
|
14
14
|
import {
|
|
15
15
|
AnyObject,
|
|
16
|
+
AuthFailure,
|
|
17
|
+
AuthRequest,
|
|
18
|
+
AuthResponse,
|
|
16
19
|
FieldFilter,
|
|
17
20
|
IdentityProvider,
|
|
18
|
-
AuthResponse,
|
|
19
21
|
UserLike,
|
|
20
|
-
AuthRequest,
|
|
21
|
-
AuthFailure,
|
|
22
22
|
} from "prostgles-types";
|
|
23
23
|
import { DBOFullyTyped } from "../DBSchemaBuilder";
|
|
24
24
|
import { PRGLIOSocket } from "../DboBuilder/DboBuilderTypes";
|
|
@@ -230,6 +230,12 @@ export type SessionUser<
|
|
|
230
230
|
* id and type values will be available in the prostgles.user session variable in postgres
|
|
231
231
|
* */
|
|
232
232
|
user: ServerUser;
|
|
233
|
+
|
|
234
|
+
/**
|
|
235
|
+
* If true, this is a public/non registered user that can login. Used in UI
|
|
236
|
+
*/
|
|
237
|
+
isAnonymous?: boolean;
|
|
238
|
+
|
|
233
239
|
/**
|
|
234
240
|
* Controls which fields from user are available in postgres session variable
|
|
235
241
|
*/
|
|
@@ -240,14 +246,14 @@ export type SessionUser<
|
|
|
240
246
|
clientUser: ClientUser;
|
|
241
247
|
};
|
|
242
248
|
|
|
249
|
+
type AllNeverAndOptional<T> = {
|
|
250
|
+
[P in keyof T]?: never;
|
|
251
|
+
};
|
|
243
252
|
export type AuthResultWithSID<SU = SessionUser> =
|
|
244
253
|
| (SU & { sid: string })
|
|
245
|
-
| {
|
|
254
|
+
| (AllNeverAndOptional<SU> & {
|
|
246
255
|
sid: string | undefined;
|
|
247
|
-
|
|
248
|
-
sessionFields?: never;
|
|
249
|
-
clientUser?: never;
|
|
250
|
-
};
|
|
256
|
+
});
|
|
251
257
|
|
|
252
258
|
export type AuthResult<SU = SessionUser> = SU | undefined;
|
|
253
259
|
export type AuthResultOrError<SU = SessionUser> = AuthFailure["code"] | AuthResult<SU>;
|
|
@@ -321,7 +327,11 @@ export type LoginResponse =
|
|
|
321
327
|
| AuthResponse.MagicLinkAuthFailure["code"];
|
|
322
328
|
|
|
323
329
|
export type LoginParams =
|
|
324
|
-
| ({
|
|
330
|
+
| ({
|
|
331
|
+
type: "username";
|
|
332
|
+
signupType: undefined | EmailProvider["signupType"];
|
|
333
|
+
magicLinkUrlPath: undefined | string;
|
|
334
|
+
} & AuthRequest.LoginData)
|
|
325
335
|
| ({ type: "provider" } & AuthProviderUserData);
|
|
326
336
|
|
|
327
337
|
export type ExpressConfig<S, SUser extends SessionUser> = {
|
|
@@ -80,9 +80,9 @@ export function setOAuthProviders(
|
|
|
80
80
|
});
|
|
81
81
|
} else {
|
|
82
82
|
this.loginThrottledAndSetCookie(req, res, {
|
|
83
|
+
...authInfo,
|
|
83
84
|
type: "provider",
|
|
84
85
|
provider: providerName,
|
|
85
|
-
...authInfo,
|
|
86
86
|
}).catch((e: any) => {
|
|
87
87
|
res.status(500).json(getErrorAsObject(e));
|
|
88
88
|
});
|
|
@@ -75,12 +75,12 @@ export function setCatchAllRequestHandler(this: AuthHandler, app: e.Express) {
|
|
|
75
75
|
return;
|
|
76
76
|
|
|
77
77
|
/** If Logged in and requesting login then redirect to main page */
|
|
78
|
-
} else if (
|
|
79
|
-
|
|
80
|
-
(
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
78
|
+
} else if (this.matchesRoute(AUTH_ROUTES_AND_PARAMS.login, req.path)) {
|
|
79
|
+
const { user, isAnonymous } = await getUser();
|
|
80
|
+
if (user && !isAnonymous) {
|
|
81
|
+
res.redirect("/");
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
84
|
}
|
|
85
85
|
|
|
86
86
|
onGetRequestOK?.(req, res, {
|
|
@@ -35,6 +35,10 @@ export function setConfirmEmailRequestHandler(
|
|
|
35
35
|
.status(HTTP_FAIL_CODES.BAD_REQUEST)
|
|
36
36
|
.json({ success: false, code: "something-went-wrong" });
|
|
37
37
|
}
|
|
38
|
+
|
|
39
|
+
/**
|
|
40
|
+
* This approach requires correct handling in setCatchAllRequestHandler to not redirect user.type=public res.redirect("/");
|
|
41
|
+
*/
|
|
38
42
|
if (response.redirect_to) {
|
|
39
43
|
return res.redirect(response.redirect_to);
|
|
40
44
|
}
|
|
@@ -1,18 +1,73 @@
|
|
|
1
|
-
import e from "express";
|
|
1
|
+
import e, { Response } from "express";
|
|
2
2
|
import { AUTH_ROUTES_AND_PARAMS, AuthHandler, HTTP_FAIL_CODES } from "../AuthHandler";
|
|
3
|
-
import { LoginParams } from "../AuthTypes";
|
|
3
|
+
import { BasicSession, LoginParams } from "../AuthTypes";
|
|
4
|
+
import { AuthFailure, AuthRequest, AuthResponse, isDefined, isObject } from "prostgles-types";
|
|
5
|
+
|
|
6
|
+
export type LoginResponseHandler = Response<
|
|
7
|
+
| {
|
|
8
|
+
session: BasicSession;
|
|
9
|
+
response?: AuthResponse.PasswordLoginSuccess | AuthResponse.MagicLinkAuthSuccess;
|
|
10
|
+
}
|
|
11
|
+
| AuthFailure
|
|
12
|
+
| AuthResponse.PasswordLoginFailure
|
|
13
|
+
| AuthResponse.MagicLinkAuthFailure
|
|
14
|
+
>;
|
|
4
15
|
|
|
5
16
|
export function setLoginRequestHandler(this: AuthHandler, app: e.Express) {
|
|
6
|
-
|
|
17
|
+
const { registrations } = this.opts.expressConfig ?? {};
|
|
18
|
+
app.post(AUTH_ROUTES_AND_PARAMS.login, async (req, res: LoginResponseHandler) => {
|
|
19
|
+
const loginData = parseLoginData(req.body);
|
|
20
|
+
if ("error" in loginData) {
|
|
21
|
+
return res
|
|
22
|
+
.status(HTTP_FAIL_CODES.BAD_REQUEST)
|
|
23
|
+
.json({ success: false, code: "something-went-wrong", message: loginData.error });
|
|
24
|
+
}
|
|
7
25
|
try {
|
|
8
26
|
const loginParams: LoginParams = {
|
|
27
|
+
...loginData,
|
|
28
|
+
magicLinkUrlPath:
|
|
29
|
+
registrations?.websiteUrl &&
|
|
30
|
+
`${registrations.websiteUrl}/${AUTH_ROUTES_AND_PARAMS.magicLinksRoute}`,
|
|
31
|
+
signupType: registrations?.email?.signupType,
|
|
9
32
|
type: "username",
|
|
10
|
-
...req.body,
|
|
11
33
|
};
|
|
12
34
|
|
|
13
35
|
await this.loginThrottledAndSetCookie(req, res, loginParams);
|
|
14
|
-
} catch (
|
|
15
|
-
res.status(HTTP_FAIL_CODES.BAD_REQUEST).json({ error });
|
|
36
|
+
} catch (_error) {
|
|
37
|
+
res.status(HTTP_FAIL_CODES.BAD_REQUEST).json({ success: false, code: "server-error" });
|
|
16
38
|
}
|
|
17
39
|
});
|
|
18
40
|
}
|
|
41
|
+
|
|
42
|
+
const parseLoginData = (bodyData: any): AuthRequest.LoginData | { error: string } => {
|
|
43
|
+
const loginData: AuthRequest.LoginData = {
|
|
44
|
+
username: "",
|
|
45
|
+
remember_me: !!bodyData?.remember_me,
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
(["username", "password", "totp_token", "totp_recovery_code"] as const).forEach((prop) => {
|
|
49
|
+
const valOrError = getStringOrUndefined(bodyData[prop], prop);
|
|
50
|
+
if (isObject(valOrError)) {
|
|
51
|
+
return valOrError;
|
|
52
|
+
}
|
|
53
|
+
if (prop === "username") {
|
|
54
|
+
if (!isDefined(valOrError)) {
|
|
55
|
+
return { error: "username error: Expected non-empty string" };
|
|
56
|
+
}
|
|
57
|
+
loginData[prop] = valOrError;
|
|
58
|
+
} else {
|
|
59
|
+
loginData[prop] = valOrError;
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
|
|
63
|
+
return loginData;
|
|
64
|
+
};
|
|
65
|
+
|
|
66
|
+
const getStringOrUndefined = (
|
|
67
|
+
val: any,
|
|
68
|
+
propName: string
|
|
69
|
+
): string | undefined | { error: string } => {
|
|
70
|
+
const isStringOrUndefined = typeof val === "string" || val === undefined;
|
|
71
|
+
if (!isStringOrUndefined) return { error: `${propName} error: Expected string or undefined` };
|
|
72
|
+
return val;
|
|
73
|
+
};
|
|
@@ -1,23 +1,20 @@
|
|
|
1
|
-
import e
|
|
2
|
-
import {
|
|
3
|
-
import { AuthResponse } from "prostgles-types";
|
|
1
|
+
import e from "express";
|
|
2
|
+
import { DBOFullyTyped } from "../../DBSchemaBuilder";
|
|
4
3
|
import {
|
|
5
4
|
AUTH_ROUTES_AND_PARAMS,
|
|
6
5
|
AuthHandler,
|
|
7
6
|
getClientRequestIPsInfo,
|
|
8
7
|
HTTP_FAIL_CODES,
|
|
9
8
|
} from "../AuthHandler";
|
|
10
|
-
import {
|
|
9
|
+
import { ExpressConfig, ExpressReq, SessionUser } from "../AuthTypes";
|
|
10
|
+
import { LoginResponseHandler } from "./setLoginRequestHandler";
|
|
11
11
|
|
|
12
12
|
export function setMagicLinkRequestHandler(
|
|
13
13
|
this: AuthHandler,
|
|
14
14
|
onMagicLink: Required<ExpressConfig<void, SessionUser>>["onMagicLink"],
|
|
15
15
|
app: e.Express
|
|
16
16
|
) {
|
|
17
|
-
const result = async (
|
|
18
|
-
req: ExpressReq,
|
|
19
|
-
res: Response<AuthResponse.MagicLinkAuthFailure | AuthResponse.MagicLinkAuthSuccess>
|
|
20
|
-
) => {
|
|
17
|
+
const result = async (req: ExpressReq, res: LoginResponseHandler) => {
|
|
21
18
|
const { id } = req.params;
|
|
22
19
|
|
|
23
20
|
if (typeof id !== "string" || !id) {
|
|
@@ -15,13 +15,12 @@ export async function getSidAndUserFromRequest(
|
|
|
15
15
|
*/
|
|
16
16
|
const getSession = this.opts.cacheSession?.getSession;
|
|
17
17
|
if (clientReq.socket && getSession && clientReq.socket.__prglCache) {
|
|
18
|
-
const { session,
|
|
18
|
+
const { session, ...userData } = clientReq.socket.__prglCache;
|
|
19
19
|
const isValid = this.isNonExpiredSocketSession(clientReq.socket, session);
|
|
20
20
|
if (isValid) {
|
|
21
21
|
return {
|
|
22
|
+
...userData,
|
|
22
23
|
sid: session.sid,
|
|
23
|
-
user,
|
|
24
|
-
clientUser,
|
|
25
24
|
};
|
|
26
25
|
} else
|
|
27
26
|
return {
|
|
@@ -44,12 +43,11 @@ export async function getSidAndUserFromRequest(
|
|
|
44
43
|
if (typeof clientInfoOrErr === "string") throw clientInfoOrErr;
|
|
45
44
|
const clientInfo = clientInfoOrErr;
|
|
46
45
|
if (getSession && clientReq.socket) {
|
|
47
|
-
const session = await getSession(sid, this.dbo as
|
|
46
|
+
const session = await getSession(sid, this.dbo as DBOFullyTyped, this.db);
|
|
48
47
|
if (session && session.expires && clientInfo?.user) {
|
|
49
48
|
clientReq.socket.__prglCache = {
|
|
49
|
+
...clientInfo,
|
|
50
50
|
session,
|
|
51
|
-
user: clientInfo.user,
|
|
52
|
-
clientUser: clientInfo.clientUser,
|
|
53
51
|
};
|
|
54
52
|
}
|
|
55
53
|
}
|
|
@@ -15,7 +15,7 @@ import {
|
|
|
15
15
|
TableInfo as TInfo,
|
|
16
16
|
UserLike,
|
|
17
17
|
} from "prostgles-types";
|
|
18
|
-
import { AuthClientRequest, BasicSession } from "../Auth/AuthTypes";
|
|
18
|
+
import { AuthClientRequest, BasicSession, SessionUser } from "../Auth/AuthTypes";
|
|
19
19
|
import { BasicCallback } from "../PubSubManager/PubSubManager";
|
|
20
20
|
import { PublishAllOrNothing } from "../PublishParser/PublishParser";
|
|
21
21
|
import { FieldSpec } from "./QueryBuilder/Functions";
|
|
@@ -168,10 +168,8 @@ export type PRGLIOSocket = {
|
|
|
168
168
|
};
|
|
169
169
|
|
|
170
170
|
/** Used for session caching */
|
|
171
|
-
__prglCache?: {
|
|
171
|
+
__prglCache?: SessionUser & {
|
|
172
172
|
session: BasicSession;
|
|
173
|
-
user: UserLike;
|
|
174
|
-
clientUser: UserLike;
|
|
175
173
|
};
|
|
176
174
|
|
|
177
175
|
_user?: AnyObject;
|