@ngageoint/mage.service 6.3.0 → 6.4.0-beta.1
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/lib/authentication/ldap.d.ts.map +1 -1
- package/lib/authentication/ldap.js +3 -1
- package/lib/authentication/ldap.js.map +1 -1
- package/lib/dist-package.json +2 -1
- package/lib/routes/imports.d.ts +8 -2
- package/lib/routes/imports.d.ts.map +1 -1
- package/lib/routes/imports.js +69 -30
- package/lib/routes/imports.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/npm-shrinkwrap.json +13 -2
- package/package.json +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ldap.d.ts","sourceRoot":"","sources":["../../src/authentication/ldap.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ldap.d.ts","sourceRoot":"","sources":["../../src/authentication/ldap.js"],"names":[],"mappings":"AA4FA,gDAoDC"}
|
|
@@ -15,7 +15,9 @@ function configure(strategy) {
|
|
|
15
15
|
groupSearchScope: strategy.settings.groupSearchScope,
|
|
16
16
|
bindProperty: strategy.settings.bindProperty,
|
|
17
17
|
groupDnProperty: strategy.settings.groupDnProperty
|
|
18
|
-
}
|
|
18
|
+
},
|
|
19
|
+
usernameField: 'username',
|
|
20
|
+
passwordField: 'password'
|
|
19
21
|
}, function (profile, done) {
|
|
20
22
|
const username = profile[strategy.settings.profile.id];
|
|
21
23
|
User.getUserByAuthenticationStrategy(strategy.type, username, function (err, user) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ldap.js","sourceRoot":"","sources":["../../src/authentication/ldap.js"],"names":[],"mappings":";AAAA,MAAM,YAAY,GAAG,OAAO,CAAC,mBAAmB,CAAC,EAC7C,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,EACxB,IAAI,GAAG,OAAO,CAAC,gBAAgB,CAAC,EAChC,IAAI,GAAG,OAAO,CAAC,gBAAgB,CAAC,EAChC,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,cAAc,EACzD,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,EACvB,eAAe,GAAG,OAAO,CAAC,sBAAsB,CAAC,EACjD,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEzD,SAAS,SAAS,CAAC,QAAQ;IACzB,GAAG,CAAC,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,KAAK,GAAG,iBAAiB,CAAC,CAAC;IAE9D,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,YAAY,CAAC;QAC3C,MAAM,EAAE;YACN,GAAG,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG;YAC1B,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM;YAChC,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC,eAAe;YAClD,UAAU,EAAE,QAAQ,CAAC,QAAQ,CAAC,UAAU;YACxC,YAAY,EAAE,QAAQ,CAAC,QAAQ,CAAC,YAAY;YAC5C,WAAW,EAAE,QAAQ,CAAC,QAAQ,CAAC,WAAW;YAC1C,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC,eAAe;YAClD,iBAAiB,EAAE,QAAQ,CAAC,QAAQ,CAAC,iBAAiB;YACtD,gBAAgB,EAAE,QAAQ,CAAC,QAAQ,CAAC,gBAAgB;YACpD,YAAY,EAAE,QAAQ,CAAC,QAAQ,CAAC,YAAY;YAC5C,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC,eAAe;SACnD;
|
|
1
|
+
{"version":3,"file":"ldap.js","sourceRoot":"","sources":["../../src/authentication/ldap.js"],"names":[],"mappings":"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"}
|
package/lib/dist-package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ngageoint/mage.service",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.4.0-beta.1",
|
|
4
4
|
"displayName": "MAGE Service",
|
|
5
5
|
"description": "MAGE is a geospatial situational awareness and data collection platform. The MAGE Service is the ReST service API that the MAGE client apps use to interact with MAGE data.",
|
|
6
6
|
"keywords": [
|
|
@@ -82,6 +82,7 @@
|
|
|
82
82
|
},
|
|
83
83
|
"devDependencies": {
|
|
84
84
|
"@fluffy-spoon/substitute": "1.208.0",
|
|
85
|
+
"@types/adm-zip": "0.5.7",
|
|
85
86
|
"@types/archiver": "5.3.4",
|
|
86
87
|
"@types/async": "3.2.24",
|
|
87
88
|
"@types/bson": "1.0.11",
|
package/lib/routes/imports.d.ts
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
import { Express } from 'express';
|
|
2
|
+
interface SecurityConfig {
|
|
3
|
+
authentication: {
|
|
4
|
+
passport: any;
|
|
5
|
+
};
|
|
6
|
+
}
|
|
7
|
+
declare function importRoutes(app: Express, security: SecurityConfig): void;
|
|
8
|
+
export = importRoutes;
|
|
3
9
|
//# sourceMappingURL=imports.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../src/routes/imports.
|
|
1
|
+
{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../src/routes/imports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAmC,MAAM,SAAS,CAAC;AAUnE,UAAU,cAAc;IACpB,cAAc,EAAE;QACZ,QAAQ,EAAE,GAAG,CAAC;KACjB,CAAC;CACL;AAiBD,iBAAS,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,GAAG,IAAI,CAoFlE;AAED,SAAS,YAAY,CAAC"}
|
package/lib/routes/imports.js
CHANGED
|
@@ -1,47 +1,86 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
const api_1 = __importDefault(require("../api"));
|
|
6
|
+
const access_1 = __importDefault(require("../access"));
|
|
7
|
+
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
8
|
+
const adm_zip_1 = __importDefault(require("adm-zip"));
|
|
9
|
+
const upload_1 = require("../upload");
|
|
10
|
+
const xmldom_1 = require("@xmldom/xmldom");
|
|
11
|
+
const togeojson_1 = __importDefault(require("../utilities/togeojson"));
|
|
12
|
+
function importRoutes(app, security) {
|
|
4
13
|
const passport = security.authentication.passport;
|
|
5
14
|
function validate(req, res, next) {
|
|
6
|
-
|
|
15
|
+
const layRequest = req;
|
|
16
|
+
if (layRequest.layer.type !== 'Feature') {
|
|
7
17
|
return res.status(400).send('Cannot import data, layer type is not "Static".');
|
|
8
18
|
}
|
|
9
|
-
if (!
|
|
10
|
-
return res.status(400).send('Invalid file, please upload a KML file.');
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
19
|
+
if (!layRequest.file) {
|
|
20
|
+
return res.status(400).send('Invalid file, please upload a KML or KMZ file.');
|
|
21
|
+
}
|
|
22
|
+
const fileExtension = layRequest.file.originalname.toLowerCase().split('.').pop() || '';
|
|
23
|
+
if (fileExtension === 'kmz') {
|
|
24
|
+
try {
|
|
25
|
+
const zip = new adm_zip_1.default(layRequest.file.path);
|
|
26
|
+
const zipEntries = zip.getEntries();
|
|
27
|
+
const kmlEntry = zipEntries.find(entry => entry.entryName.toLowerCase().endsWith('.kml'));
|
|
28
|
+
if (!kmlEntry) {
|
|
29
|
+
return res.status(400).send('No KML file found inside.');
|
|
30
|
+
}
|
|
31
|
+
const kmlData = kmlEntry.getData().toString('utf8');
|
|
32
|
+
processKmlData(kmlData, layRequest, res, next);
|
|
23
33
|
}
|
|
24
|
-
|
|
25
|
-
return res.status(400).send('
|
|
34
|
+
catch (err) {
|
|
35
|
+
return res.status(400).send('Unable to extract contents from KMZ file.');
|
|
26
36
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
37
|
+
}
|
|
38
|
+
else if (fileExtension === 'kml') {
|
|
39
|
+
fs_extra_1.default.readFile(layRequest.file.path, 'utf8', function (err, data) {
|
|
40
|
+
if (err)
|
|
41
|
+
return next(err);
|
|
42
|
+
processKmlData(data, layRequest, res, next);
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
return res.status(400).send('Invalid file, please upload a KML or KMZ file.');
|
|
47
|
+
}
|
|
30
48
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
new
|
|
34
|
-
|
|
49
|
+
function processKmlData(data, req, res, next) {
|
|
50
|
+
var _a;
|
|
51
|
+
const parser = new xmldom_1.DOMParser();
|
|
52
|
+
const kml = parser.parseFromString(data, "application/xml");
|
|
53
|
+
const parseError = kml.getElementsByTagName("parsererror");
|
|
54
|
+
if (parseError.length > 0) {
|
|
55
|
+
console.error("KML Parsing Error:", parseError[0].textContent);
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
console.log("Parsed KML successfully");
|
|
59
|
+
}
|
|
60
|
+
if (!kml || ((_a = kml.documentElement) === null || _a === void 0 ? void 0 : _a.nodeName) !== 'kml') {
|
|
61
|
+
return res.status(400).send('Invalid file, please upload a KML or KMZ file.');
|
|
62
|
+
}
|
|
63
|
+
req.kml = kml;
|
|
64
|
+
return next();
|
|
65
|
+
}
|
|
66
|
+
app.post('/api/layers/:layerId/kml', passport.authenticate('bearer'), access_1.default.authorize('CREATE_LAYER'), upload_1.defaultHandler.single('file'), validate, function (req, res, next) {
|
|
67
|
+
var _a;
|
|
68
|
+
const layerRequest = req;
|
|
69
|
+
console.log('Importing KML file:', (_a = layerRequest.file) === null || _a === void 0 ? void 0 : _a.originalname);
|
|
70
|
+
const features = togeojson_1.default.kml(layerRequest.kml);
|
|
71
|
+
new api_1.default.Feature(layerRequest.layer).createFeatures(features)
|
|
72
|
+
.then((newFeatures) => {
|
|
35
73
|
const response = {
|
|
36
74
|
files: [{
|
|
37
|
-
name: Buffer.from(
|
|
38
|
-
size:
|
|
75
|
+
name: Buffer.from(layerRequest.file.originalname, 'latin1').toString('utf-8'),
|
|
76
|
+
size: layerRequest.file.size,
|
|
39
77
|
features: newFeatures ? newFeatures.length : 0
|
|
40
78
|
}]
|
|
41
79
|
};
|
|
42
80
|
res.json(response);
|
|
43
81
|
})
|
|
44
|
-
.catch(err => next(err));
|
|
82
|
+
.catch((err) => next(err));
|
|
45
83
|
});
|
|
46
|
-
}
|
|
84
|
+
}
|
|
85
|
+
module.exports = importRoutes;
|
|
47
86
|
//# sourceMappingURL=imports.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/routes/imports.
|
|
1
|
+
{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/routes/imports.ts"],"names":[],"mappings":"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"}
|