@oneuptime/common 7.0.2200 → 7.0.2223
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/AnalyticsModels/BaseModel.ts +12 -0
- package/Types/Email.ts +4 -1
- package/Types/JsonWebTokenData.ts +1 -0
- package/build/dist/AnalyticsModels/BaseModel.js +7 -0
- package/build/dist/AnalyticsModels/BaseModel.js.map +1 -1
- package/build/dist/Types/Email.js +2 -1
- package/build/dist/Types/Email.js.map +1 -1
- package/package.json +1 -1
|
@@ -18,6 +18,7 @@ import Dictionary from '../Types/Dictionary';
|
|
|
18
18
|
import ModelPermission from '../Types/BaseDatabase/ModelPermission';
|
|
19
19
|
import Permission, { UserTenantAccessPermission } from '../Types/Permission';
|
|
20
20
|
import { PlanSelect } from '../Types/Billing/SubscriptionPlan';
|
|
21
|
+
import { JSONValue } from '../Types/JSON';
|
|
21
22
|
|
|
22
23
|
export type AnalyticsBaseModelType = { new (): AnalyticsBaseModel };
|
|
23
24
|
|
|
@@ -259,6 +260,17 @@ export default class AnalyticsBaseModel extends CommonModel {
|
|
|
259
260
|
return column.isDefaultValueColumn;
|
|
260
261
|
}
|
|
261
262
|
|
|
263
|
+
public getDefaultValueForColumn(columnName: string): JSONValue {
|
|
264
|
+
const column: AnalyticsTableColumn | null =
|
|
265
|
+
this.getTableColumn(columnName);
|
|
266
|
+
|
|
267
|
+
if (!column) {
|
|
268
|
+
throw new BadDataException('Column ' + columnName + ' not found');
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
return column.defaultValue;
|
|
272
|
+
}
|
|
273
|
+
|
|
262
274
|
public getColumnBillingAccessControl(
|
|
263
275
|
columnName: string
|
|
264
276
|
): ColumnBillingAccessControl | null {
|
package/Types/Email.ts
CHANGED
|
@@ -53,7 +53,10 @@ export default class Email extends DatabaseProperty {
|
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
public static isValid(value: string): boolean {
|
|
56
|
-
|
|
56
|
+
// from https://datatracker.ietf.org/doc/html/rfc5322
|
|
57
|
+
|
|
58
|
+
const re: RegExp =
|
|
59
|
+
/(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/i;
|
|
57
60
|
const isValid: boolean = re.test(value);
|
|
58
61
|
if (!isValid) {
|
|
59
62
|
return false;
|
|
@@ -10,4 +10,5 @@ export default interface JSONWebTokenData extends JSONObject {
|
|
|
10
10
|
isMasterAdmin: boolean;
|
|
11
11
|
statusPageId?: ObjectID | undefined; // for status page logins.
|
|
12
12
|
projectId?: ObjectID | undefined; // for SSO logins.
|
|
13
|
+
isGlobalLogin: boolean; // If this is OneUptime username and password login. This is true, if this is SSO login. Then, this is false.
|
|
13
14
|
}
|
|
@@ -171,6 +171,13 @@ export default class AnalyticsBaseModel extends CommonModel {
|
|
|
171
171
|
}
|
|
172
172
|
return column.isDefaultValueColumn;
|
|
173
173
|
}
|
|
174
|
+
getDefaultValueForColumn(columnName) {
|
|
175
|
+
const column = this.getTableColumn(columnName);
|
|
176
|
+
if (!column) {
|
|
177
|
+
throw new BadDataException('Column ' + columnName + ' not found');
|
|
178
|
+
}
|
|
179
|
+
return column.defaultValue;
|
|
180
|
+
}
|
|
174
181
|
getColumnBillingAccessControl(columnName) {
|
|
175
182
|
const column = this.getTableColumn(columnName);
|
|
176
183
|
if (!column) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseModel.js","sourceRoot":"","sources":["../../../AnalyticsModels/BaseModel.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,4CAA4C,CAAC;AACzE,OAAO,oBAAoB,MAAM,wCAAwC,CAAC;AAC1E,OAAO,gBAAgB,MAAM,qCAAqC,CAAC;AACnE,OAAO,oBAAoB,MAAM,iDAAiD,CAAC;AASnF,OAAO,WAAW,MAAM,eAAe,CAAC;AAGxC,OAAO,IAAI,MAAM,eAAe,CAAC;AAEjC,OAAO,eAAe,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseModel.js","sourceRoot":"","sources":["../../../AnalyticsModels/BaseModel.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,4CAA4C,CAAC;AACzE,OAAO,oBAAoB,MAAM,wCAAwC,CAAC;AAC1E,OAAO,gBAAgB,MAAM,qCAAqC,CAAC;AACnE,OAAO,oBAAoB,MAAM,iDAAiD,CAAC;AASnF,OAAO,WAAW,MAAM,eAAe,CAAC;AAGxC,OAAO,IAAI,MAAM,eAAe,CAAC;AAEjC,OAAO,eAAe,MAAM,uCAAuC,CAAC;AAOpE,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,WAAW;IACvD,YAAmB,IAalB;QACG,KAAK,CAAC;YACF,YAAY,EAAE,IAAI,CAAC,YAAY;SAClC,CAAC,CAAC;QAwGC,iBAAY,GAAyB,oBAAoB,CAAC,SAAS,CAAC;QAgBpE,iBAAY,GAAkB,EAAE,CAAC;QAQjC,kBAAa,GAAW,EAAE,CAAC;QAQ3B,gBAAW,GAAW,EAAE,CAAC;QAoBzB,uCAAkC,GAAY,KAAK,CAAC;QAQpD,eAAU,GAAW,EAAE,CAAC;QAlK5B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAEhC,MAAM,OAAO,GAAgC,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;QAEpE,IAAI,IAAI,CAAC,WAAW,EAAE;YAClB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;SACvC;QAED,OAAO,CAAC,IAAI,CACR,IAAI,oBAAoB,CAAC;YACrB,GAAG,EAAE,KAAK;YACV,KAAK,EAAE,IAAI;YACX,WAAW,EAAE,mBAAmB;YAChC,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,eAAe,CAAC,QAAQ;SACjC,CAAC,CACL,CAAC;QAEF,OAAO,CAAC,IAAI,CACR,IAAI,oBAAoB,CAAC;YACrB,GAAG,EAAE,WAAW;YAChB,KAAK,EAAE,SAAS;YAChB,WAAW,EAAE,4CAA4C;YACzD,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,eAAe,CAAC,IAAI;SAC7B,CAAC,CACL,CAAC;QAEF,OAAO,CAAC,IAAI,CACR,IAAI,oBAAoB,CAAC;YACrB,GAAG,EAAE,WAAW;YAChB,KAAK,EAAE,SAAS;YAChB,WAAW,EAAE,4CAA4C;YACzD,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,eAAe,CAAC,IAAI;SAC7B,CAAC,CACL,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YACpD,MAAM,IAAI,gBAAgB,CAAC,2BAA2B,CAAC,CAAC;SAC3D;QAED,mDAAmD;QAEnD,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAkB,EAAE,EAAE;YAC5C,MAAM,MAAM,GAAqC,OAAO,CAAC,IAAI,CACzD,CAAC,MAA4B,EAAE,EAAE;gBAC7B,OAAO,MAAM,CAAC,GAAG,KAAK,UAAU,CAAC;YACrC,CAAC,CACJ,CAAC;YAEF,IAAI,CAAC,MAAM,EAAE;gBACT,MAAM,IAAI,gBAAgB,CACtB,cAAc,GAAG,UAAU,GAAG,8BAA8B,CAC/D,CAAC;aACL;YAED,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;gBAClB,MAAM,IAAI,gBAAgB,CACtB,cAAc;oBACV,UAAU;oBACV,kDAAkD,CACzD,CAAC;aACL;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC;QAC5B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACtC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC,yBAAyB,CAAC;QAChE,IAAI,CAAC,iCAAiC;YAClC,IAAI,CAAC,iCAAiC,IAAI,KAAK,CAAC;QACpD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC9C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC;QAE1D,qBAAqB;QACrB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE;YACpC,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,WAAW,EAAE;gBAC7C,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;aACvC;SACJ;IACL,CAAC;IAGD,IAAW,gBAAgB;QACvB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAClC,CAAC;IACD,IAAW,gBAAgB,CAAC,CAA+B;QACvD,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC;IAC/B,CAAC;IAGD,IAAW,aAAa;QACpB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IACD,IAAW,aAAa,CAAC,CAAiC;QACtD,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;IAC5B,CAAC;IAGD,IAAW,WAAW;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IACD,IAAW,WAAW,CAAC,CAAuB;QAC1C,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;IAC1B,CAAC;IAGD,IAAW,sBAAsB;QAC7B,OAAO,IAAI,CAAC,uBAAuB,CAAC;IACxC,CAAC;IACD,IAAW,sBAAsB,CAAC,CAAqC;QACnE,IAAI,CAAC,uBAAuB,GAAG,CAAC,CAAC;IACrC,CAAC;IAGD,IAAW,WAAW;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IACD,IAAW,WAAW,CAAC,CAAgB;QACnC,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;IAC1B,CAAC;IAGD,IAAW,YAAY;QACnB,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IACD,IAAW,YAAY,CAAC,CAAS;QAC7B,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;IAC3B,CAAC;IAGD,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,IAAW,UAAU,CAAC,CAAS;QAC3B,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;IACzB,CAAC;IAGD,IAAW,yBAAyB;QAGhC,OAAO,IAAI,CAAC,0BAA0B,CAAC;IAC3C,CAAC;IACD,IAAW,yBAAyB,CAChC,CAAwC;QAExC,IAAI,CAAC,0BAA0B,GAAG,CAAC,CAAC;IACxC,CAAC;IAGD,IAAW,iCAAiC;QACxC,OAAO,IAAI,CAAC,kCAAkC,CAAC;IACnD,CAAC;IACD,IAAW,iCAAiC,CAAC,CAAU;QACnD,IAAI,CAAC,kCAAkC,GAAG,CAAC,CAAC;IAChD,CAAC;IAGD,IAAW,SAAS;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IACD,IAAW,SAAS,CAAC,CAAS;QAC1B,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;IACxB,CAAC;IAGD,IAAW,WAAW;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IACD,IAAW,WAAW,CAAC,CAAQ;QAC3B,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;IAC1B,CAAC;IAEM,eAAe;QAClB,MAAM,MAAM,GAAqC,IAAI,CAAC,YAAY,CAAC,IAAI,CACnE,CAAC,MAA4B,EAAE,EAAE;YAC7B,OAAO,MAAM,CAAC,UAAU,CAAC;QAC7B,CAAC,CACJ,CAAC;QAEF,IAAI,CAAC,MAAM,EAAE;YACT,OAAO,IAAI,CAAC;SACf;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,oBAAoB;QACvB,MAAM,MAAM,GAAgC,IAAI,CAAC,eAAe,EAAE,CAAC;QAEnE,IAAI,CAAC,MAAM,EAAE;YACT,OAAO,IAAI,CAAC;SACf;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAoB,CAAC;IAC9D,CAAC;IAEM,kBAAkB;QACrB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,MAA4B,EAAE,EAAE;YAC7D,OAAO,MAAM,CAAC,QAAQ,CAAC;QAC3B,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,oBAAoB,CAAC,UAAkB;QAC1C,MAAM,MAAM,GACR,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QAEpC,IAAI,CAAC,MAAM,EAAE;YACT,OAAO,KAAK,CAAC;SAChB;QAED,OAAO,MAAM,CAAC,oBAAoB,CAAC;IACvC,CAAC;IAEM,wBAAwB,CAAC,UAAkB;QAC9C,MAAM,MAAM,GACR,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QAEpC,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,IAAI,gBAAgB,CAAC,SAAS,GAAG,UAAU,GAAG,YAAY,CAAC,CAAC;SACrE;QAED,OAAO,MAAM,CAAC,YAAY,CAAC;IAC/B,CAAC;IAEM,6BAA6B,CAChC,UAAkB;QAElB,MAAM,MAAM,GACR,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QAEpC,IAAI,CAAC,MAAM,EAAE;YACT,OAAO,IAAI,CAAC;SACf;QAED,OAAO,MAAM,CAAC,oBAAoB,IAAI,IAAI,CAAC;IAC/C,CAAC;IAED,IAAW,EAAE;QACT,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAyB,CAAC;IAC9D,CAAC;IACD,IAAW,EAAE,CAAC,CAAuB;QACjC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAClC,CAAC;IAED,IAAW,GAAG;QACV,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAyB,CAAC;IAC9D,CAAC;IACD,IAAW,GAAG,CAAC,CAAuB;QAClC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAClC,CAAC;IAED,IAAW,SAAS;QAChB,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,CAAqB,CAAC;IAChE,CAAC;IAED,IAAW,SAAS,CAAC,CAAmB;QACpC,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,IAAW,SAAS;QAChB,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,CAAqB,CAAC;IAChE,CAAC;IAED,IAAW,SAAS,CAAC,CAAmB;QACpC,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IACxC,CAAC;IAEM,uBAAuB;QAC1B,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;IAEM,yBAAyB,CAC5B,UAAkB;QAElB,MAAM,WAAW,GACb,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAA4B,EAAE,EAAE;YACpD,OAAO,MAAM,CAAC,GAAG,KAAK,UAAU,CAAC;QACrC,CAAC,CAAC,CAAC;QAEP,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE;YAC5C,OAAO,IAAI,CAAC;SACf;QAED,OAAO,WAAW,CAAC,aAAa,CAAC;IACrC,CAAC;IAEM,mCAAmC;QACtC,MAAM,UAAU,GAAoC,EAAE,CAAC;QAEvD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE;YACpC,IAAI,MAAM,CAAC,aAAa,EAAE;gBACtB,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,aAAa,CAAC;aACjD;SACJ;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAEM,kBAAkB;;QACrB,OAAO,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,IAAI,KAAI,EAAE,CAAC;IAC1C,CAAC;IAEM,oBAAoB;;QACvB,OAAO,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,MAAM,KAAI,EAAE,CAAC;IAC5C,CAAC;IAEM,oBAAoB;;QACvB,OAAO,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,MAAM,KAAI,EAAE,CAAC;IAC5C,CAAC;IAEM,oBAAoB;;QACvB,OAAO,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,MAAM,KAAI,EAAE,CAAC;IAC5C,CAAC;IAEM,kBAAkB;;QACrB,OAAO,CAAA,MAAA,IAAI,CAAC,yBAAyB,0CAAE,IAAI,KAAI,IAAI,CAAC;IACxD,CAAC;IAEM,oBAAoB;;QACvB,OAAO,CAAA,MAAA,IAAI,CAAC,yBAAyB,0CAAE,MAAM,KAAI,IAAI,CAAC;IAC1D,CAAC;IAEM,oBAAoB;;QACvB,OAAO,CAAA,MAAA,IAAI,CAAC,yBAAyB,0CAAE,MAAM,KAAI,IAAI,CAAC;IAC1D,CAAC;IAEM,oBAAoB;;QACvB,OAAO,CAAA,MAAA,IAAI,CAAC,yBAAyB,0CAAE,MAAM,KAAI,IAAI,CAAC;IAC1D,CAAC;IAEM,cAAc,CAAC,WAAmB;QACrC,mDAAmD;QACnD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,SAAS,CAAC,UAAkB;QAC/B,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAA4B,EAAE,EAAE;YAC3D,OAAO,MAAM,CAAC,GAAG,KAAK,UAAU,CAAC;QACrC,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,YAAY,CAAC,WAAmB;QACnC,iDAAiD;QACjD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,oBAAoB,CACvB,sBAAsE,EACtE,UAAmB;;QAEnB,IAAI,eAAe,GACf,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,MAAM,KAAI,EAAE,CAAC;QAErC,IAAI,UAAU,EAAE;YACZ,MAAM,mBAAmB,GACrB,IAAI,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;YAC/C,IAAI,mBAAmB,EAAE;gBACrB,eAAe,GAAG,mBAAmB,CAAC,MAAM,CAAC;aAChD;SACJ;QAED,OAAO,eAAe,CAAC,cAAc,CACjC,sBAAsB,EACtB,eAAe,CAClB,CAAC;IACN,CAAC;IAEM,kBAAkB,CACrB,sBAAsE,EACtE,UAAmB;;QAEnB,IAAI,eAAe,GAAsB,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,IAAI,KAAI,EAAE,CAAC;QAExE,IAAI,UAAU,EAAE;YACZ,MAAM,mBAAmB,GACrB,IAAI,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;YAC/C,IAAI,mBAAmB,EAAE;gBACrB,eAAe,GAAG,mBAAmB,CAAC,IAAI,CAAC;aAC9C;SACJ;QAED,OAAO,eAAe,CAAC,cAAc,CACjC,sBAAsB,EACtB,eAAe,CAClB,CAAC;IACN,CAAC;IAEM,oBAAoB,CACvB,sBAAsE;;QAEtE,MAAM,eAAe,GACjB,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,MAAM,KAAI,EAAE,CAAC;QACrC,OAAO,eAAe,CAAC,cAAc,CACjC,sBAAsB,EACtB,eAAe,CAClB,CAAC;IACN,CAAC;IAEM,oBAAoB,CACvB,sBAAsE,EACtE,UAAmB;;QAEnB,IAAI,eAAe,GACf,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,MAAM,KAAI,EAAE,CAAC;QAErC,IAAI,UAAU,EAAE;YACZ,MAAM,mBAAmB,GACrB,IAAI,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;YAC/C,IAAI,mBAAmB,EAAE;gBACrB,eAAe,GAAG,mBAAmB,CAAC,MAAM,CAAC;aAChD;SACJ;QAED,OAAO,eAAe,CAAC,cAAc,CACjC,sBAAsB,EACtB,eAAe,CAClB,CAAC;IACN,CAAC;CACJ"}
|
|
@@ -46,7 +46,8 @@ export default class Email extends DatabaseProperty {
|
|
|
46
46
|
this.email = email;
|
|
47
47
|
}
|
|
48
48
|
static isValid(value) {
|
|
49
|
-
|
|
49
|
+
// from https://datatracker.ietf.org/doc/html/rfc5322
|
|
50
|
+
const re = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/i;
|
|
50
51
|
const isValid = re.test(value);
|
|
51
52
|
if (!isValid) {
|
|
52
53
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Email.js","sourceRoot":"","sources":["../../../Types/Email.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,gBAAgB,MAAM,6BAA6B,CAAC;AAC3D,OAAO,gBAAgB,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAc,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEhD,MAAM,uBAAuB,GAAkB;IAC3C,OAAO;IACP,OAAO;IACP,WAAW;IACX,YAAY;IACZ,OAAO;IACP,QAAQ;IACR,KAAK;IACL,SAAS;IACT,SAAS;IACT,KAAK;IACL,SAAS;IACT,QAAQ;IACR,SAAS;IACT,UAAU;IACV,SAAS;IACT,YAAY;IACZ,WAAW;IACX,UAAU;IACV,MAAM;IACN,QAAQ;CACX,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,gBAAgB;IAE/C,IAAW,KAAK;QACZ,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,IAAW,KAAK,CAAC,KAAa;QAC1B,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;YACrB,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;SAC/B;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACtB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;SACvB;aAAM;YACH,MAAM,IAAI,gBAAgB,CACtB,SAAS,KAAK,0BAA0B,CAC3C,CAAC;SACL;IACL,CAAC;IAED,YAAmB,KAAa;QAC5B,KAAK,EAAE,CAAC;QApBJ,WAAM,GAAW,EAAE,CAAC;QAqBxB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,OAAO,CAAC,KAAa;QAC/B,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"Email.js","sourceRoot":"","sources":["../../../Types/Email.ts"],"names":[],"mappings":"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"}
|