@mikezimm/fps-library-v2 1.1.102 → 1.1.104
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/CHANGELOG.md
CHANGED
|
@@ -27,11 +27,17 @@ npm run clean
|
|
|
27
27
|
npm run build
|
|
28
28
|
npm version major/minor/patch
|
|
29
29
|
npm publish --access=public
|
|
30
|
-
npm install @mikezimm/fps-library-v2@1.1.
|
|
30
|
+
npm install @mikezimm/fps-library-v2@1.1.104
|
|
31
31
|
|
|
32
32
|
# Changelog
|
|
33
33
|
NOTE: TURN BACK ON STRICT NULL CHECKS - turned off for PropPaneCols
|
|
34
34
|
|
|
35
|
+
## 1.1.104 - 2023-Nov 30: getCert
|
|
36
|
+
- tweaked getCert logic NeverExpires
|
|
37
|
+
|
|
38
|
+
## 1.1.103 - 2023-Nov 30: getCert
|
|
39
|
+
- update getCert logic to accept defaults at end and NeverExpires as last resort
|
|
40
|
+
|
|
35
41
|
## 1.1.102 - 2023-Nov 30: getDateFromNow, FPSTextInput
|
|
36
42
|
- import FPSTextInput from cucumber, and break into smaller files
|
|
37
43
|
- create getDateFromNow, NeverDate, DateIn1Weeks, DateIn2Weeks, DateIn4Weeks
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCert.d.ts","sourceRoot":"","sources":["../../../src/banner/FPSWebPartClass/getCert.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getCert.d.ts","sourceRoot":"","sources":["../../../src/banner/FPSWebPartClass/getCert.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAetC,wBAAgB,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,QAAQ,CA6DvD"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { upperFirstLetter } from "../../logic/Strings/stringCase";
|
|
2
|
+
import { NeverDate } from "../../logic/Time/getDateFromNow";
|
|
2
3
|
import { ecrptMe } from "../features/Tricky/logfun";
|
|
3
4
|
import { decrpt, encrpt } from "../features/Tricky/verify";
|
|
4
5
|
/**
|
|
@@ -10,10 +11,11 @@ const lic = upperFirstLetter(ecrptMe('L<+oz~)', decrpt, encrpt), true);
|
|
|
10
11
|
const wi = ecrptMe('~<=#', decrpt, encrpt);
|
|
11
12
|
const expd = ecrptMe(')3y<eoc', decrpt, encrpt).toUpperCase();
|
|
12
13
|
const exp = ecrptMe(')3y<eo', decrpt, encrpt);
|
|
14
|
+
const now = new Date();
|
|
13
15
|
export function getCert(_IFPSCert) {
|
|
14
|
-
let
|
|
16
|
+
let NeverExpires = {
|
|
15
17
|
tenant: '*',
|
|
16
|
-
expiration:
|
|
18
|
+
expiration: NeverDate,
|
|
17
19
|
expired: false,
|
|
18
20
|
warnD: 0,
|
|
19
21
|
warned: false,
|
|
@@ -21,31 +23,61 @@ export function getCert(_IFPSCert) {
|
|
|
21
23
|
expirationMsg: '',
|
|
22
24
|
notify: ``,
|
|
23
25
|
};
|
|
26
|
+
let defaultCert = null;
|
|
24
27
|
if (!_IFPSCert || _IFPSCert.length === 0)
|
|
25
|
-
return
|
|
26
|
-
|
|
27
|
-
_IFPSCert.map(cert => {
|
|
28
|
+
return NeverExpires;
|
|
29
|
+
let current = NeverExpires;
|
|
30
|
+
_IFPSCert.map((cert, idx) => {
|
|
28
31
|
const tenant = ecrptMe(cert.tenant, decrpt, encrpt);
|
|
29
|
-
|
|
32
|
+
if (cert.tenant === '*') {
|
|
33
|
+
defaultCert = cert;
|
|
34
|
+
}
|
|
30
35
|
if (window.location.origin.toLocaleLowerCase().indexOf(tenant) > -1) {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
const
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
const
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
}
|
|
36
|
+
// Found matching tenant cert
|
|
37
|
+
current = updateThisCert(cert, tenant);
|
|
38
|
+
// const warnD = cert.warnD ? cert.warnD : 0;
|
|
39
|
+
// let warnDate = new Date(cert.expiration);
|
|
40
|
+
// warnDate.setDate(warnDate.getDate() - warnD);
|
|
41
|
+
// const expired = now > cert.expiration ? true : false;
|
|
42
|
+
// const warned = now > warnDate ? true : false;
|
|
43
|
+
// const pre = `${ lic } ${ expired === true ? '' : wi } ${expired === true ? expd : exp } `
|
|
44
|
+
// const dat = `${cert.expiration.toLocaleDateString()} - ${cert.expiration.toLocaleTimeString()}`
|
|
45
|
+
// current = {
|
|
46
|
+
// tenant: tenant,
|
|
47
|
+
// expiration: cert.expiration,
|
|
48
|
+
// notify: cert.notify,
|
|
49
|
+
// expired: expired,
|
|
50
|
+
// expirationDStr: `${dat}`,
|
|
51
|
+
// expirationMsg: expired === true || warned ? `${pre} ${dat}` : ``,
|
|
52
|
+
// warnD: warnD,
|
|
53
|
+
// warned: warned,
|
|
54
|
+
// };
|
|
55
|
+
}
|
|
56
|
+
else if (defaultCert && idx === _IFPSCert.length - 1) {
|
|
57
|
+
// Found a defaultCert and did not find a matching cert yet... use defaultCert
|
|
58
|
+
current = updateThisCert(defaultCert, cert.tenant);
|
|
47
59
|
}
|
|
48
60
|
});
|
|
49
61
|
return current;
|
|
50
62
|
}
|
|
63
|
+
function updateThisCert(cert, tenant) {
|
|
64
|
+
const warnD = cert.warnD ? cert.warnD : 0;
|
|
65
|
+
let warnDate = new Date(cert.expiration);
|
|
66
|
+
warnDate.setDate(warnDate.getDate() - warnD);
|
|
67
|
+
const expired = now > cert.expiration ? true : false;
|
|
68
|
+
const warned = now > warnDate ? true : false;
|
|
69
|
+
const pre = `${lic} ${expired === true ? '' : wi} ${expired === true ? expd : exp} `;
|
|
70
|
+
const dat = `${cert.expiration.toLocaleDateString()} - ${cert.expiration.toLocaleTimeString()}`;
|
|
71
|
+
const newCert = {
|
|
72
|
+
tenant: tenant,
|
|
73
|
+
expiration: cert.expiration,
|
|
74
|
+
notify: cert.notify,
|
|
75
|
+
expired: expired,
|
|
76
|
+
expirationDStr: `${dat}`,
|
|
77
|
+
expirationMsg: expired === true || warned ? `${pre} ${dat}` : ``,
|
|
78
|
+
warnD: warnD,
|
|
79
|
+
warned: warned,
|
|
80
|
+
};
|
|
81
|
+
return newCert;
|
|
82
|
+
}
|
|
51
83
|
//# sourceMappingURL=getCert.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCert.js","sourceRoot":"","sources":["../../../src/banner/FPSWebPartClass/getCert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAG3D;;;;GAIG;AAEH,MAAM,GAAG,GAAG,gBAAgB,CAAC,OAAO,CAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAE,EAAE,IAAI,CAAE,CAAC;AAC1E,MAAM,EAAE,GAAG,OAAO,CAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAE,CAAC;AAC7C,MAAM,IAAI,GAAG,OAAO,CAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAE,CAAC,WAAW,EAAE,CAAC;AAChE,MAAM,GAAG,GAAG,OAAO,CAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAE,CAAC;AAEhD,MAAM,UAAU,OAAO,CAAC,SAAqB;IAE3C,IAAI,
|
|
1
|
+
{"version":3,"file":"getCert.js","sourceRoot":"","sources":["../../../src/banner/FPSWebPartClass/getCert.ts"],"names":[],"mappings":"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"}
|