Cleanup and fix issues caused by refactoring to ember-ajax

app/app/pods/setup/controller.js

@@ -3,6 +3,9 @@ import NotifierMixin from "../../mixins/notifier";
 import Encoding from "../../utils/encoding";
 
 export default Ember.Controller.extend(NotifierMixin, {
+
+    ajax: Ember.inject.service(),
+
     actions: {
         save() {
             if (is.empty(this.model.title)) {
@@ -37,21 +40,16 @@ export default Ember.Controller.extend(NotifierMixin, {
 
             this.model.allowAnonymousAccess = Ember.$("#allowAnonymousAccess").prop('checked');
 
-            let self = this;
+            this.get('ajax').request("/setup", {
-
+                method: 'POST',
-            $.ajax({
+                data: this.model,
-                type: 'POST',
-                url: "/setup",
-                data: self.model,
                 dataType: "text",
-                success: function() {
+            }).then(() => {
-                    var credentials = Encoding.Base64.encode(":" + self.model.email + ":" + self.model.password);
+                var credentials = Encoding.Base64.encode(":" + this.model.email + ":" + this.model.password);
                 window.location.href = "/auth/sso/" + encodeURIComponent(credentials);
-                },
+            }).catch((error) => {
-                error: function(x) {
                 // TODO notify user of the error within the GUI
-                    console.log("Something went wrong attempting database creation, see server log: " + x);
+                console.log("Something went wrong attempting database creation, see server log: " + error);
-                }
             });
         }
     }

app/app/services/document.js

@@ -20,7 +20,9 @@ export default Ember.Service.extend({
     getDocument(documentId) {
         let url = this.get('sessionService').appMeta.getUrl(`documents/${documentId}`);
 
-        return this.get('ajax').request(url).then((response) => {
+        return this.get('ajax').request(url, {
+            method: "GET"
+        }).then((response) => {
             return models.DocumentModel.create(response);
         });
     },
@@ -30,7 +32,9 @@ export default Ember.Service.extend({
         let appMeta = this.get('sessionService.appMeta');
         let url = appMeta.getUrl(`documents?folder=${folderId}`);
 
-        return this.get('ajax').request(url).then((response) => {
+        return this.get('ajax').request(url, {
+            method: "GET"
+        }).then((response) => {
             let documents = Ember.ArrayProxy.create({
                 content: Ember.A([])
             });
@@ -48,7 +52,9 @@ export default Ember.Service.extend({
     getAllByTag(tag) {
         let url = this.get('sessionService').appMeta.getUrl(`documents?filter=tag&tag=${tag}`);
 
-        return this.get('ajax').request(url).then((response) => {
+        return this.get('ajax').request(url, {
+            method: "GET"
+        }).then((response) => {
             let documents = Ember.ArrayProxy.create({
                 content: Ember.A([])
             });
@@ -166,6 +172,7 @@ export default Ember.Service.extend({
         let url = this.get('sessionService').appMeta.getUrl("documents/" + documentId + "/pages/" + pageId + "/revisions/" + revisionId);
 
         return this.get('ajax').request(url, {
+            method: "GET",
             dataType: 'text'
         });
     },
@@ -191,7 +198,9 @@ export default Ember.Service.extend({
     getTableOfContents(documentId) {
         let url = this.get('sessionService').appMeta.getUrl(`documents/${documentId}/pages?content=0`);
 
-        return this.get('ajax').request(url).then((response) => {
+        return this.get('ajax').request(url, {
+            method: 'GET'
+        }).then((response) => {
             let data = [];
             _.each(response, function(obj) {
                 data.pushObject(models.PageModel.create(obj));
@@ -205,7 +214,9 @@ export default Ember.Service.extend({
     getPages(documentId) {
         let url = this.get('sessionService').appMeta.getUrl(`documents/${documentId}/pages`);
 
-        return this.get('ajax').request(url).then((response) => {
+        return this.get('ajax').request(url, {
+            method: 'GET'
+        }).then((response) => {
             let pages = [];
 
             _.each(response, function(page) {
@@ -224,7 +235,9 @@ export default Ember.Service.extend({
     getPage(documentId, pageId) {
         let url = this.get('sessionService').appMeta.getUrl(`documents/${documentId}/pages/${pageId}`);
 
-        return this.get('ajax').request(url).then((response) => {
+        return this.get('ajax').request(url, {
+            method: 'GET'
+        }).then((response) => {
             let page = models.PageModel.create(response);
             return page;
         });
@@ -234,7 +247,9 @@ export default Ember.Service.extend({
     getPageMeta(documentId, pageId) {
         let url = this.get('sessionService').appMeta.getUrl(`documents/${documentId}/pages/${pageId}/meta`);
 
-        return this.get('ajax').request(url).then((response) => {
+        return this.get('ajax').request(url, {
+            method: 'GET'
+        }).then((response) => {
             let meta = models.PageMetaModel.create(response);
             return meta;
         });
@@ -244,7 +259,9 @@ export default Ember.Service.extend({
     getAttachments(documentId) {
         let url = this.get('sessionService').appMeta.getUrl(`documents/${documentId}/attachments`);
 
-        return this.get('ajax').request(url).then((response) => {
+        return this.get('ajax').request(url, {
+            method: 'GET'
+        }).then((response) => {
             let data = [];
             _.each(response, function(obj) {
                 data.pushObject(models.AttachmentModel.create(obj));

app/app/services/folder.js

@@ -27,6 +27,7 @@ export default BaseService.extend({
         let url = appMeta.getUrl(`folders`);
 
         return this.get('ajax').post(url, {
+            contentType: 'json',
             data: JSON.stringify(folder)
         }).then((folder)=>{
             let folderModel = models.FolderModel.create(folder);
@@ -39,7 +40,9 @@ export default BaseService.extend({
         let appMeta = this.get('sessionService.appMeta');
         let url = appMeta.getUrl(`folders/${id}`);
 
-        return this.get('ajax').request(url).then((response)=>{
+        return this.get('ajax').request(url, {
+            method: 'GET'
+        }).then((response)=>{
             let folder = models.FolderModel.create(response);
             return folder;
         });
@@ -65,6 +68,7 @@ export default BaseService.extend({
 
         return this.get('ajax').request(url, {
             method: 'PUT',
+            contentType: 'json',
             data: JSON.stringify(folder)
         });
     },
@@ -81,6 +85,7 @@ export default BaseService.extend({
         var url = this.get('sessionService').appMeta.getUrl('public/share/' + folderId);
 
         return this.get('ajax').post(url, {
+            contentType: "application/json",
             data: payload
         });
     },
@@ -89,7 +94,9 @@ export default BaseService.extend({
     getProtectedFolderInfo: function() {
         var url = this.get('sessionService').appMeta.getUrl('folders?filter=viewers');
 
-        return this.get('ajax').request(url).then((response)=>{
+        return this.get('ajax').request(url, {
+            method: "GET"
+        }).then((response)=>{
             let data = [];
             _.each(response, function(obj) {
                 data.pushObject(models.ProtectedFolderParticipant.create(obj));
@@ -104,7 +111,9 @@ export default BaseService.extend({
         let appMeta = this.get('sessionService.appMeta');
         let url = appMeta.getUrl(`folders`);
 
-        return this.get('ajax').request(url).then((response)=>{
+        return this.get('ajax').request(url, {
+            method: "GET"
+        }).then((response)=>{
             let data = [];
             _.each(response, function(obj) {
                 data.pushObject(models.FolderModel.create(obj));
@@ -118,7 +127,9 @@ export default BaseService.extend({
     getPermissions(folderId) {
         let url = this.get('sessionService').appMeta.getUrl(`folders/${folderId}/permissions`);
 
-        return this.get('ajax').request(url).then((response)=>{
+        return this.get('ajax').request(url, {
+            method: "GET"
+        }).then((response)=>{
             let data = [];
             _.each(response, function(obj) {
                 data.pushObject(models.FolderPermissionModel.create(obj));
@@ -134,6 +145,7 @@ export default BaseService.extend({
 
         return this.get('ajax').request(url, {
             method: 'PUT',
+            contentType: 'json',
             data: JSON.stringify(payload)
         });
     },
@@ -143,6 +155,7 @@ export default BaseService.extend({
         let url = this.get('sessionService').appMeta.getUrl(`folders/${folderId}/invitation`);
 
         return this.get('ajax').post(url, {
+            contentType: 'json',
             data: JSON.stringify(invitation)
         });
     },

app/app/services/organization.js

@@ -20,7 +20,9 @@ export default Ember.Service.extend({
     getOrg(id) {
         let url = this.get('sessionService').appMeta.getUrl(`organizations/${id}`);
 
-        return this.get('ajax').request(url).then((response) =>{
+        return this.get('ajax').request(url, {
+            method: 'GET'
+        }).then((response) =>{
             let org = models.OrganizationModel.create(response);
             return org;
         });

app/app/services/section.js

@@ -42,7 +42,8 @@ export default BaseService.extend({
         let url = this.get('sessionService').appMeta.getUrl(endpoint);
 
         return this.get('ajax').post(url, {
-            data: JSON.stringify(data)
+            data: JSON.stringify(data),
+            contentType: "application/json"
         });
     },
 
@@ -50,7 +51,9 @@ export default BaseService.extend({
     refresh(documentId) {
         let url = this.get('sessionService').appMeta.getUrl(`sections/refresh?documentID=${documentId}`);
 
-        return this.get('ajax').request(url).then((response)=>{
+        return this.get('ajax').request(url, {
+            method: 'GET'
+        }).then((response)=>{
             let pages = [];
 
             if (is.not.null(response) && is.array(response) && response.length > 0) {

app/app/services/template.js

@@ -38,7 +38,7 @@ export default Ember.Service.extend({
         let url = this.get('sessionService').appMeta.getUrl("templates");
 
         return this.get('ajax').request(url, {
-            type: 'GET'
+            method: 'GET'
         }).then((response) => {
             if (is.not.array(response)) {
                 response = [];
@@ -60,7 +60,7 @@ export default Ember.Service.extend({
         let url = this.get('sessionService').appMeta.getUrl("templates/stock");
 
         return this.get('ajax').request(url, {
-            type: 'GET'
+            method: 'GET'
         });
     }
 });

app/app/services/user.js

@@ -55,7 +55,9 @@ export default Ember.Service.extend({
     getFolderUsers(folderId) {
         let url = this.get('sessionService').appMeta.getUrl(`users/folder/${folderId}`);
 
-        return this.get('ajax').request(url).then((response)=>{
+        return this.get('ajax').request(url, {
+            method: "GET"
+        }).then((response)=>{
             let data = [];
             _.each(response, function(obj) {
                 data.pushObject(models.UserModel.create(obj));
@@ -107,7 +109,9 @@ export default Ember.Service.extend({
             Email: email
         });
 
-        return this.request('ajax').post(url, {
+        return this.get('ajax').request(url, {
+            method: 'POST',
+            dataType: 'json',
             data: data
         });
     },
@@ -120,7 +124,8 @@ export default Ember.Service.extend({
             return Ember.RSVP.reject("invalid");
         }
 
-        return this.request('ajax').post(url, {
+        return this.get('ajax').request(url, {
+            method: "POST",
             data: password
         });
     }