BIS-753: Fixing merging issues.

api-data-store-server-javascript/src/js/api/server-data-store-facade.js

-;(function(global){
-  'use strict'
+// ;(function(global){
+//   'use strict'
 
 /**
  * ======================================================
@@ -908,21 +908,21 @@ var md5 = (function(){
 
     return md5;
 })();
-
-/**
- * ==================================================================================
- * EXPORT
- * ==================================================================================
- */
-
-if (typeof define === 'function' && define.amd) {
-  define(function () {
-    return DataStoreServer
-  })
-} else if (typeof module === 'object' && module.exports) {
-  module.exports = DataStoreServer
-} else {
-  global.DataStoreServer = DataStoreServer
-}
-
-})(this);
\ No newline at end of file
+//
+// /**
+//  * ==================================================================================
+//  * EXPORT
+//  * ==================================================================================
+//  */
+//
+// if (typeof define === 'function' && define.amd) {
+//   define(function () {
+//     return DataStoreServer
+//   })
+// } else if (typeof module === 'object' && module.exports) {
+//   module.exports = DataStoreServer
+// } else {
+//   global.DataStoreServer = DataStoreServer
+// }
+//
+// })(this);
\ No newline at end of file

server-data-store/src/main/java/ch/ethz/sis/afsserver/server/impl/ApiServerAdapter.java

@@ -165,7 +165,7 @@ public class ApiServerAdapter<CONNECTION, API> implements HttpServerHandler
                         case "data":
                             // Fall though
                         case "md5Hash":
-                            methodParameters.put(entry.getKey(), Base64.getDecoder().decode(value));
+                            methodParameters.put(entry.getKey(), Base64.getUrlDecoder().decode(value));
                             break;
                         default:
                             methodParameters.put(entry.getKey(), value);

ui-admin/src/js/components/database/data-browser/DataBrowserController.js

@@ -40,7 +40,7 @@ export default class DataBrowserController extends ComponentController {
       this.component.datastoreServer.free(this.owner, this.path)
         .then((data) => {
           if (!data.error) {
-            resolve(data.result[1]);
+            resolve(data);
           } else {
             reject(data.error)
           }
@@ -62,8 +62,7 @@ export default class DataBrowserController extends ComponentController {
       this.component.datastoreServer.list(this.owner, pathToList, false)
         .then((data) => {
           if (!data.error) {
-            const results = data.result[1]
-            resolve(results.map(result => result[1]))
+            resolve(data)
           } else {
             reject(data.error)
           }