@loaders.gl/services 5.0.0-alpha.5 → 5.0.0-alpha.6
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/dist/arcgis/arcgis-feature-server-source-loader.d.ts.map +1 -1
- package/dist/arcgis/arcgis-feature-server-source-loader.js +3 -1
- package/dist/arcgis/arcgis-feature-server-source-loader.js.map +1 -1
- package/dist/authentication.d.ts +14 -2
- package/dist/authentication.d.ts.map +1 -1
- package/dist/authentication.js +83 -5
- package/dist/authentication.js.map +1 -1
- package/dist/index.cjs +2936 -1088
- package/dist/index.cjs.map +3 -3
- package/package.json +13 -9
- package/src/arcgis/arcgis-feature-server-source-loader.ts +3 -1
- package/src/authentication.ts +110 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arcgis-feature-server-source-loader.d.ts","sourceRoot":"","sources":["../../src/arcgis/arcgis-feature-server-source-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAW,MAAM,EAAe,MAAM,oBAAoB,CAAC;AAKvE,OAAO,KAAK,EACV,OAAO,EACP,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,YAAY,EACZ,gBAAgB,EACjB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AAGpD,0DAA0D;AAC1D,MAAM,MAAM,gCAAgC,GAAG;IAC7C,kDAAkD;IAClD,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,wBAAwB;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gCAAgC;IAChC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,qBAAqB;IACrB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC9B,qDAAqD;IACrD,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,yDAAyD;IACzD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,4BAA4B;IAC5B,YAAY,CAAC,EACT,sBAAsB,GACtB,mBAAmB,GACnB,sBAAsB,GACtB,qBAAqB,CAAC;IAC1B,iDAAiD;IACjD,UAAU,CAAC,EACP,0BAA0B,GAC1B,wBAAwB,GACxB,uBAAuB,GACvB,kCAAkC,GAClC,+BAA+B,GAC/B,wBAAwB,GACxB,uBAAuB,GACvB,sBAAsB,CAAC;IAC3B,0BAA0B;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,yBAAyB;IACzB,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,MAAM,CAAC;IAC1C,8BAA8B;IAC9B,CAAC,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;CAClC,CAAC;AAEF,mDAAmD;AACnD,MAAM,MAAM,sCAAsC,GAAG,iBAAiB,GAAG;IACvE,uBAAuB,CAAC,EAAE;QACxB,+CAA+C;QAC/C,eAAe,CAAC,EAAE,OAAO,CAAC,gCAAgC,CAAC,CAAC;KAC7D,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,+BAA+B;uBACb,kBAAkB;wBAC5B,KAAK;;;;;;;;;;;;;;;;;;4BAqBT,MAAM,KAAG,OAAO;qCAExB,MAAM,WACF,sCAAsC,YACrC,OAAO,KAChB,kBAAkB;CAC8B,CAAC;AAEtD;;;;GAIG;AACH,qBAAa,kBACX,SAAQ,UAAU,CAAC,MAAM,EAAE,sCAAsC,CACjE,YAAW,YAAY;IAEvB,oDAAoD;IACpD,SAAS,CAAC,sBAAsB,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;gBAEjD,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,sCAAsC,EAAE,OAAO,CAAC,EAAE,OAAO;IAI3F,2EAA2E;IACrE,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAKlC,gDAAgD;IAC1C,WAAW,CACf,OAAO,GAAE;QAAC,sBAAsB,CAAC,EAAE,OAAO,CAAA;KAAM,GAC/C,OAAO,CAAC,oBAAoB,CAAC;IAahC,sEAAsE;IAChE,WAAW,CAAC,UAAU,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"arcgis-feature-server-source-loader.d.ts","sourceRoot":"","sources":["../../src/arcgis/arcgis-feature-server-source-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,7 +71,9 @@ export class ArcGISVectorSource extends DataSource {
|
|
|
71
71
|
return geoJsonTable;
|
|
72
72
|
case 'arrow':
|
|
73
73
|
default:
|
|
74
|
-
return convertFeaturesToWKBArrowTable(geoJsonTable.features
|
|
74
|
+
return convertFeaturesToWKBArrowTable(geoJsonTable.features, {
|
|
75
|
+
encodingPreference: parameters.geoarrow?.encodingPreference
|
|
76
|
+
});
|
|
75
77
|
}
|
|
76
78
|
}
|
|
77
79
|
/** Requests the raw ArcGIS FeatureServer metadata document. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arcgis-feature-server-source-loader.js","sourceRoot":"","sources":["../../src/arcgis/arcgis-feature-server-source-loader.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"arcgis-feature-server-source-loader.js","sourceRoot":"","sources":["../../src/arcgis/arcgis-feature-server-source-loader.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EACL,8BAA8B,EAC9B,uCAAuC,EACxC,MAAM,iBAAiB,CAAC;AAUzB,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAC,sBAAsB,EAAC,8BAA2B;AAgD1D;;GAEG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAG;IAC7C,QAAQ,EAAE,IAAqC;IAC/C,SAAS,EAAE,IAAa;IACxB,IAAI,EAAE,qBAAqB;IAC3B,EAAE,EAAE,uBAAuB;IAC3B,MAAM,EAAE,UAAU;IAClB,OAAO,EAAE,OAAO;IAChB,UAAU,EAAE,EAAE;IACd,SAAS,EAAE,EAAE;IACb,IAAI,EAAE,uBAAuB;IAC7B,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,KAAK;IAEf,OAAO,EAAE;QACP,GAAG,EAAE,SAAU;QACf,uBAAuB,EAAE,EAAE;KAC5B;IAED,cAAc,EAAE;QACd,GAAG,EAAE,SAAU;QACf,uBAAuB,EAAE,EAAE;KAC5B;IAED,OAAO,EAAE,CAAC,GAAW,EAAW,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC;IAC9E,gBAAgB,EAAE,CAChB,GAAW,EACX,OAA+C,EAC/C,OAAiB,EACG,EAAE,CAAC,IAAI,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC;CACnB,CAAC;AAEtD;;;;GAIG;AACH,MAAM,OAAO,kBACX,SAAQ,UAA0D;IAGlE,oDAAoD;IAC1C,sBAAsB,GAAwB,IAAI,CAAC;IAE7D,YAAY,GAAW,EAAE,OAA+C,EAAE,OAAiB;QACzF,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,+BAA+B,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAC/E,CAAC;IAED,2EAA2E;IAC3E,KAAK,CAAC,SAAS;QACb,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACxD,OAAO,8BAA8B,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC;IAED,gDAAgD;IAChD,KAAK,CAAC,WAAW,CACf,UAA8C,EAAE;QAEhD,gCAAgC;QAChC,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAEtE,MAAM,QAAQ,GAAG,gCAAgC,CAAC,sBAAsB,CAAC,CAAC;QAE1E,mEAAmE;QACnE,IAAI,OAAO,CAAC,sBAAsB,EAAE,CAAC;YACnC,QAAQ,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;QAC3D,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,sEAAsE;IACtE,KAAK,CAAC,WAAW,CAAC,UAAiC;QACjD,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAC/B,GAAG,EACH,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAC,MAAM,EAAE,UAAU,CAAC,MAAM,EAAC,CAAC,CAAC,CAAC,SAAS,CAC5D,CAAC;QACF,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACnC,MAAM,YAAY,GAAG,iBAAiB,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,IAAI,OAAO,CAAC;QAE5C,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,QAAQ;gBACX,OAAO,uCAAuC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YACxE,KAAK,SAAS;gBACZ,OAAO,YAAY,CAAC;YACtB,KAAK,OAAO,CAAC;YACb;gBACE,OAAO,8BAA8B,CAAC,YAAY,CAAC,QAAQ,EAAE;oBAC3D,kBAAkB,EAAE,UAAU,CAAC,QAAQ,EAAE,kBAAkB;iBAC5D,CAAC,CAAC;QACP,CAAC;IACH,CAAC;IAED,+DAA+D;IACrD,KAAK,CAAC,0BAA0B;QACxC,+CAA+C;QAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvC,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACnC,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC/B,CAAC;IAED,8DAA8D;IACpD,KAAK,CAAC,yBAAyB;QACvC,IAAI,CAAC,sBAAsB,KAAK,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAClE,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC;IAC3C,CAAC;IAED,mEAAmE;IACnE,WAAW,CAAC,OAAgD;QAC1D,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,EAAC,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,UAAU,EAAC,CAAC,CAAC;IAC/D,CAAC;IAED,gEAAgE;IAChE,cAAc,CAAC,UAAiC;QAC9C,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAAE,eAAe,IAAI,EAAE,CAAC;QACvF,MAAM,gBAAgB,GAAG,+BAA+B,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC;QACjF,MAAM,eAAe,GAAqC;YACxD,cAAc,EAAE,IAAI;YACpB,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,GAAG;YACd,KAAK,EAAE,gBAAgB;YACvB,IAAI,EAAE,gBAAgB;YACtB,CAAC,EAAE,SAAS;YACZ,GAAG,iBAAiB;SACrB,CAAC;QAEF,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;YAC3B,eAAe,CAAC,QAAQ,GAAG;gBACzB,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5B,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5B,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5B,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAC7B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACZ,eAAe,CAAC,YAAY,GAAG,sBAAsB,CAAC;YACtD,eAAe,CAAC,UAAU,KAAK,0BAA0B,CAAC;QAC5D,CAAC;QAED,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC;QAC1F,MAAM,eAAe,GAAG,kCAAkC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1E,MAAM,YAAY,GAAG,eAAe,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,QAAQ,CAAC;QAC5E,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;IACpD,CAAC;IAED,0CAA0C;IAChC,MAAM,CACd,IAAY,EACZ,OAAgC,EAChC,KAA+B;QAE/B,OAAO,sBAAsB,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,EAAC,GAAG,OAAO,EAAE,GAAG,KAAK,EAAC,CAAC,CAAC;IACxE,CAAC;IAED,+CAA+C;IACrC,KAAK,CAAC,aAAa,CAAC,QAAkB;QAC9C,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CACb,QAAQ,CAAC,UAAU,IAAI,wCAAwC,QAAQ,CAAC,MAAM,EAAE,CACjF,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAED,SAAS,gCAAgC,CAAC,IAAS;IACjD,MAAM,MAAM,GAAmC,EAAE,CAAC;IAClD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,MAAM,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,IAAI,MAAM,EAAE,gBAAgB,CAAC;QAC5E,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,KAAK,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5D,KAAK,EAAE,KAAK,CAAC,IAAI;YACjB,GAAG,EAAE,mCAAmC,CAAC,gBAAgB,CAAC;YAC1D,WAAW,EAAE,qBAAqB,CAAC,MAAM,CAAC;SAC3C,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,IAAI,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACzD,KAAK,EAAE,IAAI,CAAC,IAAI;YAChB,GAAG,EAAE,mCAAmC,CAAC,IAAI,CAAC,gBAAgB,IAAI,MAAM,EAAE,gBAAgB,CAAC;YAC3F,WAAW,EAAE,qBAAqB,CAAC,MAAM,CAAC;SAC3C,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,sCAAsC;QACtC,KAAK,EAAE,IAAI,CAAC,kBAAkB,IAAI,EAAE;QACpC,IAAI,EAAE,IAAI,CAAC,kBAAkB,IAAI,EAAE;QACnC,QAAQ,EAAE,IAAI,CAAC,WAAW,IAAI,EAAE;QAChC,QAAQ,EAAE,EAAE;QACZ,0CAA0C;QAC1C,oBAAoB;QACpB,MAAM;KACP,CAAC;AACJ,CAAC;AAED,wEAAwE;AACxE,SAAS,mCAAmC,CAC1C,gBAAkE;IAElE,MAAM,mBAAmB,GAAG,gBAAgB,EAAE,UAAU,IAAI,gBAAgB,EAAE,IAAI,CAAC;IACnF,OAAO,mBAAmB,CAAC,CAAC,CAAC,CAAC,QAAQ,mBAAmB,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC3E,CAAC;AAED,sEAAsE;AACtE,SAAS,qBAAqB,CAC5B,MAAgF;IAEhF,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;QAC1F,CAAC,CAAC;YACE,CAAC,MAAM,CAAC,IAAK,EAAE,MAAM,CAAC,IAAK,CAAC;YAC5B,CAAC,MAAM,CAAC,IAAK,EAAE,MAAM,CAAC,IAAK,CAAC;SAC7B;QACH,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,kEAAkE;AAClE,SAAS,+BAA+B,CACtC,gBAA6C;IAE7C,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;QACzC,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACrD,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,iEAAiE;AACjE,SAAS,8BAA8B,CAAC,IAAS;IAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;QACvC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,CAAC;YAC/B,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,gCAAgC,CAAC,KAAK,CAAC,IAAI,CAAC;YAClD,QAAQ,EAAE,KAAK,CAAC,QAAQ;SACzB,CAAC,CAAC;QACL,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO,EAAC,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAC,CAAC;AAChC,CAAC;AAED,wEAAwE;AACxE,SAAS,gCAAgC,CAAC,IAAY;IACpD,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,qBAAqB;YACxB,OAAO,SAAS,CAAC;QACnB,KAAK,qBAAqB;YACxB,OAAO,SAAS,CAAC;QACnB,KAAK,sBAAsB,CAAC;QAC5B,KAAK,2BAA2B,CAAC;QACjC,KAAK,kBAAkB;YACrB,OAAO,OAAO,CAAC;QACjB,KAAK,mBAAmB;YACtB,OAAO,uBAAuB,CAAC;QACjC;YACE,OAAO,MAAM,CAAC;IAClB,CAAC;AACH,CAAC;AAED,kFAAkF;AAClF,SAAS,iBAAiB,CAAC,IAAS;IAClC,IAAI,IAAI,EAAE,IAAI,KAAK,mBAAmB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvE,OAAO;YACL,KAAK,EAAE,eAAe;YACtB,IAAI,EAAE,mBAAmB;YACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;AAC3F,CAAC"}
|
package/dist/authentication.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { RequestCredential, TokenValue } from '@loaders.gl/loader-utils';
|
|
1
|
+
import type { FetchLike, RequestCredential, TokenValue } from '@loaders.gl/loader-utils';
|
|
2
2
|
/** Shared options for provider credential presets with known public API origins. */
|
|
3
3
|
export type ServiceCredentialOptions = {
|
|
4
4
|
/** Replaces the provider's default exact-origin allowlist. */
|
|
@@ -25,6 +25,12 @@ export type GoogleMapsCredentialOptions = ServiceCredentialOptions & {
|
|
|
25
25
|
export type CesiumIonCredentialOptions = ServiceCredentialOptions & {
|
|
26
26
|
/** Cesium ion access token or application-managed token callback. */
|
|
27
27
|
accessToken: TokenValue;
|
|
28
|
+
/** Optional asset whose endpoint-scoped token should be resolved. */
|
|
29
|
+
assetId?: number | string;
|
|
30
|
+
/** Overrides the transport used for the ion endpoint-token exchange. */
|
|
31
|
+
fetch?: FetchLike;
|
|
32
|
+
/** Whether the supplied token is account-scoped or already asset-scoped. */
|
|
33
|
+
tokenType?: 'account' | 'asset' | 'auto';
|
|
28
34
|
};
|
|
29
35
|
/** Creates an exact-origin ArcGIS `token` query credential. */
|
|
30
36
|
export declare function createArcGISCredential(options: ArcGISCredentialOptions): RequestCredential;
|
|
@@ -32,6 +38,12 @@ export declare function createArcGISCredential(options: ArcGISCredentialOptions)
|
|
|
32
38
|
export declare function createMapboxCredential(options: MapboxCredentialOptions): RequestCredential;
|
|
33
39
|
/** Creates a Google Maps Platform `key` query credential. */
|
|
34
40
|
export declare function createGoogleMapsCredential(options: GoogleMapsCredentialOptions): RequestCredential;
|
|
35
|
-
/**
|
|
41
|
+
/**
|
|
42
|
+
* Creates a bearer credential for the Cesium ion REST API or one Cesium ion asset.
|
|
43
|
+
*
|
|
44
|
+
* Supplying `assetId` creates an asset-origin credential. Account tokens are exchanged lazily
|
|
45
|
+
* through Cesium ion's endpoint API; legacy asset-scoped tokens are used directly. Without an
|
|
46
|
+
* `assetId`, the credential is scoped only to the ion REST API for backwards compatibility.
|
|
47
|
+
*/
|
|
36
48
|
export declare function createCesiumIonCredential(options: CesiumIonCredentialOptions): RequestCredential;
|
|
37
49
|
//# sourceMappingURL=authentication.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication.d.ts","sourceRoot":"","sources":["../src/authentication.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"authentication.d.ts","sourceRoot":"","sources":["../src/authentication.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,SAAS,EACT,iBAAiB,EAEjB,UAAU,EACX,MAAM,0BAA0B,CAAC;AAalC,oFAAoF;AACpF,MAAM,MAAM,wBAAwB,GAAG;IACrC,8DAA8D;IAC9D,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7B,CAAC;AAEF,qDAAqD;AACrD,MAAM,MAAM,uBAAuB,GAAG;IACpC,0DAA0D;IAC1D,KAAK,EAAE,UAAU,CAAC;IAClB,iFAAiF;IACjF,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;CAC5B,CAAC;AAEF,2CAA2C;AAC3C,MAAM,MAAM,uBAAuB,GAAG,wBAAwB,GAAG;IAC/D,wEAAwE;IACxE,WAAW,EAAE,UAAU,CAAC;CACzB,CAAC;AAEF,qDAAqD;AACrD,MAAM,MAAM,2BAA2B,GAAG,wBAAwB,GAAG;IACnE,wEAAwE;IACxE,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,+CAA+C;AAC/C,MAAM,MAAM,0BAA0B,GAAG,wBAAwB,GAAG;IAClE,qEAAqE;IACrE,WAAW,EAAE,UAAU,CAAC;IACxB,qEAAqE;IACrE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,wEAAwE;IACxE,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,4EAA4E;IAC5E,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,MAAM,CAAC;CAC1C,CAAC;AAEF,+DAA+D;AAC/D,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,uBAAuB,GAAG,iBAAiB,CAQ1F;AAED,wDAAwD;AACxD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,uBAAuB,GAAG,iBAAiB,CAO1F;AAED,6DAA6D;AAC7D,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,2BAA2B,GACnC,iBAAiB,CAOnB;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,0BAA0B,GAAG,iBAAiB,CAwBhG"}
|
package/dist/authentication.js
CHANGED
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
// loaders.gl
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
|
-
import { createBearerTokenCredential, createQueryParameterCredential } from '@loaders.gl/loader-utils';
|
|
4
|
+
import { createAuthenticatedFetch, createBearerTokenCredential, createQueryParameterCredential } from '@loaders.gl/loader-utils';
|
|
5
|
+
const CESIUM_ION_API_ORIGIN = 'https://api.cesium.com';
|
|
6
|
+
const CESIUM_ION_ASSET_ORIGINS = [
|
|
7
|
+
'https://assets.ion.cesium.com',
|
|
8
|
+
'https://assets.cesium.com'
|
|
9
|
+
];
|
|
5
10
|
/** Creates an exact-origin ArcGIS `token` query credential. */
|
|
6
11
|
export function createArcGISCredential(options) {
|
|
7
12
|
return createQueryParameterCredential({
|
|
@@ -30,12 +35,85 @@ export function createGoogleMapsCredential(options) {
|
|
|
30
35
|
token: options.apiKey
|
|
31
36
|
});
|
|
32
37
|
}
|
|
33
|
-
/**
|
|
38
|
+
/**
|
|
39
|
+
* Creates a bearer credential for the Cesium ion REST API or one Cesium ion asset.
|
|
40
|
+
*
|
|
41
|
+
* Supplying `assetId` creates an asset-origin credential. Account tokens are exchanged lazily
|
|
42
|
+
* through Cesium ion's endpoint API; legacy asset-scoped tokens are used directly. Without an
|
|
43
|
+
* `assetId`, the credential is scoped only to the ion REST API for backwards compatibility.
|
|
44
|
+
*/
|
|
34
45
|
export function createCesiumIonCredential(options) {
|
|
46
|
+
if (options.assetId === undefined || options.assetId === null) {
|
|
47
|
+
return createBearerTokenCredential({
|
|
48
|
+
id: 'cesium-ion-access-token',
|
|
49
|
+
origins: options.origins || [CESIUM_ION_API_ORIGIN],
|
|
50
|
+
token: options.accessToken
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
const assetId = options.assetId;
|
|
54
|
+
const origins = options.origins || CESIUM_ION_ASSET_ORIGINS;
|
|
55
|
+
let endpointTokenPromise = null;
|
|
35
56
|
return createBearerTokenCredential({
|
|
36
|
-
id:
|
|
37
|
-
origins
|
|
38
|
-
token:
|
|
57
|
+
id: `cesium-ion-asset-${assetId}`,
|
|
58
|
+
origins,
|
|
59
|
+
token: context => {
|
|
60
|
+
if (context.reason === 'refresh') {
|
|
61
|
+
endpointTokenPromise = null;
|
|
62
|
+
}
|
|
63
|
+
endpointTokenPromise ||= resolveCesiumIonAssetToken(options, assetId, origins, context);
|
|
64
|
+
return endpointTokenPromise;
|
|
65
|
+
}
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
/** Resolves an account token and exchanges it for an asset endpoint token when required. */
|
|
69
|
+
async function resolveCesiumIonAssetToken(options, assetId, origins, context) {
|
|
70
|
+
const endpointURL = `${CESIUM_ION_API_ORIGIN}/v1/assets/${assetId}/endpoint`;
|
|
71
|
+
const accessToken = typeof options.accessToken === 'function'
|
|
72
|
+
? await options.accessToken({ ...context, url: endpointURL })
|
|
73
|
+
: options.accessToken;
|
|
74
|
+
if (!accessToken)
|
|
75
|
+
return null;
|
|
76
|
+
const tokenType = options.tokenType || 'auto';
|
|
77
|
+
if (tokenType === 'asset' ||
|
|
78
|
+
(tokenType === 'auto' && isCesiumIonAssetToken(accessToken, assetId))) {
|
|
79
|
+
return accessToken;
|
|
80
|
+
}
|
|
81
|
+
const apiCredential = createBearerTokenCredential({
|
|
82
|
+
id: `cesium-ion-api-${assetId}`,
|
|
83
|
+
origins: [CESIUM_ION_API_ORIGIN],
|
|
84
|
+
token: accessToken
|
|
39
85
|
});
|
|
86
|
+
const ionFetch = createAuthenticatedFetch({
|
|
87
|
+
fetch: options.fetch,
|
|
88
|
+
credentials: [apiCredential]
|
|
89
|
+
});
|
|
90
|
+
const response = await ionFetch(endpointURL);
|
|
91
|
+
if (!response.ok) {
|
|
92
|
+
throw new Error(`Cesium ion asset ${assetId} endpoint request failed: ${response.status}`);
|
|
93
|
+
}
|
|
94
|
+
const endpoint = (await response.json());
|
|
95
|
+
if (typeof endpoint.url !== 'string' || !origins.includes(new URL(endpoint.url).origin)) {
|
|
96
|
+
throw new Error(`Cesium ion asset ${assetId} resolved to an unconfigured origin.`);
|
|
97
|
+
}
|
|
98
|
+
if (typeof endpoint.accessToken !== 'string' || !endpoint.accessToken) {
|
|
99
|
+
throw new Error(`Cesium ion did not return an endpoint token for asset ${assetId}.`);
|
|
100
|
+
}
|
|
101
|
+
return endpoint.accessToken;
|
|
102
|
+
}
|
|
103
|
+
/** Detects legacy JWTs whose claims scope them directly to the requested asset. */
|
|
104
|
+
function isCesiumIonAssetToken(token, assetId) {
|
|
105
|
+
try {
|
|
106
|
+
const encodedClaims = token.split('.')[1];
|
|
107
|
+
if (!encodedClaims)
|
|
108
|
+
return false;
|
|
109
|
+
const base64 = encodedClaims.replace(/-/g, '+').replace(/_/g, '/');
|
|
110
|
+
const paddedBase64 = base64.padEnd(Math.ceil(base64.length / 4) * 4, '=');
|
|
111
|
+
const claims = JSON.parse(atob(paddedBase64));
|
|
112
|
+
return (Array.isArray(claims.assets) &&
|
|
113
|
+
claims.assets.some(claimAssetId => String(claimAssetId) === String(assetId)));
|
|
114
|
+
}
|
|
115
|
+
catch {
|
|
116
|
+
return false;
|
|
117
|
+
}
|
|
40
118
|
}
|
|
41
119
|
//# sourceMappingURL=authentication.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../src/authentication.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;
|
|
1
|
+
{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../src/authentication.ts"],"names":[],"mappings":"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"}
|