@basemaps/shared 6.32.0 → 6.34.0

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.
Files changed (6) hide show
  1. package/CHANGELOG.md +27 -0
  2. package/build/api.d.ts +10 -0
  3. package/build/api.d.ts.map +1 -1
  4. package/build/api.js +19 -0
  5. package/build/api.js.map +1 -1
  6. package/package.json +7 -7
package/CHANGELOG.md CHANGED
@@ -3,6 +3,33 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ # [6.34.0](https://github.com/linz/basemaps/compare/v6.33.0...v6.34.0) (2022-08-17)
7
+
8
+ **Note:** Version bump only for package @basemaps/shared
9
+
10
+
11
+
12
+
13
+
14
+ # [6.33.0](https://github.com/linz/basemaps/compare/v6.32.2...v6.33.0) (2022-08-01)
15
+
16
+
17
+ ### Bug Fixes
18
+
19
+ * **lambda-analytics:** do not track invalid api keys BM-642 ([#2392](https://github.com/linz/basemaps/issues/2392)) ([9f84285](https://github.com/linz/basemaps/commit/9f84285ed203bf3443f288b20482cb18d6b13c40))
20
+
21
+
22
+
23
+
24
+
25
+ ## [6.32.1](https://github.com/linz/basemaps/compare/v6.32.0...v6.32.1) (2022-07-28)
26
+
27
+ **Note:** Version bump only for package @basemaps/shared
28
+
29
+
30
+
31
+
32
+
6
33
  # [6.32.0](https://github.com/linz/basemaps/compare/v6.31.0...v6.32.0) (2022-07-28)
7
34
 
8
35
 
package/build/api.d.ts CHANGED
@@ -1,3 +1,13 @@
1
1
  export declare const OneDayMs: number;
2
2
  export declare function getApiKey(): string;
3
+ export declare type ApiKeyStatus = ApiKeyStatusValid | ApiKeyStatusInvalid;
4
+ export interface ApiKeyStatusValid {
5
+ valid: true;
6
+ key: string;
7
+ }
8
+ export interface ApiKeyStatusInvalid {
9
+ valid: false;
10
+ message: 'malformed' | 'missing' | 'expired';
11
+ }
12
+ export declare function isValidApiKey(apiKey?: string | null): ApiKeyStatus;
3
13
  //# sourceMappingURL=api.d.ts.map
package/build/api.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,QAAQ,QAAsB,CAAC;AAU5C,wBAAgB,SAAS,IAAI,MAAM,CAelC"}
1
+ {"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,QAAQ,QAAsB,CAAC;AAW5C,wBAAgB,SAAS,IAAI,MAAM,CAelC;AAED,oBAAY,YAAY,GAAG,iBAAiB,GAAG,mBAAmB,CAAC;AAEnE,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,IAAI,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,WAAW,GAAG,SAAS,GAAG,SAAS,CAAC;CAC9C;AAED,wBAAgB,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,YAAY,CAclE"}
package/build/api.js CHANGED
@@ -3,6 +3,7 @@ const hasLocalStorage = () => typeof localStorage !== 'undefined';
3
3
  export const OneDayMs = 24 * 60 * 60 * 1000;
4
4
  /** Generate a new api key for the user every 30 days */
5
5
  const ApiKeyExpireMs = 30 * OneDayMs;
6
+ const ApiKeyMaxAgeMs = 91 * OneDayMs;
6
7
  function newApiKey() {
7
8
  const newKey = 'c' + ulid().toLowerCase();
8
9
  if (hasLocalStorage())
@@ -28,4 +29,22 @@ export function getApiKey() {
28
29
  return newApiKey();
29
30
  }
30
31
  }
32
+ export function isValidApiKey(apiKey) {
33
+ if (apiKey == null)
34
+ return { valid: false, message: 'missing' };
35
+ if (!apiKey.startsWith('c') && !apiKey.startsWith('d'))
36
+ return { valid: false, message: 'malformed' };
37
+ const ulidId = apiKey.slice(1).toUpperCase();
38
+ try {
39
+ const ulidTime = decodeTime(ulidId);
40
+ if (apiKey.startsWith('d'))
41
+ return { valid: true, key: apiKey };
42
+ if (Date.now() - ulidTime > ApiKeyMaxAgeMs)
43
+ return { valid: false, message: 'expired' };
44
+ }
45
+ catch (e) {
46
+ return { valid: false, message: 'malformed' };
47
+ }
48
+ return { valid: true, key: apiKey };
49
+ }
31
50
  //# sourceMappingURL=api.js.map
package/build/api.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAExC,MAAM,eAAe,GAAG,GAAY,EAAE,CAAC,OAAO,YAAY,KAAK,WAAW,CAAC;AAC3E,MAAM,CAAC,MAAM,QAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAC5C,wDAAwD;AACxD,MAAM,cAAc,GAAG,EAAE,GAAG,QAAQ,CAAC;AAErC,SAAS,SAAS;IAChB,MAAM,MAAM,GAAG,GAAG,GAAG,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC1C,IAAI,eAAe,EAAE;QAAE,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC/D,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,SAAS;IACvB,IAAI,CAAC,eAAe,EAAE;QAAE,OAAO,SAAS,EAAE,CAAC;IAC3C,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAE/C,IAAI,MAAM,IAAI,IAAI;QAAE,OAAO,SAAS,EAAE,CAAC;IACvC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,SAAS,EAAE,CAAC;IAEhD,IAAI;QACF,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAC/D,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,GAAG,YAAY;YAAE,OAAO,MAAM,CAAC;QAC9D,OAAO,SAAS,EAAE,CAAC;KACpB;IAAC,OAAO,CAAC,EAAE;QACV,gEAAgE;QAChE,OAAO,SAAS,EAAE,CAAC;KACpB;AACH,CAAC"}
1
+ {"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAExC,MAAM,eAAe,GAAG,GAAY,EAAE,CAAC,OAAO,YAAY,KAAK,WAAW,CAAC;AAC3E,MAAM,CAAC,MAAM,QAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAC5C,wDAAwD;AACxD,MAAM,cAAc,GAAG,EAAE,GAAG,QAAQ,CAAC;AACrC,MAAM,cAAc,GAAG,EAAE,GAAG,QAAQ,CAAC;AAErC,SAAS,SAAS;IAChB,MAAM,MAAM,GAAG,GAAG,GAAG,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC1C,IAAI,eAAe,EAAE;QAAE,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC/D,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,SAAS;IACvB,IAAI,CAAC,eAAe,EAAE;QAAE,OAAO,SAAS,EAAE,CAAC;IAC3C,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAE/C,IAAI,MAAM,IAAI,IAAI;QAAE,OAAO,SAAS,EAAE,CAAC;IACvC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,SAAS,EAAE,CAAC;IAEhD,IAAI;QACF,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAC/D,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,GAAG,YAAY;YAAE,OAAO,MAAM,CAAC;QAC9D,OAAO,SAAS,EAAE,CAAC;KACpB;IAAC,OAAO,CAAC,EAAE;QACV,gEAAgE;QAChE,OAAO,SAAS,EAAE,CAAC;KACpB;AACH,CAAC;AAcD,MAAM,UAAU,aAAa,CAAC,MAAsB;IAClD,IAAI,MAAM,IAAI,IAAI;QAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;IAChE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IACtG,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAC7C,IAAI;QACF,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;QAEhE,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,GAAG,cAAc;YAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;KACzF;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;KAC/C;IAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;AACtC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@basemaps/shared",
3
- "version": "6.32.0",
3
+ "version": "6.34.0",
4
4
  "private": false,
5
5
  "repository": {
6
6
  "type": "git",
@@ -23,12 +23,12 @@
23
23
  "test": "ospec --globs 'build/**/*.test.js'"
24
24
  },
25
25
  "dependencies": {
26
- "@basemaps/config": "^6.32.0",
27
- "@basemaps/geo": "^6.31.0",
28
- "@basemaps/tiler": "^6.31.0",
26
+ "@basemaps/config": "^6.34.0",
27
+ "@basemaps/geo": "^6.32.1",
28
+ "@basemaps/tiler": "^6.32.1",
29
29
  "@chunkd/source-aws-v2": "^8.4.0",
30
- "@linzjs/geojson": "^6.28.1",
31
- "@linzjs/metrics": "^6.28.1",
30
+ "@linzjs/geojson": "^6.32.1",
31
+ "@linzjs/metrics": "^6.32.1",
32
32
  "aws-sdk": "^2.890.0",
33
33
  "entities": "^4.3.0",
34
34
  "pino": "^8.3.0",
@@ -49,5 +49,5 @@
49
49
  "files": [
50
50
  "build/"
51
51
  ],
52
- "gitHead": "cf9e8d4e61f7634acf51b9a837bbab6889761f1b"
52
+ "gitHead": "1685fa12be66df74bc64d7f76b7355390980a43f"
53
53
  }