From 1d70ad0f837975766ac778e9af8a2feedc457093 Mon Sep 17 00:00:00 2001 From: javascriptboss99 Date: Tue, 12 May 2015 09:03:12 -0500 Subject: [PATCH] replace /rest/ with /api/v1/ in all apis --- .../dreamfactory-application.js | 6 ++--- .../adf-data/dreamfactory-data.js | 4 ++-- .../adf-home/dreamfactory-home.js | 2 +- .../adf-launchpad/dreamfactory-launchpad.js | 4 ++-- .../dreamfactory-package-manager.js | 6 ++--- .../adf-profile/dreamfactory-profile.js | 6 ++--- .../adf-schema/dreamfactory-schema.js | 22 +++++++++---------- .../adf-scripts/dreamfactory-scripts.js | 10 ++++----- .../adf-scripts/examples/example.scripts.js | 8 +++---- .../adf-services/dreamfactory-services.js | 4 ++-- .../dreamfactory-system-config.js | 2 +- .../adf-table/dreamfactory-table.js | 4 ++-- .../dreamfactory-user-management.js | 22 +++++++++---------- .../adf-users/dreamfactory-users.js | 6 ++--- .../adf-utility/dreamfactory-utility.js | 12 +++++----- 15 files changed, 59 insertions(+), 59 deletions(-) diff --git a/app/admin_components/adf-application/dreamfactory-application.js b/app/admin_components/adf-application/dreamfactory-application.js index 942ee4b..bf82fc0 100644 --- a/app/admin_components/adf-application/dreamfactory-application.js +++ b/app/admin_components/adf-application/dreamfactory-application.js @@ -829,7 +829,7 @@ angular.module('dfApplication', ['dfUtility', 'dfUserManagement', 'ngResource']) getSystemApisFromServer: function (api) { return $http({ - url: DSP_URL + '/rest/system/' + api.api_name, + url: DSP_URL + '/api/v1//system/' + api.api_name, method: 'GET', params: api.params }); @@ -842,7 +842,7 @@ angular.module('dfApplication', ['dfUtility', 'dfUserManagement', 'ngResource']) delete: function() { return $http({ - url: DSP_URL + '/rest/system/' + api, + url: DSP_URL + '/api/v1/system/' + api, method: 'DELETE', data: options.data }) @@ -861,7 +861,7 @@ angular.module('dfApplication', ['dfUtility', 'dfUserManagement', 'ngResource']) options = dfObjectService.mergeObjects(options, defaults); // Return a resource for our service so we can just call the operation we want. - return $resource(DSP_URL + '/rest/system/:api/:id', {api: '@api', id: '@id'}, { + return $resource(DSP_URL + '/api/v1/system/:api/:id', {api: '@api', id: '@id'}, { get: { method: 'GET', diff --git a/app/admin_components/adf-data/dreamfactory-data.js b/app/admin_components/adf-data/dreamfactory-data.js index 1be3a5c..7970014 100644 --- a/app/admin_components/adf-data/dreamfactory-data.js +++ b/app/admin_components/adf-data/dreamfactory-data.js @@ -105,7 +105,7 @@ angular.module('dfData', ['ngRoute', 'dfUtility', 'dfTable']) $scope.options = { service: $scope.selected.service, table: $scope.selected.resource, - url: DSP_URL + '/rest/' + $scope.selected.service + '/' + $scope.selected.resource, + url: DSP_URL + '/api/v1/' + $scope.selected.service + '/' + $scope.selected.resource, allowChildTable: true, childTableAttachPoint: '#child-table-attach' }; @@ -115,7 +115,7 @@ angular.module('dfData', ['ngRoute', 'dfUtility', 'dfTable']) var options = { service: newValue.service, table: newValue.resource, - url: DSP_URL + '/rest/' + newValue.service + '/' + newValue.resource, + url: DSP_URL + '/api/v1/' + newValue.service + '/' + newValue.resource, allowChildTable: true, childTableAttachPoint: '#child-table-attach' }; diff --git a/app/admin_components/adf-home/dreamfactory-home.js b/app/admin_components/adf-home/dreamfactory-home.js index fce9ca4..d8de308 100644 --- a/app/admin_components/adf-home/dreamfactory-home.js +++ b/app/admin_components/adf-home/dreamfactory-home.js @@ -191,7 +191,7 @@ angular.module('dfHome', ['ngRoute', 'dfUtility', 'dfApplication', 'dfHelp']) scope.downloadSDK = function() { - window.top.location = location.protocol + '//' + location.host + '/rest/system/app/' + scope.app.record.id + '?sdk=true&app_name=admin'; + window.top.location = location.protocol + '//' + location.host + '/api/v1/system/app/' + scope.app.record.id + '?sdk=true&app_name=admin'; }; diff --git a/app/admin_components/adf-launchpad/dreamfactory-launchpad.js b/app/admin_components/adf-launchpad/dreamfactory-launchpad.js index d0f63f8..99d19eb 100644 --- a/app/admin_components/adf-launchpad/dreamfactory-launchpad.js +++ b/app/admin_components/adf-launchpad/dreamfactory-launchpad.js @@ -21,7 +21,7 @@ angular.module('dfLaunchPad', ['ngRoute', 'dfUtility', 'dfTable']) if (SystemConfigDataService.getSystemConfig().allow_guest_user && !UserDataService.getCurrentUser()) { // We make a call to user session to get guest user apps - $http.get(DSP_URL + '/rest/user/session').then( + $http.get(DSP_URL + '/api/v1/user/session').then( function (result) { // we set the current user to the guest user @@ -61,7 +61,7 @@ angular.module('dfLaunchPad', ['ngRoute', 'dfUtility', 'dfTable']) if (UserDataService.getCurrentUser()) { // We make a call to user session to get user apps - $http.get(DSP_URL + '/rest/user/session').then( + $http.get(DSP_URL + '/api/v1/user/session').then( function (result) { // we set the current user diff --git a/app/admin_components/adf-package-manager/dreamfactory-package-manager.js b/app/admin_components/adf-package-manager/dreamfactory-package-manager.js index 33badd6..a23ebd3 100644 --- a/app/admin_components/adf-package-manager/dreamfactory-package-manager.js +++ b/app/admin_components/adf-package-manager/dreamfactory-package-manager.js @@ -112,7 +112,7 @@ angular.module('dfPackageManager', ['ngRoute', 'dfUtility']) $http({ method: 'GET', - url: DSP_URL + '/rest/system/app/' + newValue.id, + url: DSP_URL + '/api/v1/system/app/' + newValue.id, params: { fields: '*', related: 'app_service_relations' @@ -433,7 +433,7 @@ angular.module('dfPackageManager', ['ngRoute', 'dfUtility']) return $http({ method: "PUT", - url: DSP_URL + '/rest/system/app/' + scope.selectedApp.id, + url: DSP_URL + '/api/v1/system/app/' + scope.selectedApp.id, params: requestDataObj.params, data: requestDataObj.data }) @@ -473,7 +473,7 @@ angular.module('dfPackageManager', ['ngRoute', 'dfUtility']) scope._updateAppsToService(requestDataObj).then( function(result) { - var exportUrl = DSP_URL + '/rest/system/app/' + scope.selectedApp.id + '?app_name=admin&pkg=true'; + var exportUrl = DSP_URL + '/api/v1/system/app/' + scope.selectedApp.id + '?app_name=admin&pkg=true'; if (scope.includeAppFiles) { diff --git a/app/admin_components/adf-profile/dreamfactory-profile.js b/app/admin_components/adf-profile/dreamfactory-profile.js index 45197a1..7e2eb59 100644 --- a/app/admin_components/adf-profile/dreamfactory-profile.js +++ b/app/admin_components/adf-profile/dreamfactory-profile.js @@ -137,7 +137,7 @@ angular.module('dfProfile', ['ngRoute', 'dfUtility', 'dfUserManagement', 'dfAppl return $http({ method: 'GET', - url: DSP_URL + '/rest/user/profile' + url: DSP_URL + '/api/v1/user/profile' }) }; @@ -145,7 +145,7 @@ angular.module('dfProfile', ['ngRoute', 'dfUtility', 'dfUserManagement', 'dfAppl return $http({ method: 'POST', - url: DSP_URL + '/rest/user/profile', + url: DSP_URL + '/api/v1/user/profile', data: requestDataObj.data }) }; @@ -159,7 +159,7 @@ angular.module('dfProfile', ['ngRoute', 'dfUtility', 'dfUserManagement', 'dfAppl return $http({ method: 'POST', - url: DSP_URL + '/rest/user/password', + url: DSP_URL + '/api/v1/user/password', params: requestDataObj.params, data: requestDataObj.data }) diff --git a/app/admin_components/adf-schema/dreamfactory-schema.js b/app/admin_components/adf-schema/dreamfactory-schema.js index 8616cd1..b015c3f 100644 --- a/app/admin_components/adf-schema/dreamfactory-schema.js +++ b/app/admin_components/adf-schema/dreamfactory-schema.js @@ -265,7 +265,7 @@ angular.module('dfSchema', ['ngRoute', 'dfUtility']) return $http({ method: 'GET', - url: DSP_URL + '/rest/'+ $scope.currentService.api_name + '/' + requestDataObj.componentPath, + url: DSP_URL + '/api/v1/'+ $scope.currentService.api_name + '/' + requestDataObj.componentPath, params: { refresh: true } @@ -277,7 +277,7 @@ angular.module('dfSchema', ['ngRoute', 'dfUtility']) return $http({ method: 'DELETE', - url: DSP_URL + '/rest/' + $scope.currentService.api_name + '/' + requestDataObj.tablePath + url: DSP_URL + '/api/v1/' + $scope.currentService.api_name + '/' + requestDataObj.tablePath }) }; @@ -285,14 +285,14 @@ angular.module('dfSchema', ['ngRoute', 'dfUtility']) return $http({ method: 'POST', - url: DSP_URL + '/rest/' + $scope.currentService.api_name + '/_schema', + url: DSP_URL + '/api/v1/' + $scope.currentService.api_name + '/_schema', data: requestDataObj.data }) }; $scope._refreshServiceFromServer = function () { - return $http.get(DSP_URL + '/rest/' + $scope.currentService.api_name + '/_schema', {params: {refresh: true, fields: 'name'}}); + return $http.get(DSP_URL + '/api/v1/' + $scope.currentService.api_name + '/_schema', {params: {refresh: true, fields: 'name'}}); }; @@ -690,7 +690,7 @@ angular.module('dfSchema', ['ngRoute', 'dfUtility']) return $http({ method: 'POST', - url: DSP_URL + '/rest/' + requestDataObj.path, + url: DSP_URL + '/api/v1/' + requestDataObj.path, data: requestDataObj.data }) }; @@ -699,7 +699,7 @@ angular.module('dfSchema', ['ngRoute', 'dfUtility']) return $http({ method: 'PUT', - url: DSP_URL + '/rest/' + requestDataObj.path, + url: DSP_URL + '/api/v1/' + requestDataObj.path, data: requestDataObj.data }) }; @@ -708,7 +708,7 @@ angular.module('dfSchema', ['ngRoute', 'dfUtility']) return $http({ method: 'DELETE', - url: DSP_URL + '/rest/' + requestDataObj.path + url: DSP_URL + '/api/v1/' + requestDataObj.path }) } @@ -1107,7 +1107,7 @@ angular.module('dfSchema', ['ngRoute', 'dfUtility']) // PRIVATE API scope._loadReferenceTables = function () { - $http.get(DSP_URL + '/rest/' + scope.fieldData.currentService.api_name + '/_schema/').then( + $http.get(DSP_URL + '/api/v1/' + scope.fieldData.currentService.api_name + '/_schema/').then( function (result) { scope.field.record.ref_tables = result.data.resource; @@ -1138,7 +1138,7 @@ angular.module('dfSchema', ['ngRoute', 'dfUtility']) return; } - $http.get(DSP_URL + '/rest/' + scope.fieldData.currentService.api_name + '/_schema/' + scope.field.record.ref_table).then( + $http.get(DSP_URL + '/api/v1/' + scope.fieldData.currentService.api_name + '/_schema/' + scope.field.record.ref_table).then( function (result) { scope.refFields = result.data.field; @@ -1169,7 +1169,7 @@ angular.module('dfSchema', ['ngRoute', 'dfUtility']) delete recordObj.ref_tables; return $http({ - url: DSP_URL + '/rest/' + scope.fieldData.currentService.api_name + '/_schema/' + scope.currentTable + '/' + recordObj.name, + url: DSP_URL + '/api/v1/' + scope.fieldData.currentService.api_name + '/_schema/' + scope.currentTable + '/' + recordObj.name, method: 'PATCH', data: recordObj }) @@ -1237,7 +1237,7 @@ angular.module('dfSchema', ['ngRoute', 'dfUtility']) } - $http.get(DSP_URL + '/rest/' + scope.fieldData.currentService.api_name + '/_schema/' + scope.field.record.ref_table).then( + $http.get(DSP_URL + '/api/v1/' + scope.fieldData.currentService.api_name + '/_schema/' + scope.field.record.ref_table).then( function (result) { scope.refFields = result.data.field diff --git a/app/admin_components/adf-scripts/dreamfactory-scripts.js b/app/admin_components/adf-scripts/dreamfactory-scripts.js index b7f508c..abb2caa 100644 --- a/app/admin_components/adf-scripts/dreamfactory-scripts.js +++ b/app/admin_components/adf-scripts/dreamfactory-scripts.js @@ -209,7 +209,7 @@ angular.module('dfScripts', ['ngRoute', 'dfUtility']) // PRIVATE API // Dynamically create event names on the client because no one thought it - // would be a good idea to build that list on the server and send it on a GET /rest/script + // would be a good idea to build that list on the server and send it on a GET /api/v1/script $scope._createEvents = function(event, associatedData) { // returns an empty Path Object @@ -444,7 +444,7 @@ angular.module('dfScripts', ['ngRoute', 'dfUtility']) return $http({ method: 'GET', - url: DSP_URL + '/rest/' + requestDataObj.eventName, + url: DSP_URL + '/api/v1/' + requestDataObj.eventName, params: requestDataObj.params }) @@ -455,7 +455,7 @@ angular.module('dfScripts', ['ngRoute', 'dfUtility']) return $http({ method: 'GET', - url: DSP_URL + '/rest/system/script/' + requestDataObj.script_id, + url: DSP_URL + '/api/v1/system/script/' + requestDataObj.script_id, params: requestDataObj.params }) }; @@ -465,7 +465,7 @@ angular.module('dfScripts', ['ngRoute', 'dfUtility']) return $http({ method: 'PUT', - url: DSP_URL + '/rest/system/script/' + requestDataObj.script_id, + url: DSP_URL + '/api/v1/system/script/' + requestDataObj.script_id, headers: { 'Content-Type': 'text/plain' }, @@ -479,7 +479,7 @@ angular.module('dfScripts', ['ngRoute', 'dfUtility']) return $http({ method: 'DELETE', - url: DSP_URL + '/rest/system/script/' + requestDataObj.script_id, + url: DSP_URL + '/api/v1/system/script/' + requestDataObj.script_id, params: requestDataObj.params }) }; diff --git a/app/admin_components/adf-scripts/examples/example.scripts.js b/app/admin_components/adf-scripts/examples/example.scripts.js index 85db962..2ea42e3 100644 --- a/app/admin_components/adf-scripts/examples/example.scripts.js +++ b/app/admin_components/adf-scripts/examples/example.scripts.js @@ -3,7 +3,7 @@ //****************** Working with System Events ****************** // system.users.list.js -// A script to be run when the event 'system.users.list' is triggered by a GET on /rest/system/user +// A script to be run when the event 'system.users.list' is triggered by a GET on /api/v1/system/user var ENABLE_ADD_PROPERTY = true; @@ -18,7 +18,7 @@ if (event.request.body.record) { } // system.apps.create.js -// A script to be run when the event 'system.apps.create' is triggered by a POST to /rest/system/app +// A script to be run when the event 'system.apps.create' is triggered by a POST to /api/v1/system/app // Inspect the inbound request if (event.request.body.record) { @@ -31,7 +31,7 @@ if (event.request.body.record) { //****************** Local Database Events ****************** // db.todo.select.js -// A script to be run when the event 'db.todo.select' is triggered by a GET to /rest/db/todo +// A script to be run when the event 'db.todo.select' is triggered by a GET to /api/v1/db/todo // Rename all outbound to-do items to be the same string if (event.request.body.record) { @@ -41,7 +41,7 @@ if (event.request.body.record) { } // db.todo.insert.js -// A script to be run when the event 'db.todo.select' is triggered by a POST to /rest/db/todo +// A script to be run when the event 'db.todo.select' is triggered by a POST to /api/v1/db/todo if (event.request.body.record) { // Loop through the record array and add a complete indicator diff --git a/app/admin_components/adf-services/dreamfactory-services.js b/app/admin_components/adf-services/dreamfactory-services.js index cbe10a1..f4c5f4f 100644 --- a/app/admin_components/adf-services/dreamfactory-services.js +++ b/app/admin_components/adf-services/dreamfactory-services.js @@ -1244,7 +1244,7 @@ angular.module('dfServices', ['ngRoute', 'dfUtility', 'dfServiceTemplates', 'dfS }, apiName: { title: 'Api Name ', - text: 'Select a name for making API requests, such as \'db\' in /rest/db.' + text: 'Select a name for making API requests, such as \'db\' in /api/v1/db.' }, name: { title: 'Name ', @@ -1257,7 +1257,7 @@ angular.module('dfServices', ['ngRoute', 'dfUtility', 'dfServiceTemplates', 'dfS baseUrl: { title: 'Base Url ', text: 'Specify the base URL for the remote web service. For example, if you named the API \'mydb\'' + - ' and the base URL is http://api.myservice.com/v1/api/, then a REST call to /rest/mydb/mytable' + + ' and the base URL is http://api.myservice.com/v1/api/, then a REST call to /api/v1/mydb/mytable' + ' would tell DreamFactory to call http://api.myservice.com/v1/api/mydb/mytable.' }, userName: { diff --git a/app/admin_components/adf-system-config/dreamfactory-system-config.js b/app/admin_components/adf-system-config/dreamfactory-system-config.js index 2b7d56f..77d9da1 100644 --- a/app/admin_components/adf-system-config/dreamfactory-system-config.js +++ b/app/admin_components/adf-system-config/dreamfactory-system-config.js @@ -1171,7 +1171,7 @@ angular.module('dfSystemConfig', ['ngRoute', 'dfUtility', 'dfApplication']) xhr = new ActiveXObject("Microsoft.XMLHTTP"); } - xhr.open("GET", DSP_URL + '/rest/system/config', false); + xhr.open("GET", DSP_URL + '/api/v1/system/config', false); xhr.setRequestHeader("X-DreamFactory-Application-Name", "admin"); xhr.setRequestHeader("Content-Type", "application/json"); diff --git a/app/admin_components/adf-table/dreamfactory-table.js b/app/admin_components/adf-table/dreamfactory-table.js index 13ce877..1408639 100644 --- a/app/admin_components/adf-table/dreamfactory-table.js +++ b/app/admin_components/adf-table/dreamfactory-table.js @@ -2954,7 +2954,7 @@ angular.module('dfTable', ['dfUtility']) scope._buildURL = function (serviceNameStr, tableNameStr) { - return DSP_URL + '/rest/' + serviceNameStr + '/' + tableNameStr + return DSP_URL + '/api/v1/' + serviceNameStr + '/' + tableNameStr }; scope.relatedOptions = { @@ -3164,7 +3164,7 @@ angular.module('dfTable', ['dfUtility']) var options = { service: scope._setSystemService(newValue.ref_table), table: newValue.ref_table, - url: DSP_URL + '/rest/' + scope._setSystemService(newValue.ref_table) + '/' + scope._parseSystemTableName(newValue.ref_table), + url: DSP_URL + '/api/v1/' + scope._setSystemService(newValue.ref_table) + '/' + scope._parseSystemTableName(newValue.ref_table), params: { filter: newValue.ref_field + ' = ' + scope.childTableParentRecord[newValue.field] } diff --git a/app/admin_components/adf-user-management/dreamfactory-user-management.js b/app/admin_components/adf-user-management/dreamfactory-user-management.js index 3cbce69..b755c29 100644 --- a/app/admin_components/adf-user-management/dreamfactory-user-management.js +++ b/app/admin_components/adf-user-management/dreamfactory-user-management.js @@ -173,7 +173,7 @@ angular.module('dfUserManagement', ['ngRoute', 'ngCookies', 'dfUtility']) scope._loginRequest = function (credsDataObj) { // Return the posted request data as a promise - return $http.post(DSP_URL + '/rest/user/session', credsDataObj); + return $http.post(DSP_URL + '/api/v1/user/session', credsDataObj); }; @@ -387,13 +387,13 @@ angular.module('dfUserManagement', ['ngRoute', 'ngCookies', 'dfUtility']) scope._resetPasswordRequest = function (requestDataObj) { // Post request for password change and return promise - return $http.post(DSP_URL + '/rest/user/password?reset=true', requestDataObj); + return $http.post(DSP_URL + '/api/v1/user/password?reset=true', requestDataObj); }; scope._resetPasswordSQ = function (requestDataObj) { // Post request for password change and return promise - return $http.post(DSP_URL + '/rest/user/password?login=false', requestDataObj); + return $http.post(DSP_URL + '/api/v1/user/password?login=false', requestDataObj); }; // Test if our entered passwords are identical @@ -599,7 +599,7 @@ angular.module('dfUserManagement', ['ngRoute', 'ngCookies', 'dfUtility']) scope._setPasswordRequest = function (requestDataObj) { return $http({ - url: DSP_URL + '/rest/user/password', + url: DSP_URL + '/api/v1/user/password', method: 'POST', params: { login: scope.options.login @@ -706,7 +706,7 @@ angular.module('dfUserManagement', ['ngRoute', 'ngCookies', 'dfUtility']) scope._logoutRequest = function () { // return a promise object from the rest call - return $http.delete(DSP_URL + '/rest/user/session'); + return $http.delete(DSP_URL + '/api/v1/user/session'); }; // COMPLEX IMPLEMENTATION ** See login directive for more info ** @@ -832,7 +832,7 @@ angular.module('dfUserManagement', ['ngRoute', 'ngCookies', 'dfUtility']) scope._registerRequest = function (registerDataObj) { return $http({ - url: DSP_URL + '/rest/user/register', + url: DSP_URL + '/api/v1/user/register', method: 'POST', params: { login: scope.options.login @@ -844,7 +844,7 @@ angular.module('dfUserManagement', ['ngRoute', 'ngCookies', 'dfUtility']) // Returns the system configuration object scope._getSystemConfig = function () { - return $http.get(DSP_URL + '/rest/system/config'); + return $http.get(DSP_URL + '/api/v1/system/config'); }; @@ -1175,7 +1175,7 @@ angular.module('dfUserManagement', ['ngRoute', 'ngCookies', 'dfUtility']) scope._confirmUserToServer = function (requestDataObj) { return $http({ - url: DSP_URL + '/rest/user/register', + url: DSP_URL + '/api/v1/user/register', method: 'POST', params: { login: false @@ -1392,7 +1392,7 @@ angular.module('dfUserManagement', ['ngRoute', 'ngCookies', 'dfUtility']) function _saveUserSetting(userSettings) { return $http({ - url: DSP_URL + '/rest/user/custom', + url: DSP_URL + '/api/v1/user/custom', method: 'POST', data: userSettings }) @@ -1414,7 +1414,7 @@ angular.module('dfUserManagement', ['ngRoute', 'ngCookies', 'dfUtility']) return $http({ - url: DSP_URL + '/rest/user/custom/' + setting, + url: DSP_URL + '/api/v1/user/custom/' + setting, method: 'GET' }) } @@ -1638,7 +1638,7 @@ angular.module('dfUserManagement', ['ngRoute', 'ngCookies', 'dfUtility']) // Do XHR - xhr.open(_method, DSP_URL + '/rest/' + _url + params, _async); + xhr.open(_method, DSP_URL + '/api/v1/' + _url + params, _async); // Set headers _setHeaders(xhr, _headers); diff --git a/app/admin_components/adf-users/dreamfactory-users.js b/app/admin_components/adf-users/dreamfactory-users.js index 0f8f2d1..0670f66 100644 --- a/app/admin_components/adf-users/dreamfactory-users.js +++ b/app/admin_components/adf-users/dreamfactory-users.js @@ -418,7 +418,7 @@ angular.module('dfUsers', ['ngRoute', 'dfUtility', 'dfApplication', 'dfHelp']) scope._sendInvite = function (userId) { return $http({ - url: DSP_URL + '/rest/system/user', + url: DSP_URL + '/api/v1/system/user', method: 'PATCH', params: { send_invite: true @@ -1023,7 +1023,7 @@ angular.module('dfUsers', ['ngRoute', 'dfUtility', 'dfApplication', 'dfHelp']) return $http({ method: 'POST', - url: DSP_URL + '/rest/system/user', + url: DSP_URL + '/api/v1/system/user', headers: { "Content-Type" : scope.importType === 'csv' ? 'text/csv' : 'application/' + scope.importType }, @@ -1176,7 +1176,7 @@ angular.module('dfUsers', ['ngRoute', 'dfUtility', 'dfApplication', 'dfHelp']) // Jason's method to make it work. He doesn't check for bad response. // I'll look into angularJS's $location to fix this. - $window.location.href= DSP_URL + '/rest/system/user?' + params; + $window.location.href= DSP_URL + '/api/v1/system/user?' + params; } } } diff --git a/app/admin_components/adf-utility/dreamfactory-utility.js b/app/admin_components/adf-utility/dreamfactory-utility.js index ed9f5eb..4f8d3b9 100644 --- a/app/admin_components/adf-utility/dreamfactory-utility.js +++ b/app/admin_components/adf-utility/dreamfactory-utility.js @@ -893,7 +893,7 @@ angular.module('dfUtility', ['dfApplication']) scope._getResources = function () { return $http( { - method: 'GET', url: DSP_URL + '/rest/' + scope.activeService + method: 'GET', url: DSP_URL + '/api/v1/' + scope.activeService } ) }; @@ -978,7 +978,7 @@ angular.module('dfUtility', ['dfApplication']) return $http({ method: 'GET', - url: DSP_URL + '/rest' + requestDataObj.serviceName + '/' + requestDataObj.fileName, + url: DSP_URL + '/api/v1' + requestDataObj.serviceName + '/' + requestDataObj.fileName, cache: false, params: requestDataObj.params }) @@ -988,7 +988,7 @@ angular.module('dfUtility', ['dfApplication']) return $http({ method: 'PUT', - url: DSP_URL + '/rest' + requestDataObj.serviceName + '/' + requestDataObj.fileName, + url: DSP_URL + '/api/v1' + requestDataObj.serviceName + '/' + requestDataObj.fileName, headers: { 'Content-Type': 'text/plain' }, @@ -1003,7 +1003,7 @@ angular.module('dfUtility', ['dfApplication']) return $http({ method: 'DELETE', - url: DSP_URL + '/rest' + requestDataObj.serviceName + '/' + requestDataObj.fileName, + url: DSP_URL + '/api/v1' + requestDataObj.serviceName + '/' + requestDataObj.fileName, params: { script_id:requestDataObj.scriptId } @@ -2489,7 +2489,7 @@ angular.module('dfUtility', ['dfApplication']) xhr = new ActiveXObject("Microsoft.XMLHTTP"); } - xhr.open("GET", DSP_URL + '/rest/system/config', false); + xhr.open("GET", DSP_URL + '/api/v1/system/config', false); xhr.setRequestHeader("X-DreamFactory-Application-Name", "admin"); xhr.setRequestHeader("Content-Type", "application/json"); @@ -2632,7 +2632,7 @@ angular.module('dfUtility', ['dfApplication']) // Do XHR - xhr.open(_method, DSP_URL + '/rest/' + _url + params, _async); + xhr.open(_method, DSP_URL + '/api/v1/' + _url + params, _async); // Set headers _setHeaders(xhr, _headers);