DDF-2644 Changed revert endpoint path to allow security (#42)

Author: rzwiefel

catalog/ui/catalog-ui-search/src/main/java/org/codice/ddf/catalog/ui/metacard/MetacardApplication.java

@@ -251,7 +251,7 @@ public void init() {
             return util.getJson(response);
         });
 
-        get("/history/:id/revert/:revertid", (req, res) -> {
+        get("/history/revert/:id/:revertid", (req, res) -> {
             String id = req.params(":id");
             String revertId = req.params(":revertid");
 

catalog/ui/catalog-ui-search/src/main/java/org/codice/ddf/catalog/ui/metacard/enumerations/ExperimentalEnumerationExtractor.java

@@ -81,8 +81,7 @@ public Map<String, Set<String>> getEnumerations(@Nullable String metacardType) {
                 .stream()
                 .flatMap(ad -> attributeValidatorRegistry.getValidators(ad.getName())
                         .stream()
-                        .map(av -> av.validate(new AttributeImpl(ad.getName(),
-                                "null"))))
+                        .map(av -> av.validate(new AttributeImpl(ad.getName(), "null"))))
                 .filter(Optional::isPresent)
                 .map(Optional::get)
                 .filter(avr -> !avr.getSuggestedValues()

catalog/ui/catalog-ui-search/src/main/webapp/component/metacard-archive/metacard-archive.view.js

@@ -119,8 +119,9 @@ define([
                         var loadingView = new LoadingView();
                         $.whenAll.apply(this, this.model.map(function(result) {
                             return $.get('/search/catalog/internal/history/' +
+                                'revert/' +
                                 result.get('metacard').get('properties').get('metacard.deleted.id') +
-                                '/revert/' +
+                                '/' +
                                 result.get('metacard').get('properties').get('metacard.deleted.version')).then(function(response) {
                                     ResultUtils.refreshResult(result);
                             }.bind(this));

catalog/ui/catalog-ui-search/src/main/webapp/component/metacard-history/metacard-history.view.js

@@ -96,7 +96,7 @@ define([
         revertToSelectedVersion: function(){
             LoadingCompanionView.beginLoading(this);
             var self = this;
-            $.get('/search/catalog/internal/history/'+this.model.get('metacard').get('id')+'/revert/'+selectedVersion).then(function(response){
+            $.get('/search/catalog/internal/history/revert/'+this.model.get('metacard').get('id')+'/'+selectedVersion).then(function(response){
                 self.model.get('metacard').get('properties').set(response.metacards[0]);
             }).always(function(){
                 setTimeout(function(){  //let solr flush

catalog/ui/catalog-ui-search/src/main/webapp/component/metacard-restore/metacard-restore.view.js

@@ -66,7 +66,7 @@ define([
 
             var historyId = model.get('metacard').get('properties').get('metacard.version.id');
             var metacardId = model.get('metacard').get('id');
-            var revert = '/search/catalog/internal/history/' + historyId + '/revert/' + metacardId;
+            var revert = '/search/catalog/internal/history/revert/' + historyId + '/' + metacardId;
 
             $.get(revert).then(function () {
                 model.set({

catalog/ui/catalog-ui-search/src/main/webapp/main.js

@@ -41,9 +41,17 @@ require([
         }
 
         if (!settings.customErrorHandling) {
+            var defaultTitle = 'Server Error';
+            var defaultMessage = 'Unknown error.';
+
+            if (jqxhr.status === 403) {
+                defaultTitle = 'Forbidden';
+                defaultMessage = 'Not Authorized';
+            }
+
             announcement.announce({
-                title: 'Server Error',
-                message: message || 'Unknown error.',
+                title: defaultTitle,
+                message: message || defaultMessage,
                 type: 'error'
             });
         }