prostgles-server 4.2.642 → 4.2.644
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/debug/caught-request-fix-build.log +4 -0
- package/debug/caught-request-fix-test-build.log +0 -0
- package/debug/caught-request-subscription-failure.log +603 -0
- package/debug/caught-validation-build.log +4 -0
- package/debug/caught-validation-fix-build.log +4 -0
- package/debug/caught-validation-fix-test-build.log +0 -0
- package/debug/caught-validation-test-build.log +0 -0
- package/debug/client-db-tx-build.log +4 -0
- package/debug/client-db-tx-test-server.log +3248 -0
- package/debug/client-db-tx-tests-build.log +0 -0
- package/debug/client-handler-shape-build.log +4 -0
- package/debug/client-handler-shape-test-server.log +544 -0
- package/debug/client-handler-shape-tests-build.log +0 -0
- package/debug/column-definitions-test-server.log +152 -164
- package/debug/fixes-review-build.log +4 -0
- package/debug/fixes-review-client-schema.backup +745 -0
- package/debug/fixes-review-generated-schema.backup +489 -0
- package/debug/fixes-review-probes-build.log +0 -0
- package/debug/fixes-review-probes.patch +43 -0
- package/debug/fixes-review-restore-build.log +0 -0
- package/debug/fixes-review-tests-build.log +0 -0
- package/debug/fixes-review-typecheck.log +8 -0
- package/debug/function-client-db-tx-build.log +4 -0
- package/debug/function-client-db-tx-tests-build.log +0 -0
- package/debug/review-current-fixes-build.log +4 -0
- package/debug/review-current-fixes-client.backup +745 -0
- package/debug/review-current-fixes-probes-build.log +0 -0
- package/debug/review-current-fixes-probes.patch +55 -0
- package/debug/review-current-fixes-restore-build.log +0 -0
- package/debug/review-current-fixes-rls.backup +478 -0
- package/debug/review-current-fixes-schema.backup +489 -0
- package/debug/review-current-fixes-test-build.log +0 -0
- package/debug/review-current-fixes-typecheck.log +8 -0
- package/debug/review-user-identity-build.log +4 -0
- package/debug/review-user-identity-probes-build.log +0 -0
- package/debug/review-user-identity-probes.log +558 -0
- package/debug/review-user-identity-probes.patch +45 -0
- package/debug/review-user-identity-restore-build.log +0 -0
- package/debug/review-user-identity-rls.backup +463 -0
- package/debug/review-user-identity-schema.backup +720 -0
- package/debug/review-user-identity-server.log +3248 -0
- package/debug/review-user-identity-test-build.log +0 -0
- package/debug/review-user-identity-typecheck.log +8 -0
- package/debug/schema-types-focused-strict-check.log +0 -0
- package/debug/schema-types-strict-check.log +38 -0
- package/debug/schema-types-tests-build.log +0 -0
- package/debug/security-review-baseline-tests.log +3250 -0
- package/debug/security-review-build.log +4 -0
- package/debug/security-review-checkfilter-repro.log +545 -0
- package/debug/security-review-clientSchemaTypes.spec.ts.backup +553 -0
- package/debug/security-review-repro-build.log +0 -0
- package/debug/security-review-repro.spec.ts +591 -0
- package/debug/security-review-restore-build.log +0 -0
- package/debug/security-review-server-tests.log +3254 -0
- package/debug/security-review-test-build.log +0 -0
- package/debug/server-user-lint.log +4 -0
- package/debug/server-user-test-server.log +538 -0
- package/debug/server-user-typecheck.log +8 -0
- package/debug/test-check-eslint.log +6 -0
- package/debug/test-check-lint-baseline.json +1 -0
- package/debug/test-check-npm-test.log +789 -0
- package/debug/test-check-types.log +8 -0
- package/debug/test-config-npm-test.log +223 -0
- package/debug/test-config-strict-null-check.log +50 -0
- package/debug/test-config-typecheck.log +8 -0
- package/debug/tryRunP-test-quick.log +78 -0
- package/debug/tryRunP-typecheck.log +42 -0
- package/debug/user-identity-direct-call-build.log +0 -0
- package/debug/user-identity-direct-call-schema.backup +489 -0
- package/debug/user-identity-regressions-build.log +4 -0
- package/debug/user-identity-regressions-generated-schema.backup +489 -0
- package/debug/user-identity-regressions-test-build.log +0 -0
- package/dist/Auth/AuthHandler.js +1 -1
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +11 -9
- package/dist/Auth/AuthTypes.d.ts.map +1 -1
- package/dist/Auth/AuthTypes.js.map +1 -1
- package/dist/Auth/utils/getClientRequestIPsInfo.d.ts +2 -1
- package/dist/Auth/utils/getClientRequestIPsInfo.d.ts.map +1 -1
- package/dist/Auth/utils/getClientRequestIPsInfo.js +8 -1
- package/dist/Auth/utils/getClientRequestIPsInfo.js.map +1 -1
- package/dist/Auth/utils/getSessionUser.d.ts +4 -3
- package/dist/Auth/utils/getSessionUser.d.ts.map +1 -1
- package/dist/Auth/utils/getSessionUser.js +4 -2
- package/dist/Auth/utils/getSessionUser.js.map +1 -1
- package/dist/Auth/utils/getSessionUser.spec.js +2 -4
- package/dist/Auth/utils/getSessionUser.spec.js.map +1 -1
- package/dist/Auth/utils/handleGetUser.d.ts.map +1 -1
- package/dist/Auth/utils/handleGetUser.js +16 -0
- package/dist/Auth/utils/handleGetUser.js.map +1 -1
- package/dist/Auth/utils/serverSideRequest.d.ts +17 -0
- package/dist/Auth/utils/serverSideRequest.d.ts.map +1 -0
- package/dist/Auth/utils/serverSideRequest.js +20 -0
- package/dist/Auth/utils/serverSideRequest.js.map +1 -0
- package/dist/DboBuilder/DboBuilder.d.ts.map +1 -1
- package/dist/DboBuilder/DboBuilder.js +4 -2
- package/dist/DboBuilder/DboBuilder.js.map +1 -1
- package/dist/DboBuilder/TableHandler/TableHandler.d.ts +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts +0 -4
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.js +5 -8
- package/dist/DboBuilder/ViewHandler/ViewHandler.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/count.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/count.js +2 -1
- package/dist/DboBuilder/ViewHandler/count.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/find.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/find.js +2 -1
- package/dist/DboBuilder/ViewHandler/find.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getDbHandlerWithAbort.d.ts +9 -2
- package/dist/DboBuilder/ViewHandler/getDbHandlerWithAbort.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getDbHandlerWithAbort.js +57 -23
- package/dist/DboBuilder/ViewHandler/getDbHandlerWithAbort.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/size.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/size.js +2 -1
- package/dist/DboBuilder/ViewHandler/size.js.map +1 -1
- package/dist/DboBuilder/dboBuilderUtils.d.ts +1 -0
- package/dist/DboBuilder/dboBuilderUtils.d.ts.map +1 -1
- package/dist/DboBuilder/dboBuilderUtils.js +2 -1
- package/dist/DboBuilder/dboBuilderUtils.js.map +1 -1
- package/dist/PublishParser/PublishParser.d.ts.map +1 -1
- package/dist/PublishParser/PublishParser.js +2 -1
- package/dist/PublishParser/PublishParser.js.map +1 -1
- package/dist/PublishParser/defineServerFunction.d.ts +2 -0
- package/dist/PublishParser/defineServerFunction.d.ts.map +1 -1
- package/dist/PublishParser/defineServerFunction.js.map +1 -1
- package/dist/PublishParser/getPublishedTableNames.d.ts.map +1 -1
- package/dist/PublishParser/getPublishedTableNames.js +2 -1
- package/dist/PublishParser/getPublishedTableNames.js.map +1 -1
- package/dist/PublishParser/publishTypesAndUtils.d.ts +1 -1
- package/dist/PublishParser/publishTypesAndUtils.d.ts.map +1 -1
- package/dist/StorageClient/StorageClientTypes.d.ts +5 -4
- package/dist/StorageClient/StorageClientTypes.d.ts.map +1 -1
- package/dist/WebsocketAPI/getClientHandlers.d.ts +5 -0
- package/dist/WebsocketAPI/getClientHandlers.d.ts.map +1 -1
- package/dist/WebsocketAPI/getClientHandlers.js +33 -14
- package/dist/WebsocketAPI/getClientHandlers.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/initProstgles.d.ts +12 -2
- package/dist/initProstgles.d.ts.map +1 -1
- package/dist/initProstgles.js +10 -1
- package/dist/initProstgles.js.map +1 -1
- package/dist/runClientRequest.d.ts +2 -1
- package/dist/runClientRequest.d.ts.map +1 -1
- package/dist/runClientRequest.js +7 -4
- package/dist/runClientRequest.js.map +1 -1
- package/eslint.config.mjs +21 -1
- package/lib/Auth/AuthHandler.ts +1 -1
- package/lib/Auth/AuthTypes.ts +12 -8
- package/lib/Auth/utils/getClientRequestIPsInfo.ts +11 -2
- package/lib/Auth/utils/getSessionUser.spec.ts +4 -6
- package/lib/Auth/utils/getSessionUser.ts +8 -5
- package/lib/Auth/utils/handleGetUser.ts +13 -0
- package/lib/Auth/utils/serverSideRequest.ts +27 -0
- package/lib/DboBuilder/DboBuilder.ts +7 -2
- package/lib/DboBuilder/ViewHandler/ViewHandler.ts +11 -11
- package/lib/DboBuilder/ViewHandler/count.ts +2 -1
- package/lib/DboBuilder/ViewHandler/find.ts +2 -1
- package/lib/DboBuilder/ViewHandler/getDbHandlerWithAbort.ts +72 -29
- package/lib/DboBuilder/ViewHandler/size.ts +2 -1
- package/lib/DboBuilder/dboBuilderUtils.ts +2 -0
- package/lib/PublishParser/PublishParser.ts +2 -1
- package/lib/PublishParser/defineServerFunction.ts +3 -5
- package/lib/PublishParser/getPublishedTableNames.ts +2 -1
- package/lib/PublishParser/publishTypesAndUtils.ts +1 -1
- package/lib/StorageClient/StorageClientTypes.ts +5 -4
- package/lib/WebsocketAPI/getClientHandlers.ts +63 -29
- package/lib/index.ts +3 -3
- package/lib/initProstgles.ts +31 -5
- package/lib/runClientRequest.ts +10 -3
- package/package.json +5 -3
|
@@ -0,0 +1,489 @@
|
|
|
1
|
+
/* Schema definition generated by prostgles-server */
|
|
2
|
+
|
|
3
|
+
export type DBGeneratedSchema = {
|
|
4
|
+
__rb_test_commit: {
|
|
5
|
+
columns: {
|
|
6
|
+
id?: null | number;
|
|
7
|
+
};
|
|
8
|
+
|
|
9
|
+
};
|
|
10
|
+
"\"\"\"*\"\"\"": {
|
|
11
|
+
columns: {
|
|
12
|
+
"\"*\""?: null | string;
|
|
13
|
+
id?: number;
|
|
14
|
+
qq?: null | string;
|
|
15
|
+
};
|
|
16
|
+
|
|
17
|
+
};
|
|
18
|
+
"\"\"\"quoted0\"\"\"": {
|
|
19
|
+
columns: {
|
|
20
|
+
"\"id0\""?: number;
|
|
21
|
+
"\"quoted1_id\""?: null | number;
|
|
22
|
+
"\"text_col0\""?: null | string;
|
|
23
|
+
};
|
|
24
|
+
|
|
25
|
+
};
|
|
26
|
+
"\"\"\"quoted1\"\"\"": {
|
|
27
|
+
columns: {
|
|
28
|
+
"\"id1\""?: number;
|
|
29
|
+
"\"quoted2_id\""?: null | number;
|
|
30
|
+
"\"text_col1\""?: null | string;
|
|
31
|
+
};
|
|
32
|
+
referencedBy: {"\"\"\"quoted0\"\"\"":["\"quoted1_id\""]};
|
|
33
|
+
};
|
|
34
|
+
"\"\"\"quoted2\"\"\"": {
|
|
35
|
+
columns: {
|
|
36
|
+
"\"id2\""?: number;
|
|
37
|
+
"\"text_col2\""?: null | string;
|
|
38
|
+
};
|
|
39
|
+
referencedBy: {"\"\"\"quoted1\"\"\"":["\"quoted2_id\""]};
|
|
40
|
+
};
|
|
41
|
+
"\"*\"": {
|
|
42
|
+
columns: {
|
|
43
|
+
"*"?: null | string;
|
|
44
|
+
id?: number;
|
|
45
|
+
};
|
|
46
|
+
|
|
47
|
+
};
|
|
48
|
+
api_table: {
|
|
49
|
+
columns: {
|
|
50
|
+
col1?: null | string;
|
|
51
|
+
id?: number;
|
|
52
|
+
};
|
|
53
|
+
|
|
54
|
+
};
|
|
55
|
+
bytea_test: {
|
|
56
|
+
columns: {
|
|
57
|
+
id?: number;
|
|
58
|
+
value?: null | Uint8Array;
|
|
59
|
+
};
|
|
60
|
+
|
|
61
|
+
};
|
|
62
|
+
ex_j_ins: {
|
|
63
|
+
columns: {
|
|
64
|
+
added?: null | string;
|
|
65
|
+
id?: number;
|
|
66
|
+
name: string;
|
|
67
|
+
public?: null | string;
|
|
68
|
+
};
|
|
69
|
+
|
|
70
|
+
};
|
|
71
|
+
files: {
|
|
72
|
+
columns: {
|
|
73
|
+
added?: string;
|
|
74
|
+
cloud_url?: null | string;
|
|
75
|
+
content_length?: number | string;
|
|
76
|
+
content_type?: string;
|
|
77
|
+
data: Uint8Array;
|
|
78
|
+
deleted?: null | string;
|
|
79
|
+
deleted_from_storage?: null | string;
|
|
80
|
+
description?: null | string;
|
|
81
|
+
etag?: string;
|
|
82
|
+
extension?: string;
|
|
83
|
+
id?: string;
|
|
84
|
+
metadata?: null | { description: string; };
|
|
85
|
+
original_last_modified?: null | string;
|
|
86
|
+
original_name: string;
|
|
87
|
+
signed_url?: null | string;
|
|
88
|
+
signed_url_expires?: null | number | string;
|
|
89
|
+
storage_key?: null | string;
|
|
90
|
+
updated?: string;
|
|
91
|
+
url?: string;
|
|
92
|
+
version?: number;
|
|
93
|
+
};
|
|
94
|
+
referencedBy: {"files_versions":["file_id"],"users_public_info":["avatar"]};
|
|
95
|
+
};
|
|
96
|
+
files_versions: {
|
|
97
|
+
columns: {
|
|
98
|
+
added?: string;
|
|
99
|
+
cloud_url?: null | string;
|
|
100
|
+
content_length?: number | string;
|
|
101
|
+
content_type?: string;
|
|
102
|
+
created?: string;
|
|
103
|
+
deleted?: null | string;
|
|
104
|
+
deleted_from_storage?: null | string;
|
|
105
|
+
description?: null | string;
|
|
106
|
+
etag?: string;
|
|
107
|
+
extension?: string;
|
|
108
|
+
file_id: string;
|
|
109
|
+
id?: string;
|
|
110
|
+
metadata?: null | { description: string; };
|
|
111
|
+
original_last_modified?: null | string;
|
|
112
|
+
original_name: string;
|
|
113
|
+
signed_url?: null | string;
|
|
114
|
+
signed_url_expires?: null | number | string;
|
|
115
|
+
storage_key: string;
|
|
116
|
+
updated?: string;
|
|
117
|
+
url?: string;
|
|
118
|
+
version: number;
|
|
119
|
+
};
|
|
120
|
+
|
|
121
|
+
};
|
|
122
|
+
geography_columns: {
|
|
123
|
+
columns: {
|
|
124
|
+
coord_dimension?: null | number;
|
|
125
|
+
f_geography_column?: null | string;
|
|
126
|
+
f_table_catalog?: null | string;
|
|
127
|
+
f_table_name?: null | string;
|
|
128
|
+
f_table_schema?: null | string;
|
|
129
|
+
srid?: null | number;
|
|
130
|
+
type?: null | string;
|
|
131
|
+
};
|
|
132
|
+
|
|
133
|
+
};
|
|
134
|
+
geometry_columns: {
|
|
135
|
+
columns: {
|
|
136
|
+
coord_dimension?: null | number;
|
|
137
|
+
f_geometry_column?: null | string;
|
|
138
|
+
f_table_catalog?: null | string;
|
|
139
|
+
f_table_name?: null | string;
|
|
140
|
+
f_table_schema?: null | string;
|
|
141
|
+
srid?: null | number;
|
|
142
|
+
type?: null | string;
|
|
143
|
+
};
|
|
144
|
+
|
|
145
|
+
};
|
|
146
|
+
insert_rules: {
|
|
147
|
+
columns: {
|
|
148
|
+
added?: null | string;
|
|
149
|
+
id?: number;
|
|
150
|
+
name?: null | string;
|
|
151
|
+
};
|
|
152
|
+
|
|
153
|
+
};
|
|
154
|
+
items: {
|
|
155
|
+
columns: {
|
|
156
|
+
h?: null | string[];
|
|
157
|
+
id?: number;
|
|
158
|
+
name?: null | string;
|
|
159
|
+
};
|
|
160
|
+
referencedBy: {"items2":["items_id"],"items4a":["items_id"],"items_multi":["items0_id","items1_id","items2_id","items3_id"],"slow_items":["id"],"very_slow_items":["id"]};
|
|
161
|
+
};
|
|
162
|
+
items_multi: {
|
|
163
|
+
columns: {
|
|
164
|
+
id?: number;
|
|
165
|
+
items0_id?: null | number;
|
|
166
|
+
items1_id?: null | number;
|
|
167
|
+
items2_id?: null | number;
|
|
168
|
+
items3_id?: null | number;
|
|
169
|
+
name?: null | string;
|
|
170
|
+
};
|
|
171
|
+
|
|
172
|
+
};
|
|
173
|
+
items2: {
|
|
174
|
+
columns: {
|
|
175
|
+
hh?: null | string[];
|
|
176
|
+
id?: number;
|
|
177
|
+
items_id?: null | number;
|
|
178
|
+
name?: null | string;
|
|
179
|
+
};
|
|
180
|
+
referencedBy: {"items4a":["items2_id"]};
|
|
181
|
+
};
|
|
182
|
+
items3: {
|
|
183
|
+
columns: {
|
|
184
|
+
h?: null | string[];
|
|
185
|
+
id?: number;
|
|
186
|
+
name?: null | string;
|
|
187
|
+
};
|
|
188
|
+
|
|
189
|
+
};
|
|
190
|
+
items4: {
|
|
191
|
+
columns: {
|
|
192
|
+
added?: null | string;
|
|
193
|
+
id?: number;
|
|
194
|
+
name: string;
|
|
195
|
+
public?: null | string;
|
|
196
|
+
};
|
|
197
|
+
|
|
198
|
+
};
|
|
199
|
+
items4_pub: {
|
|
200
|
+
columns: {
|
|
201
|
+
added?: null | string;
|
|
202
|
+
id?: number;
|
|
203
|
+
name: string;
|
|
204
|
+
public?: null | string;
|
|
205
|
+
};
|
|
206
|
+
|
|
207
|
+
};
|
|
208
|
+
items4a: {
|
|
209
|
+
columns: {
|
|
210
|
+
id?: number;
|
|
211
|
+
items_id?: null | number;
|
|
212
|
+
items2_id?: null | number;
|
|
213
|
+
name?: null | string;
|
|
214
|
+
};
|
|
215
|
+
|
|
216
|
+
};
|
|
217
|
+
lookup_col1: {
|
|
218
|
+
columns: {
|
|
219
|
+
description?: null | string;
|
|
220
|
+
id: "a" | "b"
|
|
221
|
+
};
|
|
222
|
+
referencedBy: {"uuid_text":["col1","col2","col3"]};
|
|
223
|
+
};
|
|
224
|
+
newly_created_table: {
|
|
225
|
+
columns: {
|
|
226
|
+
id?: null | number;
|
|
227
|
+
};
|
|
228
|
+
|
|
229
|
+
};
|
|
230
|
+
obj_table: {
|
|
231
|
+
columns: {
|
|
232
|
+
id?: number;
|
|
233
|
+
obj?: null | any;
|
|
234
|
+
};
|
|
235
|
+
|
|
236
|
+
};
|
|
237
|
+
planes: {
|
|
238
|
+
columns: {
|
|
239
|
+
flight_number?: null | string;
|
|
240
|
+
id?: number;
|
|
241
|
+
last_updated: number | string;
|
|
242
|
+
x?: null | number;
|
|
243
|
+
y?: null | number;
|
|
244
|
+
};
|
|
245
|
+
|
|
246
|
+
};
|
|
247
|
+
"prostgles_test.basic": {
|
|
248
|
+
columns: {
|
|
249
|
+
id?: number;
|
|
250
|
+
txt?: null | string;
|
|
251
|
+
};
|
|
252
|
+
referencedBy: {"prostgles_test.basic1":["id_basic"]};
|
|
253
|
+
};
|
|
254
|
+
"prostgles_test.basic1": {
|
|
255
|
+
columns: {
|
|
256
|
+
id?: number;
|
|
257
|
+
id_basic?: null | number;
|
|
258
|
+
txt?: null | string;
|
|
259
|
+
};
|
|
260
|
+
referencedBy: {"prostgles_test.mv_basic1":["id"]};
|
|
261
|
+
};
|
|
262
|
+
"prostgles_test.mv_basic1": {
|
|
263
|
+
columns: {
|
|
264
|
+
id: number;
|
|
265
|
+
id_basic: number;
|
|
266
|
+
txt: string;
|
|
267
|
+
};
|
|
268
|
+
|
|
269
|
+
};
|
|
270
|
+
rec: {
|
|
271
|
+
columns: {
|
|
272
|
+
id?: number;
|
|
273
|
+
parent_id?: null | number;
|
|
274
|
+
recf?: null | number;
|
|
275
|
+
};
|
|
276
|
+
referencedBy: {"rec":["parent_id"]};
|
|
277
|
+
};
|
|
278
|
+
rec_ref: {
|
|
279
|
+
columns: {
|
|
280
|
+
id?: number;
|
|
281
|
+
};
|
|
282
|
+
referencedBy: {"rec":["recf"]};
|
|
283
|
+
};
|
|
284
|
+
schema_version: {
|
|
285
|
+
columns: {
|
|
286
|
+
id: number | string;
|
|
287
|
+
table_config: any;
|
|
288
|
+
};
|
|
289
|
+
|
|
290
|
+
};
|
|
291
|
+
self_join: {
|
|
292
|
+
columns: {
|
|
293
|
+
id?: number;
|
|
294
|
+
my_id?: null | number;
|
|
295
|
+
my_id1?: null | number;
|
|
296
|
+
name?: null | string;
|
|
297
|
+
};
|
|
298
|
+
referencedBy: {"self_join":["my_id","my_id1"]};
|
|
299
|
+
};
|
|
300
|
+
shapes: {
|
|
301
|
+
columns: {
|
|
302
|
+
geog?: null | string;
|
|
303
|
+
geom?: null | string;
|
|
304
|
+
id?: string;
|
|
305
|
+
};
|
|
306
|
+
|
|
307
|
+
};
|
|
308
|
+
slow_items: {
|
|
309
|
+
columns: {
|
|
310
|
+
h?: null | string[];
|
|
311
|
+
id?: null | number;
|
|
312
|
+
name?: null | string;
|
|
313
|
+
};
|
|
314
|
+
|
|
315
|
+
};
|
|
316
|
+
spatial_ref_sys: {
|
|
317
|
+
columns: {
|
|
318
|
+
auth_name?: null | string;
|
|
319
|
+
auth_srid?: null | number;
|
|
320
|
+
proj4text?: null | string;
|
|
321
|
+
srid: number;
|
|
322
|
+
srtext?: null | string;
|
|
323
|
+
};
|
|
324
|
+
|
|
325
|
+
};
|
|
326
|
+
symbols: {
|
|
327
|
+
columns: {
|
|
328
|
+
id: string;
|
|
329
|
+
};
|
|
330
|
+
referencedBy: {"trades":["symbol"]};
|
|
331
|
+
};
|
|
332
|
+
table_name3434: {
|
|
333
|
+
columns: {
|
|
334
|
+
id: number;
|
|
335
|
+
};
|
|
336
|
+
referencedBy: {"table_name3434cccc":["id","id2"]};
|
|
337
|
+
};
|
|
338
|
+
table_name3434cccc: {
|
|
339
|
+
columns: {
|
|
340
|
+
id?: null | number;
|
|
341
|
+
id2?: null | number;
|
|
342
|
+
};
|
|
343
|
+
|
|
344
|
+
};
|
|
345
|
+
tjson: {
|
|
346
|
+
columns: {
|
|
347
|
+
colOneOf: "a" | "b" | "c"
|
|
348
|
+
json: { a: boolean; arr: "1" | "2" | "3"; arr1: 1 | 2 | 3; arr2: number[]; arrStr?: null | string[]; o?: | null
|
|
349
|
+
| { o1: number; }
|
|
350
|
+
| { o2: boolean; }; };
|
|
351
|
+
jsonOneOf?:
|
|
352
|
+
| null
|
|
353
|
+
| { command: "a"; }
|
|
354
|
+
| { command: "b"; option: number[]; }
|
|
355
|
+
status?:
|
|
356
|
+
| null
|
|
357
|
+
| { ok: string; }
|
|
358
|
+
| { err: string; }
|
|
359
|
+
| { loading: { loaded: number; total: number; }; }
|
|
360
|
+
table_config?: null | { referencedTables?: ( { name: string; minFiles: number; } )[]; recType?: null | Record<"a" | "b", { bools: boolean[]; }>; };
|
|
361
|
+
};
|
|
362
|
+
|
|
363
|
+
};
|
|
364
|
+
tr1: {
|
|
365
|
+
columns: {
|
|
366
|
+
id?: number;
|
|
367
|
+
t1?: null | string;
|
|
368
|
+
};
|
|
369
|
+
referencedBy: {"tr2":["tr1_id"]};
|
|
370
|
+
};
|
|
371
|
+
tr2: {
|
|
372
|
+
columns: {
|
|
373
|
+
id?: number;
|
|
374
|
+
t1?: null | string;
|
|
375
|
+
t2?: null | string;
|
|
376
|
+
tr1_id?: null | number;
|
|
377
|
+
};
|
|
378
|
+
referencedBy: {"tr3":["tr2_id"]};
|
|
379
|
+
};
|
|
380
|
+
tr3: {
|
|
381
|
+
columns: {
|
|
382
|
+
id?: number;
|
|
383
|
+
t2?: null | string;
|
|
384
|
+
tr2_id?: null | number;
|
|
385
|
+
};
|
|
386
|
+
|
|
387
|
+
};
|
|
388
|
+
trades: {
|
|
389
|
+
columns: {
|
|
390
|
+
id?: number;
|
|
391
|
+
price: number | string;
|
|
392
|
+
symbol: string;
|
|
393
|
+
};
|
|
394
|
+
|
|
395
|
+
};
|
|
396
|
+
users: {
|
|
397
|
+
columns: {
|
|
398
|
+
email: string;
|
|
399
|
+
id?: number;
|
|
400
|
+
preferences: { showIntro?: boolean; theme?: "light" | "dark" | "auto"; others: any[]; };
|
|
401
|
+
status: "active" | "disabled" | "pending"
|
|
402
|
+
type: string;
|
|
403
|
+
};
|
|
404
|
+
|
|
405
|
+
};
|
|
406
|
+
users_public_info: {
|
|
407
|
+
columns: {
|
|
408
|
+
avatar?: null | string;
|
|
409
|
+
id?: number;
|
|
410
|
+
name?: null | string;
|
|
411
|
+
sid?: null | string;
|
|
412
|
+
};
|
|
413
|
+
|
|
414
|
+
};
|
|
415
|
+
uuid_text: {
|
|
416
|
+
columns: {
|
|
417
|
+
col1?: null | "a" | "b"
|
|
418
|
+
col2?: null | "a" | "b"
|
|
419
|
+
col3?: null | "a" | "b"
|
|
420
|
+
id?: null | string;
|
|
421
|
+
};
|
|
422
|
+
|
|
423
|
+
};
|
|
424
|
+
v_items: {
|
|
425
|
+
columns: {
|
|
426
|
+
id?: null | number;
|
|
427
|
+
name?: null | string;
|
|
428
|
+
};
|
|
429
|
+
|
|
430
|
+
};
|
|
431
|
+
various: {
|
|
432
|
+
columns: {
|
|
433
|
+
added?: null | string;
|
|
434
|
+
h?: null | string[];
|
|
435
|
+
id?: number;
|
|
436
|
+
jsn?: null | any;
|
|
437
|
+
name?: null | string;
|
|
438
|
+
tsv?: null | string;
|
|
439
|
+
};
|
|
440
|
+
|
|
441
|
+
};
|
|
442
|
+
very_slow_items: {
|
|
443
|
+
columns: {
|
|
444
|
+
h?: null | string[];
|
|
445
|
+
id?: null | number;
|
|
446
|
+
name?: null | string;
|
|
447
|
+
};
|
|
448
|
+
|
|
449
|
+
};
|
|
450
|
+
|
|
451
|
+
}
|
|
452
|
+
|
|
453
|
+
type CollapseNumberIfStringPresent<T> =
|
|
454
|
+
[Extract<T, string>] extends [never] ? T : Exclude<T, number>;
|
|
455
|
+
|
|
456
|
+
/**
|
|
457
|
+
* Numeric columns that serialize to strings keep the numeric type as well to allow:
|
|
458
|
+
* - inserting numeric values as either numbers or strings
|
|
459
|
+
* - reading numeric values as strings
|
|
460
|
+
*/
|
|
461
|
+
export type NormalizedRow<T extends Record<string, unknown>> = Required<{
|
|
462
|
+
[K in keyof T]: CollapseNumberIfStringPresent<T[K]>;
|
|
463
|
+
}>;
|
|
464
|
+
|
|
465
|
+
/**
|
|
466
|
+
* Data types as expected when selecting from the database
|
|
467
|
+
* */
|
|
468
|
+
export type DBSchema = {
|
|
469
|
+
[K in keyof DBGeneratedSchema]: NormalizedRow<DBGeneratedSchema[K]["columns"]>;
|
|
470
|
+
};
|
|
471
|
+
|
|
472
|
+
/**
|
|
473
|
+
* Data types as expected when inserting into the database (optional fields might be nullable/with defaults)
|
|
474
|
+
* */
|
|
475
|
+
export type DBSchemaForInsert = {
|
|
476
|
+
[K in keyof DBGeneratedSchema]: DBGeneratedSchema[K]["columns"];
|
|
477
|
+
};
|
|
478
|
+
|
|
479
|
+
|
|
480
|
+
|
|
481
|
+
export type GeneratedFunctionSchema = {
|
|
482
|
+
"myfunc": (args: { arg1: number; }) => Promise<number>;
|
|
483
|
+
"myfuncVoid": () => Promise<void>;
|
|
484
|
+
"myfuncWithBadReturn": (args: { arg1: number; }) => Promise<string>;
|
|
485
|
+
"myfuncWithComplexReturn": (args: { arg1: number; }) => Promise<(Array<number> | { a: number; b: string; c: { d: boolean } })>;
|
|
486
|
+
"myAdminFunc": (args: { arg1: number; }) => Promise<number>;
|
|
487
|
+
"myfuncForDefault": () => Promise<void>;
|
|
488
|
+
"myfuncForDefault2": (args: { name: string; }) => Promise<({ a: number; b?: undefined } | { b: string; a?: undefined })>;
|
|
489
|
+
}
|
|
File without changes
|
package/dist/Auth/AuthHandler.js
CHANGED
|
@@ -136,7 +136,7 @@ class AuthHandler {
|
|
|
136
136
|
* Based on sidKeyName from auth
|
|
137
137
|
*/
|
|
138
138
|
getValidatedSid(maybeClientReq) {
|
|
139
|
-
if (!maybeClientReq)
|
|
139
|
+
if (!maybeClientReq || (!maybeClientReq.socket && !maybeClientReq.httpReq))
|
|
140
140
|
return undefined;
|
|
141
141
|
const { sidKeyName } = this;
|
|
142
142
|
if (maybeClientReq.socket) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"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"}
|
package/dist/Auth/AuthTypes.d.ts
CHANGED
|
@@ -6,11 +6,12 @@ import type { Profile as GitHubProfile, StrategyOptions as GitHubStrategy } from
|
|
|
6
6
|
import type { Profile as GoogleProfile, StrategyOptions as GoogleStrategy } from "passport-google-oauth20";
|
|
7
7
|
import type { MicrosoftStrategyOptions } from "passport-microsoft";
|
|
8
8
|
import type OAuth2Strategy from "passport-oauth2";
|
|
9
|
-
import type { AnyObject, AuthRequest, AuthResponse, ClientSchema, FieldFilter, FullFilter, IdentityProvider, LocalLoginMode, UserLike } from "prostgles-types";
|
|
9
|
+
import type { AnyObject, AuthRequest, AuthResponse, ClientSchema, FieldFilter, FullFilter, IdentityProvider, LocalLoginMode, MaybePromise, UserLike } from "prostgles-types";
|
|
10
10
|
import type { DBOFullyTyped } from "../DBSchemaBuilder/DBSchemaBuilder";
|
|
11
11
|
import type { ClientSocketWithCachedData } from "../DboBuilder/DboBuilderTypes";
|
|
12
12
|
import { type CachedSession } from "../DboBuilder/DboBuilderTypes";
|
|
13
13
|
import type { DB } from "../Prostgles";
|
|
14
|
+
import type { ServerSideRequest } from "./utils/serverSideRequest";
|
|
14
15
|
type Awaitable<T> = T | Promise<T>;
|
|
15
16
|
export type ExpressReq = Request & CachedSession;
|
|
16
17
|
export type ExpressRes = Response;
|
|
@@ -37,7 +38,7 @@ type HttpClientRequest = {
|
|
|
37
38
|
res: ExpressRes;
|
|
38
39
|
socket?: undefined;
|
|
39
40
|
};
|
|
40
|
-
export type AuthClientRequest = SocketClientRequest | HttpClientRequest;
|
|
41
|
+
export type AuthClientRequest = SocketClientRequest | HttpClientRequest | ServerSideRequest;
|
|
41
42
|
export type ThirdPartyProviders = {
|
|
42
43
|
facebook?: Pick<FacebookStrategy, "clientID" | "clientSecret"> & {
|
|
43
44
|
authOpts?: AuthenticateOptions;
|
|
@@ -171,7 +172,7 @@ export type LoginWithOAuthConfig<S> = {
|
|
|
171
172
|
req: ExpressReq;
|
|
172
173
|
res: ExpressRes;
|
|
173
174
|
clientInfo: LoginClientInfo;
|
|
174
|
-
}) =>
|
|
175
|
+
}) => MaybePromise<AuthResponse.OAuthRegisterSuccess | AuthResponse.OAuthRegisterFailure | AuthResponse.AuthFailure>;
|
|
175
176
|
/**
|
|
176
177
|
* Used to identify abuse
|
|
177
178
|
*/
|
|
@@ -183,7 +184,7 @@ export type LoginWithOAuthConfig<S> = {
|
|
|
183
184
|
req: ExpressReq;
|
|
184
185
|
res: ExpressRes;
|
|
185
186
|
clientInfo: LoginClientInfo;
|
|
186
|
-
}) => void |
|
|
187
|
+
}) => void | MaybePromise<void>;
|
|
187
188
|
};
|
|
188
189
|
export type SessionUser<ServerUser extends UserLike = UserLike, ClientUser extends UserLike = UserLike> = {
|
|
189
190
|
/**
|
|
@@ -195,10 +196,6 @@ export type SessionUser<ServerUser extends UserLike = UserLike, ClientUser exten
|
|
|
195
196
|
* If true, this is a public/non registered user that can login. Used in UI
|
|
196
197
|
*/
|
|
197
198
|
isAnonymous?: boolean;
|
|
198
|
-
/**
|
|
199
|
-
* Controls which fields from user are available in postgres session variable
|
|
200
|
-
*/
|
|
201
|
-
sessionFields?: FieldFilter<ServerUser>;
|
|
202
199
|
/**
|
|
203
200
|
* User data sent to the authenticated client
|
|
204
201
|
*/
|
|
@@ -208,7 +205,7 @@ type AllNeverAndOptional<T> = {
|
|
|
208
205
|
[P in keyof T]?: never;
|
|
209
206
|
};
|
|
210
207
|
export type AuthResultWithSID<SU = SessionUser> = (SU & {
|
|
211
|
-
sid: string;
|
|
208
|
+
sid: string | undefined;
|
|
212
209
|
error?: undefined;
|
|
213
210
|
preferredLogin?: undefined;
|
|
214
211
|
}) | (AllNeverAndOptional<SU> & {
|
|
@@ -262,6 +259,11 @@ export type AuthConfig<S = void, SUser extends SessionUser = SessionUser> = {
|
|
|
262
259
|
* Used in functions
|
|
263
260
|
*/
|
|
264
261
|
findUser: (userFilter: FullFilter<void, void>, dbo: DBOFullyTyped<S>) => Awaitable<SUser["user"] | undefined>;
|
|
262
|
+
/**
|
|
263
|
+
* Controls which fields from user are available in postgres session variable.
|
|
264
|
+
* "id" and "type" are always included.
|
|
265
|
+
*/
|
|
266
|
+
sessionFields?: FieldFilter<SUser["user"]>;
|
|
265
267
|
/**
|
|
266
268
|
* Will setup auth routes
|
|
267
269
|
* /login
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthTypes.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAC9C,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,KAAK,cAAc,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EACV,SAAS,EACT,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,QAAQ,EACT,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"AuthTypes.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthTypes.js","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"AuthTypes.js","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":";;;AA8BA,+CAA+C;AA0VxC,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,GAAG,IAAA,4BAAc,EAAC,iBAAiB,EAAE,iBAAiB,CAAC,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;IAC9E,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAC7B,MAAM,eAAe,GAAG,IAAI,GAAG,CAC7B,GAAG,UAAU,GAAG,IAAA,4BAAc,EAAC,iBAAiB,EAAE,YAAY,CAAC,EAAE,CAClE,CAAC;IACF,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;AAnBW,QAAA,eAAe,mBAmB1B"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import type { ClientSocketWithCachedData } from "../../DboBuilder/DboBuilderTypes";
|
|
2
2
|
import type { ExpressReq, LoginClientInfo } from "../AuthTypes";
|
|
3
|
+
import type { ServerSideRequest } from "./serverSideRequest";
|
|
3
4
|
type ClientReq = {
|
|
4
5
|
socket: ClientSocketWithCachedData;
|
|
5
6
|
httpReq?: undefined;
|
|
6
7
|
} | {
|
|
7
8
|
httpReq: ExpressReq;
|
|
8
9
|
socket?: undefined;
|
|
9
|
-
};
|
|
10
|
+
} | ServerSideRequest;
|
|
10
11
|
export declare const getClientRequestIPsInfo: <T extends ClientReq>(req: T) => LoginClientInfo;
|
|
11
12
|
export {};
|
|
12
13
|
//# sourceMappingURL=getClientRequestIPsInfo.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientRequestIPsInfo.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/getClientRequestIPsInfo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAChE,KAAK,SAAS,GACV;IAAE,MAAM,EAAE,0BAA0B,CAAC;IAAC,OAAO,CAAC,EAAE,SAAS,CAAA;CAAE,GAC3D;IAAE,OAAO,EAAE,UAAU,CAAC;IAAC,MAAM,CAAC,EAAE,SAAS,CAAA;CAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"getClientRequestIPsInfo.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/getClientRequestIPsInfo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,KAAK,SAAS,GACV;IAAE,MAAM,EAAE,0BAA0B,CAAC;IAAC,OAAO,CAAC,EAAE,SAAS,CAAA;CAAE,GAC3D;IAAE,OAAO,EAAE,UAAU,CAAC;IAAC,MAAM,CAAC,EAAE,SAAS,CAAA;CAAE,GAC3C,iBAAiB,CAAC;AACtB,eAAO,MAAM,uBAAuB,GAAI,CAAC,SAAS,SAAS,EAAE,KAAK,CAAC,KAAG,eA4BrE,CAAC"}
|