Move /api to /ghost/api

closes #1249 - changed routes - changed apiRoots
TryGhost · Oct 24, 2013 · 6505986 · 6505986
1 parent 0ddd7e8
commit 6505986
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/core/client/init.js b/core/client/init.js
@@ -10,7 +10,7 @@
         Validate    : new Validator(),
 
         settings: {
-            apiRoot: '/api/v0.1'
+            apiRoot: '/ghost/api/v0.1'
         },
 
         // This is a helper object to denote legacy things in the

diff --git a/core/client/views/base.js b/core/client/views/base.js
@@ -205,7 +205,7 @@
                     headers: {
                         'X-CSRF-Token': $("meta[name='csrf-param']").attr('content')
                     },
-                    url: '/api/v0.1/notifications/' + $(self).find('.close').data('id')
+                    url: Ghost.settings.apiRoot + '/notifications/' + $(self).find('.close').data('id')
                 }).done(function (result) {
                     bbSelf.$el.slideUp(250, function () {
                         $(this).show().css({height: "auto"});
@@ -237,7 +237,7 @@
                 headers: {
                     'X-CSRF-Token': $("meta[name='csrf-param']").attr('content')
                 },
-                url: '/api/v0.1/notifications/' + $(self).data('id')
+                url: Ghost.settings.apiRoot + '/notifications/' + $(self).data('id')
             }).done(function (result) {
                 var height = bbSelf.$('.js-notification').outerHeight(true),
                     $parent = $(self).parent();

diff --git a/core/server.js b/core/server.js
@@ -283,7 +283,7 @@ when(ghost.init()).then(function () {
     server.use(express.urlencoded());
     server.use('/ghost/upload/', express.multipart());
     server.use('/ghost/upload/', express.multipart({uploadDir: __dirname + '/content/images'}));
-    server.use('/api/v0.1/db/', express.multipart());
+    server.use('/ghost/api/v0.1/db/', express.multipart());
     server.use(express.cookieParser(ghost.dbHash));
     server.use(express.cookieSession({ cookie : { maxAge: 12 * 60 * 60 * 1000 }}));
 
@@ -316,27 +316,27 @@ when(ghost.init()).then(function () {
     // ### API routes
     /* TODO: auth should be public auth not user auth */
     // #### Posts
-    server.get('/api/v0.1/posts', authAPI, disableCachedResult, api.requestHandler(api.posts.browse));
-    server.post('/api/v0.1/posts', authAPI, disableCachedResult, api.requestHandler(api.posts.add));
-    server.get('/api/v0.1/posts/:id', authAPI, disableCachedResult, api.requestHandler(api.posts.read));
-    server.put('/api/v0.1/posts/:id', authAPI, disableCachedResult, api.requestHandler(api.posts.edit));
-    server.del('/api/v0.1/posts/:id', authAPI, disableCachedResult, api.requestHandler(api.posts.destroy));
+    server.get('/ghost/api/v0.1/posts', authAPI, disableCachedResult, api.requestHandler(api.posts.browse));
+    server.post('/ghost/api/v0.1/posts', authAPI, disableCachedResult, api.requestHandler(api.posts.add));
+    server.get('/ghost/api/v0.1/posts/:id', authAPI, disableCachedResult, api.requestHandler(api.posts.read));
+    server.put('/ghost/api/v0.1/posts/:id', authAPI, disableCachedResult, api.requestHandler(api.posts.edit));
+    server.del('/ghost/api/v0.1/posts/:id', authAPI, disableCachedResult, api.requestHandler(api.posts.destroy));
     // #### Settings
-    server.get('/api/v0.1/settings/', authAPI, disableCachedResult, api.requestHandler(api.settings.browse));
-    server.get('/api/v0.1/settings/:key/', authAPI, disableCachedResult, api.requestHandler(api.settings.read));
-    server.put('/api/v0.1/settings/', authAPI, disableCachedResult, api.requestHandler(api.settings.edit));
+    server.get('/ghost/api/v0.1/settings/', authAPI, disableCachedResult, api.requestHandler(api.settings.browse));
+    server.get('/ghost/api/v0.1/settings/:key/', authAPI, disableCachedResult, api.requestHandler(api.settings.read));
+    server.put('/ghost/api/v0.1/settings/', authAPI, disableCachedResult, api.requestHandler(api.settings.edit));
     // #### Users
-    server.get('/api/v0.1/users/', authAPI, disableCachedResult, api.requestHandler(api.users.browse));
-    server.get('/api/v0.1/users/:id/', authAPI, disableCachedResult, api.requestHandler(api.users.read));
-    server.put('/api/v0.1/users/:id/', authAPI, disableCachedResult, api.requestHandler(api.users.edit));
+    server.get('/ghost/api/v0.1/users/', authAPI, disableCachedResult, api.requestHandler(api.users.browse));
+    server.get('/ghost/api/v0.1/users/:id/', authAPI, disableCachedResult, api.requestHandler(api.users.read));
+    server.put('/ghost/api/v0.1/users/:id/', authAPI, disableCachedResult, api.requestHandler(api.users.edit));
     // #### Tags
-    server.get('/api/v0.1/tags/', authAPI, disableCachedResult, api.requestHandler(api.tags.all));
+    server.get('/ghost/api/v0.1/tags/', authAPI, disableCachedResult, api.requestHandler(api.tags.all));
     // #### Notifications
-    server.del('/api/v0.1/notifications/:id', authAPI, disableCachedResult, api.requestHandler(api.notifications.destroy));
-    server.post('/api/v0.1/notifications/', authAPI, disableCachedResult, api.requestHandler(api.notifications.add));
+    server.del('/ghost/api/v0.1/notifications/:id', authAPI, disableCachedResult, api.requestHandler(api.notifications.destroy));
+    server.post('/ghost/api/v0.1/notifications/', authAPI, disableCachedResult, api.requestHandler(api.notifications.add));
     // #### Import/Export
-    server.get('/api/v0.1/db/', auth, api.db['export']);
-    server.post('/api/v0.1/db/', auth, api.db['import']);
+    server.get('/ghost/api/v0.1/db/', auth, api.db['export']);
+    server.post('/ghost/api/v0.1/db/', auth, api.db['import']);
 
     // ### Admin routes
     /* TODO: put these somewhere in admin */

diff --git a/core/server/views/debug.hbs b/core/server/views/debug.hbs
@@ -20,12 +20,12 @@
                 <fieldset>
                     <div class="form-group">
                         <label>Export</label>
-                        <a href="/api/v0.1/db/" class="button-save">Export</a>
+                        <a href="/ghost/api/v0.1/db/" class="button-save">Export</a>
                         <p>Export the blog settings and data.</p>
                     </div>
                 </fieldset>
             </form>
-            <form id="settings-import" method="post" action="/api/v0.1/db/" enctype="multipart/form-data">
+            <form id="settings-import" method="post" action="/ghost/api/v0.1/db/" enctype="multipart/form-data">
                 <input type="hidden" name="_csrf" value="{{csrfToken}}" />
                 <fieldset>
                     <div class="form-group">

diff --git a/core/test/unit/utils/api.js b/core/test/unit/utils/api.js
@@ -2,7 +2,7 @@ var _ = require('underscore'),
     when = require('when'),
     http = require('http'),
     HttpMethods,
-    ApiRouteBase = '/api/v0.1/';
+    ApiRouteBase = '/ghost/api/v0.1/';
 
 HttpMethods = {
     GET: 'GET',