prostgles-server 4.2.684 → 4.2.687
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 -11
- package/dist/Auth/AuthHandler.d.ts.map +1 -1
- package/dist/Auth/AuthHandler.js +9 -12
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +27 -14
- package/dist/Auth/AuthTypes.d.ts.map +1 -1
- package/dist/Auth/AuthTypes.js +2 -2
- package/dist/Auth/AuthTypes.js.map +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.d.ts +2 -3
- package/dist/Auth/endpoints/setLoginRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.js +4 -38
- package/dist/Auth/endpoints/setLoginRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.js +28 -81
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setRegisterRequestHandler.d.ts +1 -1
- package/dist/Auth/endpoints/setRegisterRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setRegisterRequestHandler.js +25 -45
- package/dist/Auth/endpoints/setRegisterRequestHandler.js.map +1 -1
- package/dist/Auth/login.d.ts.map +1 -1
- package/dist/Auth/login.js +6 -4
- package/dist/Auth/login.js.map +1 -1
- package/dist/Auth/utils/createAuthRequestHandler.d.ts +9 -0
- package/dist/Auth/utils/createAuthRequestHandler.d.ts.map +1 -0
- package/dist/Auth/utils/createAuthRequestHandler.js +46 -0
- package/dist/Auth/utils/createAuthRequestHandler.js.map +1 -0
- package/dist/Auth/utils/getAuthResponse.d.ts +3 -0
- package/dist/Auth/utils/getAuthResponse.d.ts.map +1 -0
- package/dist/Auth/utils/getAuthResponse.js +14 -0
- package/dist/Auth/utils/getAuthResponse.js.map +1 -0
- package/dist/Auth/utils/setCookieAndGoToReturnURLIfSet.d.ts +2 -1
- package/dist/Auth/utils/setCookieAndGoToReturnURLIfSet.d.ts.map +1 -1
- package/dist/Auth/utils/setCookieAndGoToReturnURLIfSet.js.map +1 -1
- package/dist/DboBuilder/TableHandler/updateFile.d.ts +1 -1
- package/dist/StorageClient/fileTableDefinitions.d.ts +1 -1
- package/package.json +2 -2
|
@@ -28,8 +28,8 @@ export declare const AUTH_ROUTES: {
|
|
|
28
28
|
readonly magicLinks: "/magic-link";
|
|
29
29
|
readonly magicLinkWithId: "/magic-link/:id";
|
|
30
30
|
};
|
|
31
|
-
export declare const
|
|
32
|
-
export declare const
|
|
31
|
+
export declare const getAuthRoute: (conf: AuthConfig["loginSignupConfig"], route: keyof typeof AUTH_ROUTES) => string;
|
|
32
|
+
export declare const getAllAuthRoutes: (conf: AuthConfig["loginSignupConfig"]) => Record<"login" | "loginWithProvider" | "emailRegistration" | "logout" | "magicLinks" | "magicLinkWithId", string>;
|
|
33
33
|
export declare class AuthHandler {
|
|
34
34
|
protected readonly prostgles: Prostgles;
|
|
35
35
|
protected readonly config: AuthConfig | undefined;
|
|
@@ -40,14 +40,7 @@ export declare class AuthHandler {
|
|
|
40
40
|
};
|
|
41
41
|
constructor(prostgles: Prostgles);
|
|
42
42
|
get sidKeyName(): string;
|
|
43
|
-
get authRoutes():
|
|
44
|
-
readonly login: string;
|
|
45
|
-
readonly loginWithProvider: string;
|
|
46
|
-
readonly emailRegistration: string;
|
|
47
|
-
readonly logout: string;
|
|
48
|
-
readonly magicLinks: string;
|
|
49
|
-
readonly magicLinkWithId: string;
|
|
50
|
-
};
|
|
43
|
+
get authRoutes(): Record<"login" | "loginWithProvider" | "emailRegistration" | "logout" | "magicLinks" | "magicLinkWithId", string>;
|
|
51
44
|
init: (config: AuthConfig) => void;
|
|
52
45
|
validateSid: (sid: string | undefined) => string | undefined;
|
|
53
46
|
isUserRoute: (pathname: string) => boolean;
|
|
@@ -56,7 +49,7 @@ export declare class AuthHandler {
|
|
|
56
49
|
expires: number;
|
|
57
50
|
}, requestHandler: {
|
|
58
51
|
req: import("./AuthTypes").ExpressReq;
|
|
59
|
-
res: import("
|
|
52
|
+
res: Pick<import("express").Response, "cookie" | "redirect">;
|
|
60
53
|
}) => void;
|
|
61
54
|
validateSessionAndSetCookie: (cookie: {
|
|
62
55
|
sid: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,EAA0B,KAAK,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEzF,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAMzF,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,CAAC;AAChF,eAAO,MAAM,eAAe;;;;;;;CAOlB,CAAC;AAEX,eAAO,MAAM,kBAAkB;;;CAGrB,CAAC;AAGX,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAChD,eAAO,MAAM,0BAA0B,cAAc,CAAC;AACtD,eAAO,MAAM,WAAW;;;;;;;CAOd,CAAC;AACX,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,EAA0B,KAAK,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEzF,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAMzF,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,CAAC;AAChF,eAAO,MAAM,eAAe;;;;;;;CAOlB,CAAC;AAEX,eAAO,MAAM,kBAAkB;;;CAGrB,CAAC;AAGX,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAChD,eAAO,MAAM,0BAA0B,cAAc,CAAC;AACtD,eAAO,MAAM,WAAW;;;;;;;CAOd,CAAC;AACX,eAAO,MAAM,YAAY,GACvB,MAAM,UAAU,CAAC,mBAAmB,CAAC,EACrC,OAAO,MAAM,OAAO,WAAW,WAIhC,CAAC;AACF,eAAO,MAAM,gBAAgB,GAAI,MAAM,UAAU,CAAC,mBAAmB,CAAC,sHAErE,CAAC;AAEF,qBAAa,WAAW;IACtB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC;IAClD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA4B;IAE3D,IAAI,SAAS;aAKU,eAAe;;MACrC;gBAGW,SAAS,EAAE,SAAS;IAShC,IAAI,UAAU,WAEb;IAED,IAAI,UAAU,sHAEb;IAED,IAAI,+BAA8B;IAElC,WAAW,GAAI,KAAK,MAAM,GAAG,SAAS,wBAIpC;IAEF,WAAW,GAAI,UAAU,MAAM,aAkB7B;IAEF,8BAA8B;;;;;;eAA6C;IAC3E,2BAA2B;;;;;;mFAA0C;IACrE,aAAa,GAAI,WAAW,iBAAiB,KAAG,OAAO,CAAC,mBAAmB,CAAC,CAiB1E;IAEF,kBAAkB,GAAI,QAAQ,0BAA0B,UAAwC;IAEhG;;;;OAIG;IACH,cAAc,GAAU,WAAW,iBAAiB,KAAG,OAAO,CAAC,mBAAmB,CAAC,CASjF;IAEF,OAAO,aAqBL;IAEF,KAAK,4PAAoB;IAEzB;;;;;;OAMG;IACH,eAAe,CAAC,cAAc,EAAE,iBAAiB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;IAyClF;;OAEG;IACH,aAAa,GAAI,WAAW,iBAAiB,GAAG,SAAS,KAAG,MAAM,GAAG,SAAS,CAO5E;IAEF,wBAAwB,iEAAuC;IAE/D,aAAa;;;gCAA4B;CAC1C"}
|
package/dist/Auth/AuthHandler.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.AuthHandler = exports.
|
|
3
|
+
exports.AuthHandler = exports.getAllAuthRoutes = exports.getAuthRoute = exports.AUTH_ROUTES = exports.AUTH_RETURN_URL_PARAM_NAME = exports.EXPRESS_CATCH_ALL_ROUTE = exports.HTTP_SUCCESS_CODES = exports.HTTP_FAIL_CODES = exports.removeExpressRoutesTest = exports.removeExpressRoute = exports.getClientRequestIPsInfo = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const getClientAuth_1 = require("./getClientAuth");
|
|
6
6
|
const login_1 = require("./login");
|
|
@@ -38,18 +38,15 @@ exports.AUTH_ROUTES = {
|
|
|
38
38
|
magicLinks: "/magic-link",
|
|
39
39
|
magicLinkWithId: "/magic-link/:id",
|
|
40
40
|
};
|
|
41
|
-
const
|
|
41
|
+
const getAuthRoute = (conf, route) => {
|
|
42
42
|
const basePath = conf?.authRoutesBasePath || "";
|
|
43
43
|
return `${basePath}${exports.AUTH_ROUTES[route]}`;
|
|
44
44
|
};
|
|
45
|
-
exports.
|
|
46
|
-
const
|
|
47
|
-
return
|
|
48
|
-
key,
|
|
49
|
-
(0, exports.GET_AUTH_ROUTE)(conf, key),
|
|
50
|
-
]));
|
|
45
|
+
exports.getAuthRoute = getAuthRoute;
|
|
46
|
+
const getAllAuthRoutes = (conf) => {
|
|
47
|
+
return (0, prostgles_types_1.fromEntries)((0, prostgles_types_1.getEntries)(exports.AUTH_ROUTES).map(([key]) => [key, (0, exports.getAuthRoute)(conf, key)]));
|
|
51
48
|
};
|
|
52
|
-
exports.
|
|
49
|
+
exports.getAllAuthRoutes = getAllAuthRoutes;
|
|
53
50
|
class AuthHandler {
|
|
54
51
|
prostgles;
|
|
55
52
|
config;
|
|
@@ -74,7 +71,7 @@ class AuthHandler {
|
|
|
74
71
|
return this.config?.sidKeyName ?? SID_KEY_NAME;
|
|
75
72
|
}
|
|
76
73
|
get authRoutes() {
|
|
77
|
-
return (0, exports.
|
|
74
|
+
return (0, exports.getAllAuthRoutes)(this.config?.loginSignupConfig);
|
|
78
75
|
}
|
|
79
76
|
init = setupAuthRoutes_1.setupAuthRoutes.bind(this);
|
|
80
77
|
validateSid = (sid) => {
|
|
@@ -85,7 +82,7 @@ class AuthHandler {
|
|
|
85
82
|
return sid;
|
|
86
83
|
};
|
|
87
84
|
isUserRoute = (pathname) => {
|
|
88
|
-
const { login, logout: logoutRoute, magicLinks: magicLinksRoute, loginWithProvider, } = (0, exports.
|
|
85
|
+
const { login, logout: logoutRoute, magicLinks: magicLinksRoute, loginWithProvider, } = (0, exports.getAllAuthRoutes)(this.config?.loginSignupConfig);
|
|
89
86
|
const pubRoutes = [
|
|
90
87
|
...(this.config?.loginSignupConfig?.publicRoutes || []),
|
|
91
88
|
login,
|
|
@@ -136,7 +133,7 @@ class AuthHandler {
|
|
|
136
133
|
destroy = () => {
|
|
137
134
|
this.socketSessions.destroy();
|
|
138
135
|
const app = this.config?.loginSignupConfig?.app;
|
|
139
|
-
const { login, logout, magicLinkWithId: magicLinksIdParam, loginWithProvider, emailRegistration, magicLinks, } = (0, exports.
|
|
136
|
+
const { login, logout, magicLinkWithId: magicLinksIdParam, loginWithProvider, emailRegistration, magicLinks, } = (0, exports.getAllAuthRoutes)(this.config?.loginSignupConfig);
|
|
140
137
|
(0, removeExpressRoute_1.removeExpressRoute)(app, [
|
|
141
138
|
login,
|
|
142
139
|
logout,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":";;;AACA,
|
|
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 GitHubProfile, StrategyOptions as GitHubStrategy } from
|
|
|
5
5
|
import type { Profile as GoogleProfile, StrategyOptions as GoogleStrategy } from "passport-google-oauth20";
|
|
6
6
|
import type { MicrosoftStrategyOptions } from "passport-microsoft";
|
|
7
7
|
import type OAuth2Strategy from "passport-oauth2";
|
|
8
|
-
import type { AnyObject, AuthRequest, AuthResponse, ClientSchema, FieldFilter, FullFilter, IdentityProvider, LocalLoginMode, MaybePromise, UserLike } from "prostgles-types";
|
|
8
|
+
import type { AnyObject, AuthInput, AuthOutput, AuthRequest, AuthResponse, ClientSchema, FieldFilter, FullFilter, IdentityProvider, LocalLoginMode, MaybePromise, UserLike } from "prostgles-types";
|
|
9
9
|
import type { DBHandlerServer } from "../DBSchemaBuilder/DBSchemaBuilder";
|
|
10
10
|
import type { ClientSocketWithCachedData } from "../DboBuilder/DboBuilderTypes";
|
|
11
11
|
import type { DB } from "../Prostgles";
|
|
@@ -57,7 +57,7 @@ export type ThirdPartyProviders = {
|
|
|
57
57
|
displayIconPath?: string;
|
|
58
58
|
};
|
|
59
59
|
};
|
|
60
|
-
type PasswordRegisterResponse =
|
|
60
|
+
type PasswordRegisterResponse = AuthOutput<"register">;
|
|
61
61
|
/**
|
|
62
62
|
* Users have to provide an email and optionally a password.
|
|
63
63
|
* Account should be activated after email confirmation
|
|
@@ -75,7 +75,7 @@ export type SignupWithEmail = {
|
|
|
75
75
|
* Called when the user has registered.
|
|
76
76
|
*/
|
|
77
77
|
onRegister: (data: {
|
|
78
|
-
email:
|
|
78
|
+
email: AuthInput<"register">["username"];
|
|
79
79
|
/**
|
|
80
80
|
* Password after validation.
|
|
81
81
|
* Will be empty if requirePassword is false
|
|
@@ -256,21 +256,30 @@ export type AuthConfig<S = void, SUser extends SessionUser = SessionUser> = {
|
|
|
256
256
|
};
|
|
257
257
|
export type LoginResponse = {
|
|
258
258
|
session: BasicSession;
|
|
259
|
-
response?:
|
|
259
|
+
response?: Extract<AuthOutput<"login">, {
|
|
260
|
+
success: true;
|
|
261
|
+
code?: undefined;
|
|
262
|
+
}>;
|
|
260
263
|
} | {
|
|
261
264
|
session?: undefined;
|
|
262
|
-
response:
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
265
|
+
response: Extract<AuthOutput<"login">, {
|
|
266
|
+
success: true;
|
|
267
|
+
code: string;
|
|
268
|
+
}>;
|
|
269
|
+
} | Extract<AuthOutput<"login">, {
|
|
270
|
+
success: false;
|
|
271
|
+
}>["code"];
|
|
272
|
+
export type MagicLinkOrOTPData = (Extract<AuthInput<"magicLinkOrOTP">, {
|
|
266
273
|
id: string;
|
|
274
|
+
}> & {
|
|
275
|
+
type: "magic-link";
|
|
267
276
|
returnToken: boolean;
|
|
268
|
-
} | {
|
|
269
|
-
type: "otp";
|
|
270
|
-
code: string;
|
|
277
|
+
}) | (Extract<AuthInput<"magicLinkOrOTP">, {
|
|
271
278
|
email: string;
|
|
279
|
+
}> & {
|
|
280
|
+
type: "otp";
|
|
272
281
|
returnToken: boolean;
|
|
273
|
-
};
|
|
282
|
+
});
|
|
274
283
|
export declare const getMagicLinkUrl: ({ websiteUrl, data, loginSignupConfig, }: {
|
|
275
284
|
websiteUrl: string;
|
|
276
285
|
data: MagicLinkOrOTPData;
|
|
@@ -315,10 +324,14 @@ export type LoginSignupConfig<S, SUser extends SessionUser> = {
|
|
|
315
324
|
*/
|
|
316
325
|
onMagicLinkOrOTP?: (data: MagicLinkOrOTPData, dbo: DBHandlerServer<S>, db: DB, client: LoginClientInfo) => Awaitable<{
|
|
317
326
|
session: BasicSession | undefined;
|
|
318
|
-
response?:
|
|
327
|
+
response?: Extract<AuthOutput<"magicLinkOrOTP">, {
|
|
328
|
+
success: true;
|
|
329
|
+
}>;
|
|
319
330
|
} | {
|
|
320
331
|
session?: undefined;
|
|
321
|
-
response:
|
|
332
|
+
response: Extract<AuthOutput<"magicLinkOrOTP">, {
|
|
333
|
+
success: false;
|
|
334
|
+
}>;
|
|
322
335
|
}>;
|
|
323
336
|
signupWithEmail?: SignupWithEmail;
|
|
324
337
|
loginWithOAuth?: LoginWithOAuthConfig<S>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthTypes.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AuthTypes.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":"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"}
|
package/dist/Auth/AuthTypes.js
CHANGED
|
@@ -4,10 +4,10 @@ exports.getMagicLinkUrl = void 0;
|
|
|
4
4
|
const AuthHandler_1 = require("./AuthHandler");
|
|
5
5
|
const getMagicLinkUrl = ({ websiteUrl, data, loginSignupConfig, }) => {
|
|
6
6
|
if (data.type === "magic-link") {
|
|
7
|
-
return `${(0, AuthHandler_1.
|
|
7
|
+
return new URL(`${(0, AuthHandler_1.getAuthRoute)(loginSignupConfig, "magicLinks")}/${encodeURIComponent(data.id)}`, websiteUrl).toString();
|
|
8
8
|
}
|
|
9
9
|
const { code, email } = data;
|
|
10
|
-
const confirmationUrl = new URL(`${websiteUrl}${(0, AuthHandler_1.
|
|
10
|
+
const confirmationUrl = new URL(`${websiteUrl}${(0, AuthHandler_1.getAuthRoute)(loginSignupConfig, "magicLinks")}`);
|
|
11
11
|
confirmationUrl.searchParams.set("email", email);
|
|
12
12
|
confirmationUrl.searchParams.set("code", code);
|
|
13
13
|
return confirmationUrl.toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthTypes.js","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"AuthTypes.js","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":";;;AA8BA,+CAA6C;AAmUtC,MAAM,eAAe,GAAG,CAAC,EAC9B,UAAU,EACV,IAAI,EACJ,iBAAiB,GAKlB,EAAE,EAAE;IACH,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAC/B,OAAO,IAAI,GAAG,CACZ,GAAG,IAAA,0BAAY,EAAC,iBAAiB,EAAE,YAAY,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EACjF,UAAU,CACX,CAAC,QAAQ,EAAE,CAAC;IACf,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAC7B,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,GAAG,UAAU,GAAG,IAAA,0BAAY,EAAC,iBAAiB,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;IACjG,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACjD,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC/C,OAAO,eAAe,CAAC,QAAQ,EAAE,CAAC;AACpC,CAAC,CAAC;AApBW,QAAA,eAAe,mBAoB1B"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import type e from "express";
|
|
2
2
|
import type { Response } from "express";
|
|
3
|
-
import type {
|
|
3
|
+
import type { AuthOutput } from "prostgles-types";
|
|
4
4
|
import type { AuthHandler } from "../AuthHandler";
|
|
5
|
-
export type LoginResponse =
|
|
5
|
+
export type LoginResponse = AuthOutput<"login">;
|
|
6
6
|
export type LoginResponseHandler = Response<LoginResponse>;
|
|
7
7
|
export declare function setLoginRequestHandler(this: AuthHandler, app: e.Express): void;
|
|
8
|
-
export declare const parseLoginData: (bodyData: any) => [string, undefined] | [undefined, AuthRequest.LoginData];
|
|
9
8
|
//# 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,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"setLoginRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAGlD,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;AAChD,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;AAE3D,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,QAOvE"}
|
|
@@ -1,44 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.parseLoginData = void 0;
|
|
4
3
|
exports.setLoginRequestHandler = setLoginRequestHandler;
|
|
5
|
-
const
|
|
6
|
-
const AuthHandler_1 = require("../AuthHandler");
|
|
4
|
+
const createAuthRequestHandler_1 = require("../utils/createAuthRequestHandler");
|
|
7
5
|
function setLoginRequestHandler(app) {
|
|
8
|
-
app.post(this.authRoutes.login, async (req, res) => {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
return res
|
|
12
|
-
.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST)
|
|
13
|
-
.json({ success: false, code: "something-went-wrong", message: error });
|
|
14
|
-
}
|
|
15
|
-
try {
|
|
16
|
-
const loginParams = {
|
|
17
|
-
...loginData,
|
|
18
|
-
type: "username",
|
|
19
|
-
};
|
|
20
|
-
await this.login(req, res, loginParams);
|
|
21
|
-
}
|
|
22
|
-
catch (_error) {
|
|
23
|
-
res.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST).json({ success: false, code: "server-error" });
|
|
24
|
-
}
|
|
25
|
-
});
|
|
6
|
+
app.post(this.authRoutes.login, (0, createAuthRequestHandler_1.createAuthRequestHandler)("login", async (loginData, req, res) => {
|
|
7
|
+
await this.login(req, res, { ...loginData, type: "username" });
|
|
8
|
+
}));
|
|
26
9
|
}
|
|
27
|
-
const parseLoginData = (bodyData) => {
|
|
28
|
-
const loginDataValidation = (0, prostgles_types_1.getJSONBSchemaValidationError)({
|
|
29
|
-
type: {
|
|
30
|
-
username: "string",
|
|
31
|
-
password: { type: "string", optional: true },
|
|
32
|
-
remember_me: { type: "boolean", optional: true },
|
|
33
|
-
totp_token: { type: "string", optional: true },
|
|
34
|
-
totp_recovery_code: { type: "string", optional: true },
|
|
35
|
-
},
|
|
36
|
-
}, bodyData);
|
|
37
|
-
if (loginDataValidation.error !== undefined) {
|
|
38
|
-
return [loginDataValidation.error, undefined];
|
|
39
|
-
}
|
|
40
|
-
const loginData = loginDataValidation.data;
|
|
41
|
-
return [undefined, loginData];
|
|
42
|
-
};
|
|
43
|
-
exports.parseLoginData = parseLoginData;
|
|
44
10
|
//# sourceMappingURL=setLoginRequestHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setLoginRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setLoginRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":";;AASA,wDAOC;AAZD,gFAA6E;AAK7E,SAAgB,sBAAsB,CAAoB,GAAc;IACtE,GAAG,CAAC,IAAI,CACN,IAAI,CAAC,UAAU,CAAC,KAAK,EACrB,IAAA,mDAAwB,EAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QAC9D,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,GAAG,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;IACjE,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setMagicLinkOrOTPRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"setMagicLinkOrOTPRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,KAAK,EAAE,iBAAiB,EAAsB,WAAW,EAAE,MAAM,cAAc,CAAC;AAIvF,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,QA4Cf"}
|
|
@@ -3,93 +3,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.setMagicLinkOrOTPRequestHandler = setMagicLinkOrOTPRequestHandler;
|
|
4
4
|
const AuthHandler_1 = require("../AuthHandler");
|
|
5
5
|
const throttledReject_1 = require("../utils/throttledReject");
|
|
6
|
+
const createAuthRequestHandler_1 = require("../utils/createAuthRequestHandler");
|
|
6
7
|
function setMagicLinkOrOTPRequestHandler(onMagicLink, app) {
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
return onMagicLink(data, dbo, db, (0, AuthHandler_1.getClientRequestIPsInfo)({ httpReq: req }));
|
|
12
|
-
});
|
|
13
|
-
if (!response.session) {
|
|
14
|
-
res
|
|
15
|
-
.status(response.response?.success ? AuthHandler_1.HTTP_SUCCESS_CODES.OK : AuthHandler_1.HTTP_FAIL_CODES.UNAUTHORIZED)
|
|
16
|
-
.json(response.response);
|
|
17
|
-
}
|
|
18
|
-
else {
|
|
19
|
-
if (data.returnToken) {
|
|
20
|
-
return res.json({ success: true, token: response.session.sid });
|
|
21
|
-
}
|
|
22
|
-
this.setCookieAndGoToReturnURLIfSet(response.session, { req, res });
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
catch (_e) {
|
|
8
|
+
const createMagicLinkOrOTPHandler = (dataSource) => (0, createAuthRequestHandler_1.createAuthRequestHandler)("magicLinkOrOTP", async ({ returnToken = false, ...request }, req, res) => {
|
|
9
|
+
if ("id" in request ?
|
|
10
|
+
typeof request.id !== "string" || !request.id
|
|
11
|
+
: !request.email || !request.code) {
|
|
26
12
|
res
|
|
27
13
|
.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST)
|
|
28
14
|
.json({ success: false, code: "something-went-wrong" });
|
|
29
|
-
}
|
|
30
|
-
};
|
|
31
|
-
app.get(this.authRoutes.magicLinkWithId, (req, res) => {
|
|
32
|
-
const { id } = req.params;
|
|
33
|
-
if (typeof id !== "string" || !id) {
|
|
34
|
-
return res
|
|
35
|
-
.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST)
|
|
36
|
-
.json({ success: false, code: "invalid-magic-link", message: "Invalid magic link" });
|
|
37
|
-
}
|
|
38
|
-
return handler(req, res, { type: "magic-link", id, returnToken: false });
|
|
39
|
-
});
|
|
40
|
-
app.get(this.authRoutes.magicLinks, (req, res) => {
|
|
41
|
-
const data = parseMagicLinkOrOTPData(res, req.query);
|
|
42
|
-
if (!data)
|
|
43
|
-
return;
|
|
44
|
-
return handler(req, res, data);
|
|
45
|
-
});
|
|
46
|
-
app.post(this.authRoutes.magicLinks, (req, res) => {
|
|
47
|
-
const data = parseMagicLinkOrOTPData(res, req.body);
|
|
48
|
-
if (!data)
|
|
49
|
-
return;
|
|
50
|
-
return handler(req, res, data);
|
|
51
|
-
});
|
|
52
|
-
}
|
|
53
|
-
const parseMagicLinkOrOTPData = (res, data) => {
|
|
54
|
-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
55
|
-
const { id, code, email, returnToken = false } = data;
|
|
56
|
-
if (typeof returnToken !== "boolean") {
|
|
57
|
-
res.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST).json({
|
|
58
|
-
success: false,
|
|
59
|
-
code: "something-went-wrong",
|
|
60
|
-
message: "Invalid magic link request. Must provide returnToken must be of type boolean",
|
|
61
|
-
});
|
|
62
|
-
return;
|
|
63
|
-
}
|
|
64
|
-
const noCode = typeof code !== "string" || !code;
|
|
65
|
-
const noEmail = typeof email !== "string" || !email;
|
|
66
|
-
if (typeof id !== "string" || !id) {
|
|
67
|
-
if (noCode && noEmail) {
|
|
68
|
-
res.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST).json({
|
|
69
|
-
success: false,
|
|
70
|
-
code: "something-went-wrong",
|
|
71
|
-
message: "Invalid magic link. Must provide id or email and code",
|
|
72
|
-
});
|
|
73
15
|
return;
|
|
74
16
|
}
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
});
|
|
81
|
-
|
|
17
|
+
const data = "id" in request ?
|
|
18
|
+
{ ...request, type: "magic-link", returnToken }
|
|
19
|
+
: { ...request, type: "otp", returnToken };
|
|
20
|
+
const response = await (0, throttledReject_1.throttledAuthCall)(async () => {
|
|
21
|
+
const { db, dbo } = this.dbHandles;
|
|
22
|
+
return onMagicLink(data, dbo, db, (0, AuthHandler_1.getClientRequestIPsInfo)({ httpReq: req }));
|
|
23
|
+
});
|
|
24
|
+
if (!response.session) {
|
|
25
|
+
return response.response;
|
|
82
26
|
}
|
|
83
|
-
if (
|
|
84
|
-
|
|
85
|
-
success: false,
|
|
86
|
-
code: "invalid-email",
|
|
87
|
-
message: "Invalid or empty email",
|
|
88
|
-
});
|
|
89
|
-
return;
|
|
27
|
+
if (returnToken) {
|
|
28
|
+
return { success: true, token: response.session.sid };
|
|
90
29
|
}
|
|
91
|
-
|
|
92
|
-
}
|
|
93
|
-
|
|
94
|
-
|
|
30
|
+
this.setCookieAndGoToReturnURLIfSet(response.session, { req, res });
|
|
31
|
+
}, {
|
|
32
|
+
dataSource,
|
|
33
|
+
/* Query strings can also contain returnURL. */
|
|
34
|
+
allowExtraProperties: dataSource === "query",
|
|
35
|
+
failureStatusCode: AuthHandler_1.HTTP_FAIL_CODES.UNAUTHORIZED,
|
|
36
|
+
onError: () => ({ success: false, code: "something-went-wrong" }),
|
|
37
|
+
});
|
|
38
|
+
app.get(this.authRoutes.magicLinkWithId, createMagicLinkOrOTPHandler("params"));
|
|
39
|
+
app.get(this.authRoutes.magicLinks, createMagicLinkOrOTPHandler("query"));
|
|
40
|
+
app.post(this.authRoutes.magicLinks, createMagicLinkOrOTPHandler("body"));
|
|
41
|
+
}
|
|
95
42
|
//# sourceMappingURL=setMagicLinkOrOTPRequestHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setMagicLinkOrOTPRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"setMagicLinkOrOTPRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts"],"names":[],"mappings":";;AAOA,0EA+CC;AApDD,gDAA0E;AAE1E,8DAA6D;AAC7D,gFAA6E;AAE7E,SAAgB,+BAA+B,CAE7C,WAA+E,EAC/E,GAAc;IAEd,MAAM,2BAA2B,GAAG,CAAC,UAAuC,EAAE,EAAE,CAC9E,IAAA,mDAAwB,EACtB,gBAAgB,EAChB,KAAK,EAAE,EAAE,WAAW,GAAG,KAAK,EAAE,GAAG,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QACtD,IACE,IAAI,IAAI,OAAO,CAAC,CAAC;YACf,OAAO,OAAO,CAAC,EAAE,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,EAAE;YAC/C,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,EACjC,CAAC;YACD,GAAG;iBACA,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC;iBACnC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC,CAAC;YAC1D,OAAO;QACT,CAAC;QACD,MAAM,IAAI,GACR,IAAI,IAAI,OAAO,CAAC,CAAC;YACf,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE;YACjD,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,MAAM,IAAA,mCAAiB,EAAC,KAAK,IAAI,EAAE;YAClD,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;YACnC,OAAO,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,IAAA,qCAAuB,EAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QAC/E,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO,QAAQ,CAAC,QAAQ,CAAC;QAC3B,CAAC;QACD,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QACxD,CAAC;QACD,IAAI,CAAC,8BAA8B,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IACtE,CAAC,EACD;QACE,UAAU;QACV,+CAA+C;QAC/C,oBAAoB,EAAE,UAAU,KAAK,OAAO;QAC5C,iBAAiB,EAAE,6BAAe,CAAC,YAAY;QAC/C,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC;KAClE,CACF,CAAC;IAEJ,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,2BAA2B,CAAC,QAAQ,CAAC,CAAC,CAAC;IAChF,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,2BAA2B,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1E,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,2BAA2B,CAAC,MAAM,CAAC,CAAC,CAAC;AAC5E,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type e from "express";
|
|
2
|
-
import {
|
|
2
|
+
import type { AuthHandler } from "../AuthHandler";
|
|
3
3
|
import { type SignupWithEmail } from "../AuthTypes";
|
|
4
4
|
export declare function setRegisterRequestHandler(this: AuthHandler, { onRegister, minPasswordLength, requirePassword }: SignupWithEmail, app: e.Express): void;
|
|
5
5
|
//# sourceMappingURL=setRegisterRequestHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setRegisterRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setRegisterRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"setRegisterRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setRegisterRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAIrE,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,WAAW,EACjB,EAAE,UAAU,EAAE,iBAAqB,EAAE,eAAe,EAAE,EAAE,eAAe,EACvE,GAAG,EAAE,CAAC,CAAC,OAAO,QA0Cf"}
|
|
@@ -1,64 +1,44 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.setRegisterRequestHandler = setRegisterRequestHandler;
|
|
4
|
-
const AuthHandler_1 = require("../AuthHandler");
|
|
5
4
|
const AuthTypes_1 = require("../AuthTypes");
|
|
6
5
|
const getClientRequestIPsInfo_1 = require("../utils/getClientRequestIPsInfo");
|
|
7
|
-
const
|
|
6
|
+
const createAuthRequestHandler_1 = require("../utils/createAuthRequestHandler");
|
|
8
7
|
function setRegisterRequestHandler({ onRegister, minPasswordLength = 8, requirePassword }, app) {
|
|
9
|
-
const registerRequestHandler = async (
|
|
10
|
-
const [error, data] = (0, setLoginRequestHandler_1.parseLoginData)(req.body);
|
|
11
|
-
if (error || !data) {
|
|
12
|
-
return res
|
|
13
|
-
.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST)
|
|
14
|
-
.json({ success: false, code: "something-went-wrong", message: error });
|
|
15
|
-
}
|
|
16
|
-
const { username, password = "" } = data;
|
|
17
|
-
const sendResponse = (response) => {
|
|
18
|
-
if (response.success) {
|
|
19
|
-
res.json(response);
|
|
20
|
-
}
|
|
21
|
-
else {
|
|
22
|
-
res.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST).json(response);
|
|
23
|
-
}
|
|
24
|
-
};
|
|
8
|
+
const registerRequestHandler = (0, createAuthRequestHandler_1.createAuthRequestHandler)("register", async ({ username, password = "" }, req) => {
|
|
25
9
|
if (!username) {
|
|
26
|
-
return
|
|
10
|
+
return { success: false, code: "username-missing" };
|
|
27
11
|
}
|
|
28
12
|
if (!password && requirePassword) {
|
|
29
|
-
return
|
|
13
|
+
return { success: false, code: "password-missing" };
|
|
30
14
|
}
|
|
31
15
|
else if (password.length < minPasswordLength) {
|
|
32
|
-
return
|
|
16
|
+
return {
|
|
33
17
|
success: false,
|
|
34
18
|
code: "weak-password",
|
|
35
19
|
message: `Password must be at least ${minPasswordLength} characters long`,
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
try {
|
|
39
|
-
const clientInfo = (0, getClientRequestIPsInfo_1.getClientRequestIPsInfo)({ httpReq: req });
|
|
40
|
-
const result = await onRegister({
|
|
41
|
-
email: username,
|
|
42
|
-
password,
|
|
43
|
-
getConfirmationUrl: ({ code, websiteUrl }) => (0, AuthTypes_1.getMagicLinkUrl)({
|
|
44
|
-
loginSignupConfig: this.config?.loginSignupConfig,
|
|
45
|
-
websiteUrl,
|
|
46
|
-
data: { type: "otp", code, email: username, returnToken: false },
|
|
47
|
-
}),
|
|
48
|
-
clientInfo,
|
|
49
|
-
req,
|
|
50
|
-
});
|
|
51
|
-
return sendResponse(result);
|
|
20
|
+
};
|
|
52
21
|
}
|
|
53
|
-
|
|
22
|
+
const clientInfo = (0, getClientRequestIPsInfo_1.getClientRequestIPsInfo)({ httpReq: req });
|
|
23
|
+
return onRegister({
|
|
24
|
+
email: username,
|
|
25
|
+
password,
|
|
26
|
+
getConfirmationUrl: ({ code, websiteUrl }) => (0, AuthTypes_1.getMagicLinkUrl)({
|
|
27
|
+
loginSignupConfig: this.config?.loginSignupConfig,
|
|
28
|
+
websiteUrl,
|
|
29
|
+
data: { type: "otp", code, email: username, returnToken: false },
|
|
30
|
+
}),
|
|
31
|
+
clientInfo,
|
|
32
|
+
req,
|
|
33
|
+
});
|
|
34
|
+
}, {
|
|
35
|
+
/* Existing clients also send login form fields when registering. */
|
|
36
|
+
allowExtraProperties: true,
|
|
37
|
+
onError: (error) => {
|
|
54
38
|
console.error("Failed to send email", error);
|
|
55
|
-
return
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
message: "Failed to send email",
|
|
59
|
-
});
|
|
60
|
-
}
|
|
61
|
-
};
|
|
39
|
+
return { success: false, code: "server-error", message: "Failed to send email" };
|
|
40
|
+
},
|
|
41
|
+
});
|
|
62
42
|
app.post(this.authRoutes.emailRegistration, registerRequestHandler);
|
|
63
43
|
}
|
|
64
44
|
//# sourceMappingURL=setRegisterRequestHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setRegisterRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setRegisterRequestHandler.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"setRegisterRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setRegisterRequestHandler.ts"],"names":[],"mappings":";;AAMA,8DA6CC;AAjDD,4CAAqE;AACrE,8EAA2E;AAC3E,gFAA6E;AAE7E,SAAgB,yBAAyB,CAEvC,EAAE,UAAU,EAAE,iBAAiB,GAAG,CAAC,EAAE,eAAe,EAAmB,EACvE,GAAc;IAEd,MAAM,sBAAsB,GAAG,IAAA,mDAAwB,EACrD,UAAU,EACV,KAAK,EAAE,EAAE,QAAQ,EAAE,QAAQ,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE;QACzC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;QACtD,CAAC;QACD,IAAI,CAAC,QAAQ,IAAI,eAAe,EAAE,CAAC;YACjC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;QACtD,CAAC;aAAM,IAAI,QAAQ,CAAC,MAAM,GAAG,iBAAiB,EAAE,CAAC;YAC/C,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,eAAe;gBACrB,OAAO,EAAE,6BAA6B,iBAAiB,kBAAkB;aAC1E,CAAC;QACJ,CAAC;QACD,MAAM,UAAU,GAAG,IAAA,iDAAuB,EAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;QAC7D,OAAO,UAAU,CAAC;YAChB,KAAK,EAAE,QAAQ;YACf,QAAQ;YACR,kBAAkB,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CAC3C,IAAA,2BAAe,EAAC;gBACd,iBAAiB,EAAE,IAAI,CAAC,MAAM,EAAE,iBAAiB;gBACjD,UAAU;gBACV,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE;aACjE,CAAC;YACJ,UAAU;YACV,GAAG;SACJ,CAAC,CAAC;IACL,CAAC,EACD;QACE,oEAAoE;QACpE,oBAAoB,EAAE,IAAI;QAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACjB,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;YAC7C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,sBAAsB,EAAE,CAAC;QACnF,CAAC;KACF,CACF,CAAC;IAEF,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,CAAC;AACtE,CAAC"}
|
package/dist/Auth/login.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../lib/Auth/login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../lib/Auth/login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAI/E,wBAAsB,KAAK,CACzB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,oBAAoB,EACzB,WAAW,EAAE,WAAW,6CA2EzB;AAED,eAAO,MAAM,wBAAwB,GAAI,SAAS,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,KAAK,CAAC,+BAkBtF,CAAC"}
|
package/dist/Auth/login.js
CHANGED
|
@@ -5,6 +5,7 @@ exports.login = login;
|
|
|
5
5
|
const AuthHandler_1 = require("./AuthHandler");
|
|
6
6
|
const AuthTypes_1 = require("./AuthTypes");
|
|
7
7
|
const throttledReject_1 = require("./utils/throttledReject");
|
|
8
|
+
const getAuthResponse_1 = require("./utils/getAuthResponse");
|
|
8
9
|
async function login(req, res, loginParams) {
|
|
9
10
|
const config = this.config;
|
|
10
11
|
if (!config) {
|
|
@@ -48,15 +49,16 @@ async function login(req, res, loginParams) {
|
|
|
48
49
|
socketId: undefined,
|
|
49
50
|
});
|
|
50
51
|
if (!loginResponse.session) {
|
|
51
|
-
|
|
52
|
-
|
|
52
|
+
const response = (0, getAuthResponse_1.getAuthResponse)("login", loginResponse.response);
|
|
53
|
+
if (!response.success) {
|
|
54
|
+
const errorCode = response.code;
|
|
53
55
|
const statusCode = errorCode === "server-error" ? AuthHandler_1.HTTP_FAIL_CODES.INTERNAL_SERVER_ERROR
|
|
54
56
|
: errorCode === "password-missing" ? AuthHandler_1.HTTP_FAIL_CODES.UNAUTHORIZED
|
|
55
57
|
: errorCode === "totp-token-missing" ? AuthHandler_1.HTTP_FAIL_CODES.UNAUTHORIZED
|
|
56
58
|
: AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST;
|
|
57
|
-
return res.status(statusCode).json(
|
|
59
|
+
return res.status(statusCode).json(response);
|
|
58
60
|
}
|
|
59
|
-
return res.json(
|
|
61
|
+
return res.json(response);
|
|
60
62
|
}
|
|
61
63
|
this.setCookieAndGoToReturnURLIfSet(loginResponse.session, { req, res });
|
|
62
64
|
}
|
package/dist/Auth/login.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../lib/Auth/login.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../lib/Auth/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { NextFunction, Request, Response } from "express";
|
|
2
|
+
import { type AuthInput, type AuthOperation, type AuthOutput, type CommonAuthFailure, type MaybePromise } from "prostgles-types";
|
|
3
|
+
export declare const createAuthRequestHandler: <Operation extends AuthOperation>(operation: Operation, handler: (data: AuthInput<Operation>, req: Request, res: Response<AuthOutput<Operation> | CommonAuthFailure>) => MaybePromise<AuthOutput<Operation> | void>, options?: {
|
|
4
|
+
allowExtraProperties?: boolean;
|
|
5
|
+
dataSource?: "body" | "params" | "query";
|
|
6
|
+
failureStatusCode?: number;
|
|
7
|
+
onError?: (error: unknown) => CommonAuthFailure;
|
|
8
|
+
}) => (req: Request, res: Response<AuthOutput<Operation> | CommonAuthFailure>, next: NextFunction) => Promise<void>;
|
|
9
|
+
//# sourceMappingURL=createAuthRequestHandler.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"createAuthRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/createAuthRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAGL,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,UAAU,EACf,KAAK,iBAAiB,EACtB,KAAK,YAAY,EAClB,MAAM,iBAAiB,CAAC;AAIzB,eAAO,MAAM,wBAAwB,GAAI,SAAS,SAAS,aAAa,EACtE,WAAW,SAAS,EACpB,SAAS,CACP,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,EAC1B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,iBAAiB,CAAC,KACrD,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,EAC/C,UAAU;IACR,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IACzC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,iBAAiB,CAAC;CACjD,MAGC,KAAK,OAAO,EACZ,KAAK,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,iBAAiB,CAAC,EACxD,MAAM,YAAY,kBA4CrB,CAAC"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createAuthRequestHandler = void 0;
|
|
4
|
+
const prostgles_types_1 = require("prostgles-types");
|
|
5
|
+
const AuthHandler_1 = require("../AuthHandler");
|
|
6
|
+
const getAuthResponse_1 = require("./getAuthResponse");
|
|
7
|
+
const createAuthRequestHandler = (operation, handler, options) => {
|
|
8
|
+
return async (req, res, next) => {
|
|
9
|
+
const sendResponse = (response, failureStatusCode = AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST) => {
|
|
10
|
+
const validatedResponse = (0, getAuthResponse_1.getAuthResponse)(operation, response);
|
|
11
|
+
res
|
|
12
|
+
.status(validatedResponse.success ? AuthHandler_1.HTTP_SUCCESS_CODES.OK : failureStatusCode)
|
|
13
|
+
.json(validatedResponse);
|
|
14
|
+
};
|
|
15
|
+
try {
|
|
16
|
+
const validation = (0, prostgles_types_1.getJSONBSchemaValidationError)(prostgles_types_1.authContract[operation].request, req[options?.dataSource ?? "body"], {
|
|
17
|
+
allowExtraProperties: options?.allowExtraProperties,
|
|
18
|
+
});
|
|
19
|
+
if (validation.error !== undefined) {
|
|
20
|
+
sendResponse({
|
|
21
|
+
success: false,
|
|
22
|
+
code: "something-went-wrong",
|
|
23
|
+
message: validation.error,
|
|
24
|
+
});
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
const response = await handler(validation.data, req, res);
|
|
28
|
+
/* Session handlers send their own cookies and redirects. */
|
|
29
|
+
if (!res.headersSent) {
|
|
30
|
+
sendResponse(response, options?.failureStatusCode);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
catch (error) {
|
|
34
|
+
if (res.headersSent) {
|
|
35
|
+
return next(error);
|
|
36
|
+
}
|
|
37
|
+
const errorResponse = options?.onError?.(error) ?? {
|
|
38
|
+
success: false,
|
|
39
|
+
code: "server-error",
|
|
40
|
+
};
|
|
41
|
+
sendResponse(errorResponse);
|
|
42
|
+
}
|
|
43
|
+
};
|
|
44
|
+
};
|
|
45
|
+
exports.createAuthRequestHandler = createAuthRequestHandler;
|
|
46
|
+
//# sourceMappingURL=createAuthRequestHandler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"createAuthRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/utils/createAuthRequestHandler.ts"],"names":[],"mappings":";;;AACA,qDAQyB;AACzB,gDAAqE;AACrE,uDAAoD;AAE7C,MAAM,wBAAwB,GAAG,CACtC,SAAoB,EACpB,OAI+C,EAC/C,OAKC,EACD,EAAE;IACF,OAAO,KAAK,EACV,GAAY,EACZ,GAAwD,EACxD,IAAkB,EAClB,EAAE;QACF,MAAM,YAAY,GAAG,CACnB,QAAiB,EACjB,oBAA4B,6BAAe,CAAC,WAAW,EACvD,EAAE;YACF,MAAM,iBAAiB,GAAG,IAAA,iCAAe,EAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAC/D,GAAG;iBACA,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,gCAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC;iBAC7E,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC7B,CAAC,CAAC;QACF,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,IAAA,+CAA6B,EAC9C,8BAAY,CAAC,SAAS,CAAC,CAAC,OAAO,EAC/B,GAAG,CAAC,OAAO,EAAE,UAAU,IAAI,MAAM,CAAC,EAClC;gBACE,oBAAoB,EAAE,OAAO,EAAE,oBAAoB;aACpD,CACF,CAAC;YACF,IAAI,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBACnC,YAAY,CAAC;oBACX,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,sBAAsB;oBAC5B,OAAO,EAAE,UAAU,CAAC,KAAK;iBAC1B,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;YAC1D,4DAA4D;YAC5D,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;gBACrB,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;YACrD,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;gBACpB,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC;YAED,MAAM,aAAa,GAAG,OAAO,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,IAAI;gBACjD,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,cAAc;aACrB,CAAC;YACF,YAAY,CAAC,aAAa,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AA7DW,QAAA,wBAAwB,4BA6DnC"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import { type AuthOperation, type AuthOutput, type CommonAuthFailure } from "prostgles-types";
|
|
2
|
+
export declare const getAuthResponse: <Operation extends AuthOperation>(operation: Operation, response: unknown) => AuthOutput<Operation> | CommonAuthFailure;
|
|
3
|
+
//# sourceMappingURL=getAuthResponse.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getAuthResponse.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/getAuthResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,UAAU,EACf,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AAEzB,eAAO,MAAM,eAAe,GAAI,SAAS,SAAS,aAAa,EAC7D,WAAW,SAAS,EACpB,UAAU,OAAO,KAChB,UAAU,CAAC,SAAS,CAAC,GAAG,iBAW1B,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getAuthResponse = void 0;
|
|
4
|
+
const prostgles_types_1 = require("prostgles-types");
|
|
5
|
+
const getAuthResponse = (operation, response) => {
|
|
6
|
+
const validation = (0, prostgles_types_1.getJSONBSchemaValidationError)(prostgles_types_1.authContract[operation].response, response, { allowExtraProperties: true });
|
|
7
|
+
if (validation.error !== undefined) {
|
|
8
|
+
console.error(`Invalid ${operation} authentication callback response: `, validation.error);
|
|
9
|
+
return { success: false, code: "server-error" };
|
|
10
|
+
}
|
|
11
|
+
return validation.data;
|
|
12
|
+
};
|
|
13
|
+
exports.getAuthResponse = getAuthResponse;
|
|
14
|
+
//# sourceMappingURL=getAuthResponse.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getAuthResponse.js","sourceRoot":"","sources":["../../../lib/Auth/utils/getAuthResponse.ts"],"names":[],"mappings":";;;AAAA,qDAMyB;AAElB,MAAM,eAAe,GAAG,CAC7B,SAAoB,EACpB,QAAiB,EAC0B,EAAE;IAC7C,MAAM,UAAU,GAAG,IAAA,+CAA6B,EAC9C,8BAAY,CAAC,SAAS,CAAC,CAAC,QAAQ,EAChC,QAAQ,EACR,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAC/B,CAAC;IACF,IAAI,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACnC,OAAO,CAAC,KAAK,CAAC,WAAW,SAAS,qCAAqC,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;QAC3F,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;IAClD,CAAC;IACD,OAAO,UAAU,CAAC,IAAI,CAAC;AACzB,CAAC,CAAC;AAdW,QAAA,eAAe,mBAc1B"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type AuthHandler } from "../AuthHandler";
|
|
2
2
|
import type { ExpressReq } from "../AuthTypes";
|
|
3
3
|
import type { LoginResponseHandler } from "../endpoints/setLoginRequestHandler";
|
|
4
|
+
import type { Response } from "express";
|
|
4
5
|
export declare function validateSessionAndSetCookie(this: AuthHandler, cookie: {
|
|
5
6
|
sid: string;
|
|
6
7
|
expires: number;
|
|
@@ -13,6 +14,6 @@ export declare function setCookieAndGoToReturnURLIfSet(this: AuthHandler, cookie
|
|
|
13
14
|
expires: number;
|
|
14
15
|
}, requestHandler: {
|
|
15
16
|
req: ExpressReq;
|
|
16
|
-
res:
|
|
17
|
+
res: Pick<Response, "cookie" | "redirect">;
|
|
17
18
|
}): void;
|
|
18
19
|
//# sourceMappingURL=setCookieAndGoToReturnURLIfSet.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setCookieAndGoToReturnURLIfSet.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIfSet.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+C,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC/F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"setCookieAndGoToReturnURLIfSet.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIfSet.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+C,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC/F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAKhF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EACxC,cAAc,EAAE;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,oBAAoB,CAAA;CAAE,+BAW/D;AAED,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EACxC,cAAc,EAAE;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,GAAG,UAAU,CAAC,CAAA;CAAE,QA8ChF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setCookieAndGoToReturnURLIfSet.js","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIfSet.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"setCookieAndGoToReturnURLIfSet.js","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIfSet.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ type Args = Pick<UploadFileArgs, "localParams" | "data" | "original_name" | "ori
|
|
|
8
8
|
filter: AnyObject;
|
|
9
9
|
};
|
|
10
10
|
export declare const updateFile: (tableHandler: TableHandler, config: FileTableConfig, { filter, data, original_name, original_last_modified, localParams, onCommit, onRollback }: Args) => Promise<{
|
|
11
|
-
newData: Omit<Omit<FileTableRow, "added"> & Partial<Pick<FileTableRow, "added">>, "
|
|
11
|
+
newData: Omit<Omit<FileTableRow, "added"> & Partial<Pick<FileTableRow, "added">>, "id" | "description">;
|
|
12
12
|
}>;
|
|
13
13
|
export declare const lockFileForUpdate: (tableHandler: TableHandler, filter: AnyObject, permittedWhere: string, localParams: LocalParams | undefined) => Promise<boolean>;
|
|
14
14
|
export {};
|
|
@@ -31,9 +31,9 @@ export declare const FILE_VERSION_TABLE_COLUMN_DEFINITIONS: {
|
|
|
31
31
|
readonly file_id: "UUID NOT NULL";
|
|
32
32
|
readonly version: "INTEGER NOT NULL";
|
|
33
33
|
readonly created: "TIMESTAMP NOT NULL DEFAULT NOW()";
|
|
34
|
+
readonly id: "UUID PRIMARY KEY DEFAULT gen_random_uuid()";
|
|
34
35
|
readonly url: "TEXT NOT NULL DEFAULT ''";
|
|
35
36
|
readonly description: "TEXT";
|
|
36
|
-
readonly id: "UUID PRIMARY KEY DEFAULT gen_random_uuid()";
|
|
37
37
|
readonly extension: "TEXT NOT NULL DEFAULT ''";
|
|
38
38
|
readonly content_type: "TEXT NOT NULL DEFAULT ''";
|
|
39
39
|
readonly content_length: "BIGINT NOT NULL DEFAULT 0";
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.687",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"pg": "^8.23.1",
|
|
59
59
|
"pg-cursor": "^2.22.1",
|
|
60
60
|
"pg-promise": "^12.7.1",
|
|
61
|
-
"prostgles-types": "^4.0.
|
|
61
|
+
"prostgles-types": "^4.0.309"
|
|
62
62
|
},
|
|
63
63
|
"devDependencies": {
|
|
64
64
|
"@eslint/js": "^9.22.0",
|