cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some integration tests for different cases in named layers type

Browse Source
This commit is contained in:
Raul Ochoa
2015-01-30 18:57:01 +01:00
parent 8b07156a2d
commit 87eaeb0074
3 changed files with 323 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cartodb/models/mapconfig_named_layers_adapter.js
+4 -4
View File
@@ -16,7 +16,7 @@ MapConfigNamedLayersAdapter.prototype.getLayers = function(username, layers, cal
if (layer.type === 'named') {
if (!layer.options.name) {
return callback(new Error('Missing Named Map name in layer options'));
return callback(new Error('Missing Named Map `name` in layer options'));
}
var templateName = layer.options.name;
@@ -24,8 +24,8 @@ MapConfigNamedLayersAdapter.prototype.getLayers = function(username, layers, cal
var templateAuthTokens = layer.options.auth_tokens;
self.templateMaps.getTemplate(username, templateName, function(err, template) {
if (err) {
return callback(err);
if (err || !template) {
return callback(new Error("Template '" + templateName + "' of user '" + username + "' not found"));
}
if (self.templateMaps.isAuthorized(template, templateAuthTokens)) {
@@ -46,7 +46,7 @@ MapConfigNamedLayersAdapter.prototype.getLayers = function(username, layers, cal
return callback(err);
}
} else {
var unauthorizedError = new Error('Unauthorized template instantiation');
var unauthorizedError = new Error("Unauthorized '" + templateName + "' template instantiation");
// unauthorizedError.http_status = 403;
return callback(unauthorizedError);
}