prostgles-server 4.2.225 → 4.2.227
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 +0 -1
- package/dist/Auth/AuthHandler.d.ts.map +1 -1
- package/dist/Auth/AuthHandler.js +2 -4
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +17 -5
- package/dist/Auth/AuthTypes.d.ts.map +1 -1
- package/dist/Auth/endpoints/setConfirmEmailRequestHandler.js +1 -1
- package/dist/Auth/endpoints/setConfirmEmailRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.d.ts +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.d.ts +5 -0
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.d.ts.map +1 -0
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.js +50 -0
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.js.map +1 -0
- package/dist/Auth/getClientAuth.d.ts.map +1 -1
- package/dist/Auth/getClientAuth.js +1 -0
- package/dist/Auth/getClientAuth.js.map +1 -1
- package/dist/Auth/setupAuthRoutes.d.ts.map +1 -1
- package/dist/Auth/setupAuthRoutes.js +4 -4
- package/dist/Auth/setupAuthRoutes.js.map +1 -1
- package/dist/Auth/utils/getSidAndUserFromRequest.js +1 -1
- package/dist/Auth/utils/getSidAndUserFromRequest.js.map +1 -1
- package/lib/Auth/AuthHandler.ts +2 -5
- package/lib/Auth/AuthTypes.ts +20 -6
- package/lib/Auth/endpoints/setConfirmEmailRequestHandler.ts +1 -1
- package/lib/Auth/endpoints/setLoginRequestHandler.ts +1 -0
- package/lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts +64 -0
- package/lib/Auth/getClientAuth.ts +1 -0
- package/lib/Auth/setupAuthRoutes.ts +4 -5
- package/lib/Auth/utils/getSidAndUserFromRequest.ts +1 -1
- package/package.json +2 -2
- package/dist/Auth/endpoints/setMagicLinkRequestHandler.d.ts +0 -5
- package/dist/Auth/endpoints/setMagicLinkRequestHandler.d.ts.map +0 -1
- package/dist/Auth/endpoints/setMagicLinkRequestHandler.js +0 -36
- package/dist/Auth/endpoints/setMagicLinkRequestHandler.js.map +0 -1
- package/lib/Auth/endpoints/setMagicLinkRequestHandler.ts +0 -48
|
@@ -26,7 +26,6 @@ export declare const AUTH_ROUTES_AND_PARAMS: {
|
|
|
26
26
|
readonly magicLinksRoute: "/magic-link";
|
|
27
27
|
readonly magicLinksExpressRoute: "/magic-link/:id";
|
|
28
28
|
readonly confirmEmail: "/confirm-email";
|
|
29
|
-
readonly confirmEmailExpressRoute: "/confirm-email";
|
|
30
29
|
readonly catchAll: "*";
|
|
31
30
|
};
|
|
32
31
|
export declare class AuthHandler {
|
|
@@ -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
|
|
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;;;;;;;;;;;CAWzB,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,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,UAmCjD;IAEF,cAAc,gBAAuB,iBAAiB,KAAG,QAAQ,iBAAiB,CAAC,CA2CjF;IAEF,IAAI,sBAA8B;IAElC,OAAO,aAuBL;IAEF,KAAK,4IAAoB;IAEzB;;;;;;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,CAiBR;IAEF,aAAa;;;OAA4B;CAC1C;AAED,eAAO,MAAM,YAAY,iBAAkB,MAAM,GAAG,SAAS,eAAe,MAAM,6BAQjF,CAAC"}
|
package/dist/Auth/AuthHandler.js
CHANGED
|
@@ -33,7 +33,6 @@ exports.AUTH_ROUTES_AND_PARAMS = {
|
|
|
33
33
|
magicLinksRoute: "/magic-link",
|
|
34
34
|
magicLinksExpressRoute: "/magic-link/:id",
|
|
35
35
|
confirmEmail: "/confirm-email",
|
|
36
|
-
confirmEmailExpressRoute: "/confirm-email",
|
|
37
36
|
catchAll: "*",
|
|
38
37
|
};
|
|
39
38
|
class AuthHandler {
|
|
@@ -142,17 +141,16 @@ class AuthHandler {
|
|
|
142
141
|
init = setupAuthRoutes_1.setupAuthRoutes.bind(this);
|
|
143
142
|
destroy = () => {
|
|
144
143
|
const app = this.opts.loginSignupConfig?.app;
|
|
145
|
-
const { login, logoutGetPath, magicLinksExpressRoute, catchAll, loginWithProvider, emailRegistration
|
|
144
|
+
const { login, logoutGetPath, magicLinksExpressRoute, catchAll, loginWithProvider, emailRegistration, magicLinksRoute, confirmEmail, } = exports.AUTH_ROUTES_AND_PARAMS;
|
|
146
145
|
(0, FileManager_1.removeExpressRoute)(app, [
|
|
147
146
|
login,
|
|
148
147
|
logoutGetPath,
|
|
149
148
|
magicLinksExpressRoute,
|
|
150
149
|
catchAll,
|
|
151
150
|
loginWithProvider,
|
|
152
|
-
|
|
151
|
+
emailRegistration,
|
|
153
152
|
magicLinksRoute,
|
|
154
153
|
confirmEmail,
|
|
155
|
-
confirmEmailExpressRoute,
|
|
156
154
|
]);
|
|
157
155
|
};
|
|
158
156
|
login = login_1.login.bind(this);
|
|
@@ -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,aAAa,EAAE,SAAS;IACxB,eAAe,EAAE,aAAa;IAC9B,sBAAsB,EAAE,iBAAiB;IACzC,YAAY,EAAE,gBAAgB;IAC9B,
|
|
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, AuthRequest, AuthResponse, FieldFilter, IdentityProvider, UserLike, AuthSocketSchema } from "prostgles-types";
|
|
8
|
+
import { AnyObject, AuthRequest, AuthResponse, FieldFilter, IdentityProvider, UserLike, AuthSocketSchema, ClientSchema } from "prostgles-types";
|
|
9
9
|
import { DBOFullyTyped } from "../DBSchemaBuilder";
|
|
10
10
|
import { PRGLIOSocket } from "../DboBuilder/DboBuilderTypes";
|
|
11
11
|
import { DB } from "../Prostgles";
|
|
@@ -216,11 +216,15 @@ type AllNeverAndOptional<T> = {
|
|
|
216
216
|
export type AuthResultWithSID<SU = SessionUser> = (SU & {
|
|
217
217
|
sid: string;
|
|
218
218
|
error?: undefined;
|
|
219
|
+
preferredLogin?: undefined;
|
|
219
220
|
}) | (AllNeverAndOptional<SU> & {
|
|
220
221
|
sid: string | undefined;
|
|
221
222
|
error?: AuthResponse.AuthFailure;
|
|
223
|
+
preferredLogin?: NonNullable<ClientSchema["auth"]>["preferredLogin"];
|
|
224
|
+
});
|
|
225
|
+
export type AuthResult<SU = SessionUser> = SU | undefined | (AllNeverAndOptional<SU> & {
|
|
226
|
+
preferredLogin?: NonNullable<ClientSchema["auth"]>["preferredLogin"];
|
|
222
227
|
});
|
|
223
|
-
export type AuthResult<SU = SessionUser> = SU | undefined;
|
|
224
228
|
export type AuthResultOrError<SU = SessionUser> = AuthResponse.AuthFailure | AuthResponse.AuthFailure["code"] | AuthResult<SU>;
|
|
225
229
|
export type AuthRequestParams<S, SUser extends SessionUser> = {
|
|
226
230
|
db: DB;
|
|
@@ -266,6 +270,14 @@ export type LoginResponse = {
|
|
|
266
270
|
session?: undefined;
|
|
267
271
|
response: AuthResponse.MagicLinkAuthSuccess;
|
|
268
272
|
} | AuthResponse.OAuthRegisterFailure["code"] | AuthResponse.PasswordLoginFailure["code"] | AuthResponse.MagicLinkAuthFailure["code"];
|
|
273
|
+
export type MagicLinkOrOTPData = {
|
|
274
|
+
type: "magic-link";
|
|
275
|
+
magicId: string;
|
|
276
|
+
} | {
|
|
277
|
+
type: "otp";
|
|
278
|
+
code: string;
|
|
279
|
+
email: string;
|
|
280
|
+
};
|
|
269
281
|
export type LoginParams = ({
|
|
270
282
|
type: "username";
|
|
271
283
|
} & AuthRequest.LoginData) | ({
|
|
@@ -303,12 +315,12 @@ export type LoginSignupConfig<S, SUser extends SessionUser> = {
|
|
|
303
315
|
* If defined, will enable GET /magic-link/:id route.
|
|
304
316
|
* Requests with valid magic link ids will be logged in and redirected to the returnUrl if set
|
|
305
317
|
*/
|
|
306
|
-
|
|
318
|
+
onMagicLinkOrOTP?: (data: MagicLinkOrOTPData, dbo: DBOFullyTyped<S>, db: DB, client: LoginClientInfo) => Awaitable<{
|
|
307
319
|
session: BasicSession;
|
|
308
|
-
response?: AuthResponse.
|
|
320
|
+
response?: AuthResponse.AuthSuccess;
|
|
309
321
|
} | {
|
|
310
322
|
session?: undefined;
|
|
311
|
-
response: AuthResponse.MagicLinkAuthFailure;
|
|
323
|
+
response: AuthResponse.MagicLinkAuthFailure | AuthResponse.CodeVerificationFailure;
|
|
312
324
|
}>;
|
|
313
325
|
signupWithEmailAndPassword?: SignupWithEmailAndPassword;
|
|
314
326
|
loginWithOAuth?: LoginWithOAuthConfig<S>;
|
|
@@ -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,YAAY,EACZ,WAAW,EACX,gBAAgB,EAChB,QAAQ,EACR,gBAAgB,
|
|
1
|
+
{"version":3,"file":"AuthTypes.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,7 +46,7 @@ function setConfirmEmailRequestHandler(emailAuthConfig, app) {
|
|
|
46
46
|
.json({ success: false, code: "server-error", message: "Failed to confirm email" });
|
|
47
47
|
}
|
|
48
48
|
};
|
|
49
|
-
app.get(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.
|
|
49
|
+
app.get(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.confirmEmail, requestHandler);
|
|
50
50
|
}
|
|
51
51
|
exports.setConfirmEmailRequestHandler = setConfirmEmailRequestHandler;
|
|
52
52
|
//# sourceMappingURL=setConfirmEmailRequestHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setConfirmEmailRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setConfirmEmailRequestHandler.ts"],"names":[],"mappings":";;;AAGA,gDAAsF;AAEtF,8EAA2E;AAC3E,8DAA6D;AAE7D,SAAgB,6BAA6B,CAE3C,eAA2C,EAC3C,GAAc;IAEd,MAAM,cAAc,GAAG,KAAK,EAC1B,GAAY,EACZ,GAGC,EACD,EAAE;QACF,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAClC,IAAI,CAAC;YACH,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACxC,OAAO,GAAG,CAAC,IAAI,CAAC;oBACd,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,sBAAsB;oBAC5B,OAAO,EAAE,mCAAmC;iBAC7C,CAAC,CAAC;YACL,CAAC;YACD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACtC,OAAO,GAAG,CAAC,IAAI,CAAC;oBACd,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,sBAAsB;oBAC5B,OAAO,EAAE,qDAAqD;iBAC/D,CAAC,CAAC;YACL,CAAC;YACD,MAAM,UAAU,GAAG,IAAA,iDAAuB,EAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;YAC7D,MAAM,QAAQ,GAAG,MAAM,IAAA,mCAAiB,EAAC,KAAK,IAAI,EAAE,CAClD,eAAe,CAAC,mBAAmB,CAAC;gBAClC,IAAI;gBACJ,KAAK;gBACL,UAAU;gBACV,GAAG;aACJ,CAAC,CACH,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACtB,OAAO,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAChE,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,
|
|
1
|
+
{"version":3,"file":"setConfirmEmailRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setConfirmEmailRequestHandler.ts"],"names":[],"mappings":";;;AAGA,gDAAsF;AAEtF,8EAA2E;AAC3E,8DAA6D;AAE7D,SAAgB,6BAA6B,CAE3C,eAA2C,EAC3C,GAAc;IAEd,MAAM,cAAc,GAAG,KAAK,EAC1B,GAAY,EACZ,GAGC,EACD,EAAE;QACF,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAClC,IAAI,CAAC;YACH,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACxC,OAAO,GAAG,CAAC,IAAI,CAAC;oBACd,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,sBAAsB;oBAC5B,OAAO,EAAE,mCAAmC;iBAC7C,CAAC,CAAC;YACL,CAAC;YACD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACtC,OAAO,GAAG,CAAC,IAAI,CAAC;oBACd,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,sBAAsB;oBAC5B,OAAO,EAAE,qDAAqD;iBAC/D,CAAC,CAAC;YACL,CAAC;YACD,MAAM,UAAU,GAAG,IAAA,iDAAuB,EAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;YAC7D,MAAM,QAAQ,GAAG,MAAM,IAAA,mCAAiB,EAAC,KAAK,IAAI,EAAE,CAClD,eAAe,CAAC,mBAAmB,CAAC;gBAClC,IAAI;gBACJ,KAAK;gBACL,UAAU;gBACV,GAAG;aACJ,CAAC,CACH,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACtB,OAAO,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAChE,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,YAAY,EAAE,cAAc,CAAC,CAAC;AAC/D,CAAC;AAxDD,sEAwDC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import e, { Response } from "express";
|
|
2
2
|
import { AuthRequest, AuthResponse } from "prostgles-types";
|
|
3
3
|
import { AuthHandler } from "../AuthHandler";
|
|
4
|
-
export type LoginResponseHandler = Response<AuthResponse.OAuthRegisterSuccess | AuthResponse.OAuthRegisterFailure | AuthResponse.PasswordLoginSuccess | AuthResponse.PasswordLoginFailure | AuthResponse.MagicLinkAuthFailure | AuthResponse.MagicLinkAuthSuccess>;
|
|
4
|
+
export type LoginResponseHandler = Response<AuthResponse.OAuthRegisterSuccess | AuthResponse.OAuthRegisterFailure | AuthResponse.PasswordLoginSuccess | AuthResponse.PasswordLoginFailure | AuthResponse.MagicLinkAuthFailure | AuthResponse.MagicLinkAuthSuccess | AuthResponse.CodeVerificationFailure>;
|
|
5
5
|
export declare function setLoginRequestHandler(this: AuthHandler, app: e.Express): void;
|
|
6
6
|
export declare const parseLoginData: (bodyData: any) => [string, undefined] | [undefined, AuthRequest.LoginData];
|
|
7
7
|
//# 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,EAAE,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAuB,MAAM,iBAAiB,CAAC;AACjF,OAAO,EAA0B,WAAW,EAAmB,MAAM,gBAAgB,CAAC;AAGtF,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CACvC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,
|
|
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,EAAE,WAAW,EAAE,YAAY,EAAuB,MAAM,iBAAiB,CAAC;AACjF,OAAO,EAA0B,WAAW,EAAmB,MAAM,gBAAgB,CAAC;AAGtF,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CACvC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,uBAAuB,CACvC,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,QAmBvE;AAED,eAAO,MAAM,cAAc,aACf,GAAG,KACZ,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,SAAS,CAsBzD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setLoginRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":";;;AACA,qDAAiF;AACjF,gDAAsF;
|
|
1
|
+
{"version":3,"file":"setLoginRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":";;;AACA,qDAAiF;AACjF,gDAAsF;AAatF,SAAgB,sBAAsB,CAAoB,GAAc;IACtE,GAAG,CAAC,IAAI,CAAC,oCAAsB,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,GAAyB,EAAE,EAAE;QAC9E,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,GAAG,IAAA,sBAAc,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;YACxB,OAAO,GAAG;iBACP,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC;iBACnC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5E,CAAC;QACD,IAAI,CAAC;YACH,MAAM,WAAW,GAAgB;gBAC/B,GAAG,SAAS;gBACZ,IAAI,EAAE,UAAU;aACjB,CAAC;YAEF,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;QAC1C,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;AAnBD,wDAmBC;AAEM,MAAM,cAAc,GAAG,CAC5B,QAAa,EAC6C,EAAE;IAC5D,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,CAAC,2CAA2C,CAAC,CAAC;YACvD,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,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AAChC,CAAC,CAAC;AAxBW,QAAA,cAAc,kBAwBzB;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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import e from "express";
|
|
2
|
+
import { AuthHandler } from "../AuthHandler";
|
|
3
|
+
import { LoginSignupConfig, SessionUser } from "../AuthTypes";
|
|
4
|
+
export declare function setMagicLinkOrOTPRequestHandler(this: AuthHandler, onMagicLink: Required<LoginSignupConfig<void, SessionUser>>["onMagicLinkOrOTP"], app: e.Express): void;
|
|
5
|
+
//# sourceMappingURL=setMagicLinkOrOTPRequestHandler.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setMagicLinkOrOTPRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,SAAS,CAAC;AAExB,OAAO,EAEL,WAAW,EAGZ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAc,iBAAiB,EAAsB,WAAW,EAAE,MAAM,cAAc,CAAC;AAI9F,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,QAAQ,CAAC,iBAAiB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAC/E,GAAG,EAAE,CAAC,CAAC,OAAO,QAgDf"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.setMagicLinkOrOTPRequestHandler = void 0;
|
|
4
|
+
const AuthHandler_1 = require("../AuthHandler");
|
|
5
|
+
const throttledReject_1 = require("../utils/throttledReject");
|
|
6
|
+
function setMagicLinkOrOTPRequestHandler(onMagicLink, app) {
|
|
7
|
+
const handler = async (req, res, data) => {
|
|
8
|
+
try {
|
|
9
|
+
const response = await (0, throttledReject_1.throttledAuthCall)(async () => {
|
|
10
|
+
return onMagicLink(data, this.dbo, this.db, (0, AuthHandler_1.getClientRequestIPsInfo)({ httpReq: req }));
|
|
11
|
+
});
|
|
12
|
+
if (!response.session) {
|
|
13
|
+
res.status(AuthHandler_1.HTTP_FAIL_CODES.UNAUTHORIZED).json(response.response);
|
|
14
|
+
}
|
|
15
|
+
else {
|
|
16
|
+
this.setCookieAndGoToReturnURLIFSet(response.session, { req, res });
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
catch (_e) {
|
|
20
|
+
res
|
|
21
|
+
.status(AuthHandler_1.HTTP_FAIL_CODES.UNAUTHORIZED)
|
|
22
|
+
.json({ success: false, code: "something-went-wrong" });
|
|
23
|
+
}
|
|
24
|
+
};
|
|
25
|
+
app.get(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.magicLinksExpressRoute, (req, res) => {
|
|
26
|
+
const { id } = req.params;
|
|
27
|
+
if (typeof id !== "string" || !id) {
|
|
28
|
+
res
|
|
29
|
+
.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST)
|
|
30
|
+
.json({ success: false, code: "invalid-magic-link", message: "Invalid magic link" });
|
|
31
|
+
}
|
|
32
|
+
return handler(req, res, { type: "magic-link", magicId: id });
|
|
33
|
+
});
|
|
34
|
+
app.post(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.magicLinksRoute, (req, res) => {
|
|
35
|
+
const { code, email } = req.body;
|
|
36
|
+
if (typeof code !== "string" || !code) {
|
|
37
|
+
res
|
|
38
|
+
.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST)
|
|
39
|
+
.json({ success: false, code: "invalid-otp-code", message: "Invalid code" });
|
|
40
|
+
}
|
|
41
|
+
if (typeof email !== "string" || !email) {
|
|
42
|
+
res
|
|
43
|
+
.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST)
|
|
44
|
+
.json({ success: false, code: "something-went-wrong", message: "Invalid email" });
|
|
45
|
+
}
|
|
46
|
+
return handler(req, res, { type: "otp", code, email });
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
exports.setMagicLinkOrOTPRequestHandler = setMagicLinkOrOTPRequestHandler;
|
|
50
|
+
//# sourceMappingURL=setMagicLinkOrOTPRequestHandler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setMagicLinkOrOTPRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts"],"names":[],"mappings":";;;AAEA,gDAKwB;AAExB,8DAA6D;AAG7D,SAAgB,+BAA+B,CAE7C,WAA+E,EAC/E,GAAc;IAEd,MAAM,OAAO,GAAG,KAAK,EAAE,GAAe,EAAE,GAAyB,EAAE,IAAwB,EAAE,EAAE;QAC7F,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAA,mCAAiB,EAAC,KAAK,IAAI,EAAE;gBAClD,OAAO,WAAW,CAChB,IAAI,EACJ,IAAI,CAAC,GAAoB,EACzB,IAAI,CAAC,EAAE,EACP,IAAA,qCAAuB,EAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAC1C,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACtB,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACnE,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,8BAA8B,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACZ,GAAG;iBACA,MAAM,CAAC,6BAAe,CAAC,YAAY,CAAC;iBACpC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC,CAAC;IACF,GAAG,CAAC,GAAG,CAAC,oCAAsB,CAAC,sBAAsB,EAAE,CAAC,GAAG,EAAE,GAAyB,EAAE,EAAE;QACxF,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,oBAAoB,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAC;QACzF,CAAC;QACD,OAAO,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,oCAAsB,CAAC,eAAe,EAAE,CAAC,GAAG,EAAE,GAAyB,EAAE,EAAE;QAClF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAEjC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YACtC,GAAG;iBACA,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC;iBACnC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;QACjF,CAAC;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;YACxC,GAAG;iBACA,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC;iBACnC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC;QACtF,CAAC;QACD,OAAO,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;AACL,CAAC;AAnDD,0EAmDC"}
|
|
@@ -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,
|
|
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,CAmElE"}
|
|
@@ -50,6 +50,7 @@ async function getClientAuth(clientReq) {
|
|
|
50
50
|
minPasswordLength: signupWithEmailAndPassword.minPasswordLength ?? 8,
|
|
51
51
|
url: AuthHandler_1.AUTH_ROUTES_AND_PARAMS.emailRegistration,
|
|
52
52
|
},
|
|
53
|
+
preferredLogin: userData.preferredLogin,
|
|
53
54
|
user: userData.clientUser,
|
|
54
55
|
loginType: localLoginMode ?? (login ? "email+password" : undefined),
|
|
55
56
|
pathGuard,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientAuth.js","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":";;;AAAA,qDAOyB;AAEzB,+CAAoE;AAE7D,KAAK,UAAU,aAAa,CAEjC,SAA4B;IAE5B,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IACE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,YAAY;QACzC,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,EACnD,CAAC;QACD,SAAS,GAAG,IAAI,CAAC;QAEjB;;WAEG;QACH,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACrB,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;YAC7B,MAAM,CAAC,kBAAkB,CAAC,0BAAQ,CAAC,SAAS,CAAC,CAAC;YAC9C,MAAM,CAAC,EAAE,CACP,0BAAQ,CAAC,SAAS,EAClB,KAAK,EACH,MAAyB,EACzB,KAAK,CAAC,IAAS,EAAE,IAAgC,EAAE,EAAE;gBACnD,YAAY;YACd,CAAC,EACD,EAAE;gBACF,IAAI,CAAC;oBACH,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GACxB,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAuB,CAAC,CAAC,CAAC,MAAM,CAAC;oBAClF,IAAI,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;wBAC7C,OAAO,CAAC,IAAI,CAAC,mDAAmD,EAAE,QAAQ,CAAC,CAAC;oBAC9E,CAAC;oBAED,qBAAqB;oBACrB,MAAM,mBAAmB,GAAG,CAAC,SAAS,CAAC,CAAC;oBACxC,IACE,CAAC,mBAAmB,CAAC,QAAQ,CAAC,MAAM,CAAC;wBACrC,QAAQ;wBACR,OAAO,QAAQ,KAAK,QAAQ;wBAC5B,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;wBAC1B,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAC5C,CAAC;wBACD,EAAE,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;oBACnC,CAAC;yBAAM,CAAC;wBACN,EAAE,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;oBACpC,CAAC;gBACH,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,OAAO,CAAC,KAAK,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;oBACtC,EAAE,CAAC,GAAG,CAAC,CAAC;gBACV,CAAC;YACH,CAAC,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAChE,MAAM,EAAE,cAAc,EAAE,0BAA0B,EAAE,cAAc,EAAE,KAAK,EAAE,GACzE,IAAI,CAAC,IAAI,CAAC,iBAAiB,IAAI,EAAE,CAAC;IAEpC,MAAM,IAAI,GAAqB;QAC7B,SAAS,EAAE,iBAAiB,CAAC,cAAc,CAAC;QAC5C,0BAA0B,EAAE,0BAA0B,IAAI;YACxD,iBAAiB,EAAE,0BAA0B,CAAC,iBAAiB,IAAI,CAAC;YACpE,GAAG,EAAE,oCAAsB,CAAC,iBAAiB;SAC9C;QACD,IAAI,EAAE,QAAQ,CAAC,UAAU;QACzB,SAAS,EAAE,cAAc,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC;QACnE,SAAS;KACV,CAAC;IACF,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;AAC5B,CAAC;
|
|
1
|
+
{"version":3,"file":"getClientAuth.js","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupAuthRoutes.d.ts","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAmB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"setupAuthRoutes.d.ts","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAmB,MAAM,eAAe,CAAC;AAS7D,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,iBA4DtD"}
|
|
@@ -5,7 +5,7 @@ const AuthHandler_1 = require("./AuthHandler");
|
|
|
5
5
|
const setCatchAllRequestHandler_1 = require("./endpoints/setCatchAllRequestHandler");
|
|
6
6
|
const setConfirmEmailRequestHandler_1 = require("./endpoints/setConfirmEmailRequestHandler");
|
|
7
7
|
const setLoginRequestHandler_1 = require("./endpoints/setLoginRequestHandler");
|
|
8
|
-
const
|
|
8
|
+
const setMagicLinkOrOTPRequestHandler_1 = require("./endpoints/setMagicLinkOrOTPRequestHandler");
|
|
9
9
|
const setOAuthRequestHandlers_1 = require("./endpoints/setOAuthRequestHandlers");
|
|
10
10
|
const setRegisterRequestHandler_1 = require("./endpoints/setRegisterRequestHandler");
|
|
11
11
|
const upsertNamedExpressMiddleware_1 = require("./utils/upsertNamedExpressMiddleware");
|
|
@@ -17,7 +17,7 @@ async function setupAuthRoutes() {
|
|
|
17
17
|
if (!loginSignupConfig) {
|
|
18
18
|
return;
|
|
19
19
|
}
|
|
20
|
-
const { app, publicRoutes = [],
|
|
20
|
+
const { app, publicRoutes = [], onMagicLinkOrOTP, use, loginWithOAuth, signupWithEmailAndPassword, } = loginSignupConfig;
|
|
21
21
|
if (publicRoutes.find((r) => typeof r !== "string" || !r)) {
|
|
22
22
|
throw "Invalid or empty string provided within publicRoutes ";
|
|
23
23
|
}
|
|
@@ -48,8 +48,8 @@ async function setupAuthRoutes() {
|
|
|
48
48
|
};
|
|
49
49
|
(0, upsertNamedExpressMiddleware_1.upsertNamedExpressMiddleware)(app, prostglesUseMiddleware, "prostglesUseMiddleware");
|
|
50
50
|
}
|
|
51
|
-
if (
|
|
52
|
-
|
|
51
|
+
if (onMagicLinkOrOTP) {
|
|
52
|
+
setMagicLinkOrOTPRequestHandler_1.setMagicLinkOrOTPRequestHandler.bind(this)(onMagicLinkOrOTP, app);
|
|
53
53
|
}
|
|
54
54
|
setLoginRequestHandler_1.setLoginRequestHandler.bind(this)(app);
|
|
55
55
|
/* Redirect if not logged in and requesting non public content */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupAuthRoutes.js","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":";;;AAEA,+CAA6D;AAC7D,qFAAkF;AAClF,6FAA0F;AAC1F,+EAA4E;AAC5E,
|
|
1
|
+
{"version":3,"file":"setupAuthRoutes.js","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":";;;AAEA,+CAA6D;AAC7D,qFAAkF;AAClF,6FAA0F;AAC1F,+EAA4E;AAC5E,iGAA8F;AAC9F,iFAA8E;AAC9E,qFAAkF;AAClF,uFAAoF;AAE7E,KAAK,UAAU,eAAe;IACnC,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;IAExC,IAAI,IAAI,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;QAC9B,MAAM,4DAA4D,CAAC;IACrE,CAAC;IAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,OAAO;IACT,CAAC;IACD,MAAM,EACJ,GAAG,EACH,YAAY,GAAG,EAAE,EACjB,gBAAgB,EAChB,GAAG,EACH,cAAc,EACd,0BAA0B,GAC3B,GAAG,iBAAiB,CAAC;IACtB,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,MAAM,uDAAuD,CAAC;IAChE,CAAC;IAED,IAAI,0BAA0B,EAAE,CAAC;QAC/B,IAAA,qDAAyB,EAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;QAC3D,6DAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,iDAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,sBAAsB,GAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAChE,GAAG,CAAC;gBACF,GAAG;gBACH,GAAG;gBACH,IAAI;gBACJ,OAAO,EAAE,KAAK,IAAI,EAAE;oBAClB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;oBACnE,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;wBACpB,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;wBAC9D,MAAM,SAAS,CAAC,KAAK,CAAC;oBACxB,CAAC;oBACD,OAAO,SAAS,CAAC;gBACnB,CAAC;gBACD,GAAG,EAAE,IAAI,CAAC,GAAoB;gBAC9B,EAAE,EAAE,IAAI,CAAC,EAAE;aACZ,CAAC,CAAC;QACL,CAAC,CAAC;QACF,IAAA,2DAA4B,EAAC,GAAG,EAAE,sBAAsB,EAAE,wBAAwB,CAAC,CAAC;IACtF,CAAC;IAED,IAAI,gBAAgB,EAAE,CAAC;QACrB,iEAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IACpE,CAAC;IAED,+CAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAEvC,iEAAiE;IACjE,qDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;AAC5C,CAAC;AA5DD,0CA4DC"}
|
|
@@ -49,7 +49,7 @@ async function getSidAndUserFromRequest(clientReq) {
|
|
|
49
49
|
if (clientInfo?.user && sid) {
|
|
50
50
|
return { sid, ...clientInfo };
|
|
51
51
|
}
|
|
52
|
-
return { sid };
|
|
52
|
+
return { sid, preferredLogin: !clientInfo?.user ? clientInfo?.preferredLogin : undefined };
|
|
53
53
|
}, 100);
|
|
54
54
|
await this.prostgles.opts.onLog?.({
|
|
55
55
|
type: "auth",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSidAndUserFromRequest.js","sourceRoot":"","sources":["../../../lib/Auth/utils/getSidAndUserFromRequest.ts"],"names":[],"mappings":";;;AACA,gDAAsE;AAEtE,uDAAsD;AAEtD;;;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,IAAA,mCAAiB,EAAC,KAAK,IAAI,EAAE;QAChD,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,CACX,GAAG,EACH,IAAI,CAAC,GAAoB,EACzB,IAAI,CAAC,EAAE,EACP,IAAA,qCAAuB,EAAC,SAAS,CAAC,EAClC,SAAS,CACV,CACF,CAAC;QACJ,IAAI,eAAe,IAAI,CAAC,OAAO,eAAe,KAAK,QAAQ,IAAI,SAAS,IAAI,eAAe,CAAC;YAC1F,MAAM,eAAe,CAAC;QACxB,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;
|
|
1
|
+
{"version":3,"file":"getSidAndUserFromRequest.js","sourceRoot":"","sources":["../../../lib/Auth/utils/getSidAndUserFromRequest.ts"],"names":[],"mappings":";;;AACA,gDAAsE;AAEtE,uDAAsD;AAEtD;;;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,IAAA,mCAAiB,EAAC,KAAK,IAAI,EAAE;QAChD,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,CACX,GAAG,EACH,IAAI,CAAC,GAAoB,EACzB,IAAI,CAAC,EAAE,EACP,IAAA,qCAAuB,EAAC,SAAS,CAAC,EAClC,SAAS,CACV,CACF,CAAC;QACJ,IAAI,eAAe,IAAI,CAAC,OAAO,eAAe,KAAK,QAAQ,IAAI,SAAS,IAAI,eAAe,CAAC;YAC1F,MAAM,eAAe,CAAC;QACxB,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,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;IAC7F,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;AApED,4DAoEC"}
|
package/lib/Auth/AuthHandler.ts
CHANGED
|
@@ -45,7 +45,6 @@ export const AUTH_ROUTES_AND_PARAMS = {
|
|
|
45
45
|
magicLinksRoute: "/magic-link",
|
|
46
46
|
magicLinksExpressRoute: "/magic-link/:id",
|
|
47
47
|
confirmEmail: "/confirm-email",
|
|
48
|
-
confirmEmailExpressRoute: "/confirm-email",
|
|
49
48
|
catchAll: "*",
|
|
50
49
|
} as const;
|
|
51
50
|
|
|
@@ -183,10 +182,9 @@ export class AuthHandler {
|
|
|
183
182
|
magicLinksExpressRoute,
|
|
184
183
|
catchAll,
|
|
185
184
|
loginWithProvider,
|
|
186
|
-
emailRegistration
|
|
185
|
+
emailRegistration,
|
|
187
186
|
magicLinksRoute,
|
|
188
187
|
confirmEmail,
|
|
189
|
-
confirmEmailExpressRoute,
|
|
190
188
|
} = AUTH_ROUTES_AND_PARAMS;
|
|
191
189
|
|
|
192
190
|
removeExpressRoute(app, [
|
|
@@ -195,10 +193,9 @@ export class AuthHandler {
|
|
|
195
193
|
magicLinksExpressRoute,
|
|
196
194
|
catchAll,
|
|
197
195
|
loginWithProvider,
|
|
198
|
-
|
|
196
|
+
emailRegistration,
|
|
199
197
|
magicLinksRoute,
|
|
200
198
|
confirmEmail,
|
|
201
|
-
confirmEmailExpressRoute,
|
|
202
199
|
]);
|
|
203
200
|
};
|
|
204
201
|
|
package/lib/Auth/AuthTypes.ts
CHANGED
|
@@ -19,6 +19,7 @@ import {
|
|
|
19
19
|
IdentityProvider,
|
|
20
20
|
UserLike,
|
|
21
21
|
AuthSocketSchema,
|
|
22
|
+
ClientSchema,
|
|
22
23
|
} from "prostgles-types";
|
|
23
24
|
import { DBOFullyTyped } from "../DBSchemaBuilder";
|
|
24
25
|
import { PRGLIOSocket } from "../DboBuilder/DboBuilderTypes";
|
|
@@ -256,13 +257,19 @@ type AllNeverAndOptional<T> = {
|
|
|
256
257
|
[P in keyof T]?: never;
|
|
257
258
|
};
|
|
258
259
|
export type AuthResultWithSID<SU = SessionUser> =
|
|
259
|
-
| (SU & { sid: string; error?: undefined })
|
|
260
|
+
| (SU & { sid: string; error?: undefined; preferredLogin?: undefined })
|
|
260
261
|
| (AllNeverAndOptional<SU> & {
|
|
261
262
|
sid: string | undefined;
|
|
262
263
|
error?: AuthResponse.AuthFailure;
|
|
264
|
+
preferredLogin?: NonNullable<ClientSchema["auth"]>["preferredLogin"];
|
|
263
265
|
});
|
|
264
266
|
|
|
265
|
-
export type AuthResult<SU = SessionUser> =
|
|
267
|
+
export type AuthResult<SU = SessionUser> =
|
|
268
|
+
| SU
|
|
269
|
+
| undefined
|
|
270
|
+
| (AllNeverAndOptional<SU> & {
|
|
271
|
+
preferredLogin?: NonNullable<ClientSchema["auth"]>["preferredLogin"];
|
|
272
|
+
});
|
|
266
273
|
export type AuthResultOrError<SU = SessionUser> =
|
|
267
274
|
| AuthResponse.AuthFailure
|
|
268
275
|
| AuthResponse.AuthFailure["code"]
|
|
@@ -334,6 +341,10 @@ export type LoginResponse =
|
|
|
334
341
|
| AuthResponse.PasswordLoginFailure["code"]
|
|
335
342
|
| AuthResponse.MagicLinkAuthFailure["code"];
|
|
336
343
|
|
|
344
|
+
export type MagicLinkOrOTPData =
|
|
345
|
+
| { type: "magic-link"; magicId: string }
|
|
346
|
+
| { type: "otp"; code: string; email: string };
|
|
347
|
+
|
|
337
348
|
export type LoginParams =
|
|
338
349
|
| ({
|
|
339
350
|
type: "username";
|
|
@@ -382,14 +393,17 @@ export type LoginSignupConfig<S, SUser extends SessionUser> = {
|
|
|
382
393
|
* If defined, will enable GET /magic-link/:id route.
|
|
383
394
|
* Requests with valid magic link ids will be logged in and redirected to the returnUrl if set
|
|
384
395
|
*/
|
|
385
|
-
|
|
386
|
-
|
|
396
|
+
onMagicLinkOrOTP?: (
|
|
397
|
+
data: MagicLinkOrOTPData,
|
|
387
398
|
dbo: DBOFullyTyped<S>,
|
|
388
399
|
db: DB,
|
|
389
400
|
client: LoginClientInfo
|
|
390
401
|
) => Awaitable<
|
|
391
|
-
| { session: BasicSession; response?: AuthResponse.
|
|
392
|
-
| {
|
|
402
|
+
| { session: BasicSession; response?: AuthResponse.AuthSuccess }
|
|
403
|
+
| {
|
|
404
|
+
session?: undefined;
|
|
405
|
+
response: AuthResponse.MagicLinkAuthFailure | AuthResponse.CodeVerificationFailure;
|
|
406
|
+
}
|
|
393
407
|
>;
|
|
394
408
|
|
|
395
409
|
signupWithEmailAndPassword?: SignupWithEmailAndPassword;
|
|
@@ -10,6 +10,7 @@ export type LoginResponseHandler = Response<
|
|
|
10
10
|
| AuthResponse.PasswordLoginFailure
|
|
11
11
|
| AuthResponse.MagicLinkAuthFailure
|
|
12
12
|
| AuthResponse.MagicLinkAuthSuccess
|
|
13
|
+
| AuthResponse.CodeVerificationFailure
|
|
13
14
|
>;
|
|
14
15
|
|
|
15
16
|
export function setLoginRequestHandler(this: AuthHandler, app: e.Express) {
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import e from "express";
|
|
2
|
+
import { DBOFullyTyped } from "../../DBSchemaBuilder";
|
|
3
|
+
import {
|
|
4
|
+
AUTH_ROUTES_AND_PARAMS,
|
|
5
|
+
AuthHandler,
|
|
6
|
+
getClientRequestIPsInfo,
|
|
7
|
+
HTTP_FAIL_CODES,
|
|
8
|
+
} from "../AuthHandler";
|
|
9
|
+
import { ExpressReq, LoginSignupConfig, MagicLinkOrOTPData, SessionUser } from "../AuthTypes";
|
|
10
|
+
import { throttledAuthCall } from "../utils/throttledReject";
|
|
11
|
+
import { LoginResponseHandler } from "./setLoginRequestHandler";
|
|
12
|
+
|
|
13
|
+
export function setMagicLinkOrOTPRequestHandler(
|
|
14
|
+
this: AuthHandler,
|
|
15
|
+
onMagicLink: Required<LoginSignupConfig<void, SessionUser>>["onMagicLinkOrOTP"],
|
|
16
|
+
app: e.Express
|
|
17
|
+
) {
|
|
18
|
+
const handler = async (req: ExpressReq, res: LoginResponseHandler, data: MagicLinkOrOTPData) => {
|
|
19
|
+
try {
|
|
20
|
+
const response = await throttledAuthCall(async () => {
|
|
21
|
+
return onMagicLink(
|
|
22
|
+
data,
|
|
23
|
+
this.dbo as DBOFullyTyped,
|
|
24
|
+
this.db,
|
|
25
|
+
getClientRequestIPsInfo({ httpReq: req })
|
|
26
|
+
);
|
|
27
|
+
});
|
|
28
|
+
if (!response.session) {
|
|
29
|
+
res.status(HTTP_FAIL_CODES.UNAUTHORIZED).json(response.response);
|
|
30
|
+
} else {
|
|
31
|
+
this.setCookieAndGoToReturnURLIFSet(response.session, { req, res });
|
|
32
|
+
}
|
|
33
|
+
} catch (_e) {
|
|
34
|
+
res
|
|
35
|
+
.status(HTTP_FAIL_CODES.UNAUTHORIZED)
|
|
36
|
+
.json({ success: false, code: "something-went-wrong" });
|
|
37
|
+
}
|
|
38
|
+
};
|
|
39
|
+
app.get(AUTH_ROUTES_AND_PARAMS.magicLinksExpressRoute, (req, res: LoginResponseHandler) => {
|
|
40
|
+
const { id } = req.params;
|
|
41
|
+
|
|
42
|
+
if (typeof id !== "string" || !id) {
|
|
43
|
+
res
|
|
44
|
+
.status(HTTP_FAIL_CODES.BAD_REQUEST)
|
|
45
|
+
.json({ success: false, code: "invalid-magic-link", message: "Invalid magic link" });
|
|
46
|
+
}
|
|
47
|
+
return handler(req, res, { type: "magic-link", magicId: id });
|
|
48
|
+
});
|
|
49
|
+
app.post(AUTH_ROUTES_AND_PARAMS.magicLinksRoute, (req, res: LoginResponseHandler) => {
|
|
50
|
+
const { code, email } = req.body;
|
|
51
|
+
|
|
52
|
+
if (typeof code !== "string" || !code) {
|
|
53
|
+
res
|
|
54
|
+
.status(HTTP_FAIL_CODES.BAD_REQUEST)
|
|
55
|
+
.json({ success: false, code: "invalid-otp-code", message: "Invalid code" });
|
|
56
|
+
}
|
|
57
|
+
if (typeof email !== "string" || !email) {
|
|
58
|
+
res
|
|
59
|
+
.status(HTTP_FAIL_CODES.BAD_REQUEST)
|
|
60
|
+
.json({ success: false, code: "something-went-wrong", message: "Invalid email" });
|
|
61
|
+
}
|
|
62
|
+
return handler(req, res, { type: "otp", code, email });
|
|
63
|
+
});
|
|
64
|
+
}
|
|
@@ -73,6 +73,7 @@ export async function getClientAuth(
|
|
|
73
73
|
minPasswordLength: signupWithEmailAndPassword.minPasswordLength ?? 8,
|
|
74
74
|
url: AUTH_ROUTES_AND_PARAMS.emailRegistration,
|
|
75
75
|
},
|
|
76
|
+
preferredLogin: userData.preferredLogin,
|
|
76
77
|
user: userData.clientUser,
|
|
77
78
|
loginType: localLoginMode ?? (login ? "email+password" : undefined),
|
|
78
79
|
pathGuard,
|
|
@@ -4,11 +4,10 @@ import { AuthHandler, HTTP_FAIL_CODES } from "./AuthHandler";
|
|
|
4
4
|
import { setCatchAllRequestHandler } from "./endpoints/setCatchAllRequestHandler";
|
|
5
5
|
import { setConfirmEmailRequestHandler } from "./endpoints/setConfirmEmailRequestHandler";
|
|
6
6
|
import { setLoginRequestHandler } from "./endpoints/setLoginRequestHandler";
|
|
7
|
-
import {
|
|
7
|
+
import { setMagicLinkOrOTPRequestHandler } from "./endpoints/setMagicLinkOrOTPRequestHandler";
|
|
8
8
|
import { setOAuthRequestHandlers } from "./endpoints/setOAuthRequestHandlers";
|
|
9
9
|
import { setRegisterRequestHandler } from "./endpoints/setRegisterRequestHandler";
|
|
10
10
|
import { upsertNamedExpressMiddleware } from "./utils/upsertNamedExpressMiddleware";
|
|
11
|
-
import { removeExpressRoute } from "../FileManager/FileManager";
|
|
12
11
|
|
|
13
12
|
export async function setupAuthRoutes(this: AuthHandler) {
|
|
14
13
|
const { loginSignupConfig } = this.opts;
|
|
@@ -23,7 +22,7 @@ export async function setupAuthRoutes(this: AuthHandler) {
|
|
|
23
22
|
const {
|
|
24
23
|
app,
|
|
25
24
|
publicRoutes = [],
|
|
26
|
-
|
|
25
|
+
onMagicLinkOrOTP,
|
|
27
26
|
use,
|
|
28
27
|
loginWithOAuth,
|
|
29
28
|
signupWithEmailAndPassword,
|
|
@@ -62,8 +61,8 @@ export async function setupAuthRoutes(this: AuthHandler) {
|
|
|
62
61
|
upsertNamedExpressMiddleware(app, prostglesUseMiddleware, "prostglesUseMiddleware");
|
|
63
62
|
}
|
|
64
63
|
|
|
65
|
-
if (
|
|
66
|
-
|
|
64
|
+
if (onMagicLinkOrOTP) {
|
|
65
|
+
setMagicLinkOrOTPRequestHandler.bind(this)(onMagicLinkOrOTP, app);
|
|
67
66
|
}
|
|
68
67
|
|
|
69
68
|
setLoginRequestHandler.bind(this)(app);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.227",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"pg": "^8.11.5",
|
|
57
57
|
"pg-cursor": "^2.11.0",
|
|
58
58
|
"pg-promise": "^11.9.1",
|
|
59
|
-
"prostgles-types": "^4.0.
|
|
59
|
+
"prostgles-types": "^4.0.143"
|
|
60
60
|
},
|
|
61
61
|
"devDependencies": {
|
|
62
62
|
"@types/express": "^4.17.21",
|
|
@@ -1,5 +0,0 @@
|
|
|
1
|
-
import e from "express";
|
|
2
|
-
import { AuthHandler } from "../AuthHandler";
|
|
3
|
-
import { LoginSignupConfig, SessionUser } from "../AuthTypes";
|
|
4
|
-
export declare function setMagicLinkRequestHandler(this: AuthHandler, onMagicLink: Required<LoginSignupConfig<void, SessionUser>>["onMagicLink"], app: e.Express): void;
|
|
5
|
-
//# sourceMappingURL=setMagicLinkRequestHandler.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
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,EAAc,iBAAiB,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAI1E,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,QAAQ,CAAC,iBAAiB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,EAC1E,GAAG,EAAE,CAAC,CAAC,OAAO,QAgCf"}
|
|
@@ -1,36 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.setMagicLinkRequestHandler = void 0;
|
|
4
|
-
const AuthHandler_1 = require("../AuthHandler");
|
|
5
|
-
const throttledReject_1 = require("../utils/throttledReject");
|
|
6
|
-
function setMagicLinkRequestHandler(onMagicLink, app) {
|
|
7
|
-
const handler = async (req, res) => {
|
|
8
|
-
const { id } = req.params;
|
|
9
|
-
if (typeof id !== "string" || !id) {
|
|
10
|
-
res
|
|
11
|
-
.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST)
|
|
12
|
-
.json({ success: false, code: "something-went-wrong", message: "Invalid magic link" });
|
|
13
|
-
}
|
|
14
|
-
else {
|
|
15
|
-
try {
|
|
16
|
-
const response = await (0, throttledReject_1.throttledAuthCall)(async () => {
|
|
17
|
-
return onMagicLink(id, this.dbo, this.db, (0, AuthHandler_1.getClientRequestIPsInfo)({ httpReq: req }));
|
|
18
|
-
});
|
|
19
|
-
if (!response.session) {
|
|
20
|
-
res.status(AuthHandler_1.HTTP_FAIL_CODES.UNAUTHORIZED).json(response.response);
|
|
21
|
-
}
|
|
22
|
-
else {
|
|
23
|
-
this.setCookieAndGoToReturnURLIFSet(response.session, { req, res });
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
catch (_e) {
|
|
27
|
-
res
|
|
28
|
-
.status(AuthHandler_1.HTTP_FAIL_CODES.UNAUTHORIZED)
|
|
29
|
-
.json({ success: false, code: "something-went-wrong" });
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
};
|
|
33
|
-
app.get(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.magicLinksExpressRoute, handler);
|
|
34
|
-
}
|
|
35
|
-
exports.setMagicLinkRequestHandler = setMagicLinkRequestHandler;
|
|
36
|
-
//# sourceMappingURL=setMagicLinkRequestHandler.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"setMagicLinkRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkRequestHandler.ts"],"names":[],"mappings":";;;AAEA,gDAKwB;AAExB,8DAA6D;AAG7D,SAAgB,0BAA0B,CAExC,WAA0E,EAC1E,GAAc;IAEd,MAAM,OAAO,GAAG,KAAK,EAAE,GAAe,EAAE,GAAyB,EAAE,EAAE;QACnE,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,IAAA,mCAAiB,EAAC,KAAK,IAAI,EAAE;oBAClD,OAAO,WAAW,CAChB,EAAE,EACF,IAAI,CAAC,GAAoB,EACzB,IAAI,CAAC,EAAE,EACP,IAAA,qCAAuB,EAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAC1C,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,OAAO,CAAC,CAAC;AAClE,CAAC;AAnCD,gEAmCC"}
|
|
@@ -1,48 +0,0 @@
|
|
|
1
|
-
import e from "express";
|
|
2
|
-
import { DBOFullyTyped } from "../../DBSchemaBuilder";
|
|
3
|
-
import {
|
|
4
|
-
AUTH_ROUTES_AND_PARAMS,
|
|
5
|
-
AuthHandler,
|
|
6
|
-
getClientRequestIPsInfo,
|
|
7
|
-
HTTP_FAIL_CODES,
|
|
8
|
-
} from "../AuthHandler";
|
|
9
|
-
import { ExpressReq, LoginSignupConfig, SessionUser } from "../AuthTypes";
|
|
10
|
-
import { throttledAuthCall } from "../utils/throttledReject";
|
|
11
|
-
import { LoginResponseHandler } from "./setLoginRequestHandler";
|
|
12
|
-
|
|
13
|
-
export function setMagicLinkRequestHandler(
|
|
14
|
-
this: AuthHandler,
|
|
15
|
-
onMagicLink: Required<LoginSignupConfig<void, SessionUser>>["onMagicLink"],
|
|
16
|
-
app: e.Express
|
|
17
|
-
) {
|
|
18
|
-
const handler = async (req: ExpressReq, res: LoginResponseHandler) => {
|
|
19
|
-
const { id } = req.params;
|
|
20
|
-
|
|
21
|
-
if (typeof id !== "string" || !id) {
|
|
22
|
-
res
|
|
23
|
-
.status(HTTP_FAIL_CODES.BAD_REQUEST)
|
|
24
|
-
.json({ success: false, code: "something-went-wrong", message: "Invalid magic link" });
|
|
25
|
-
} else {
|
|
26
|
-
try {
|
|
27
|
-
const response = await throttledAuthCall(async () => {
|
|
28
|
-
return onMagicLink(
|
|
29
|
-
id,
|
|
30
|
-
this.dbo as DBOFullyTyped,
|
|
31
|
-
this.db,
|
|
32
|
-
getClientRequestIPsInfo({ httpReq: req })
|
|
33
|
-
);
|
|
34
|
-
});
|
|
35
|
-
if (!response.session) {
|
|
36
|
-
res.status(HTTP_FAIL_CODES.UNAUTHORIZED).json(response.response);
|
|
37
|
-
} else {
|
|
38
|
-
this.setCookieAndGoToReturnURLIFSet(response.session, { req, res });
|
|
39
|
-
}
|
|
40
|
-
} catch (_e) {
|
|
41
|
-
res
|
|
42
|
-
.status(HTTP_FAIL_CODES.UNAUTHORIZED)
|
|
43
|
-
.json({ success: false, code: "something-went-wrong" });
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
};
|
|
47
|
-
app.get(AUTH_ROUTES_AND_PARAMS.magicLinksExpressRoute, handler);
|
|
48
|
-
}
|