@oneuptime/common 7.0.2207 → 7.0.2224
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/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
|
}
|
|
@@ -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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"}
|