From 3a8bf27ea85db7a2f982b0f571b5c5f9ac43d887 Mon Sep 17 00:00:00 2001
From: pierreburgy <pierre.burgy@gmail.com>
Date: Tue, 6 Oct 2015 12:42:12 +0200
Subject: [PATCH] Fix API name issue

---
 lib/configuration/hooks/_api/index.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/configuration/hooks/_api/index.js b/lib/configuration/hooks/_api/index.js
index 09be9c85e8..0a43a429de 100644
--- a/lib/configuration/hooks/_api/index.js
+++ b/lib/configuration/hooks/_api/index.js
@@ -30,6 +30,11 @@ module.exports = function (strapi) {
       _.forEach(strapi.api, function (definition, api) {
         async.auto({
 
+          // Expose the `name` of the API for the callback.
+          'name': function (cb) {
+            cb(null, api)
+          },
+
           // Load API controllers from `./api/*/controllers/*.js`.
           'controllers/*': function (cb) {
             dictionary.optional({
@@ -111,7 +116,7 @@ module.exports = function (strapi) {
           }
 
           // Expose the API dictionary.
-          strapi.api[api] = {
+          strapi.api[api.name] = {
             controllers: api['controllers/*'],
             models: api['models/*'],
             services: api['services/*'],
@@ -123,16 +128,16 @@ module.exports = function (strapi) {
           };
 
           // Merge API controllers with the main ones.
-          strapi.controllers = _.merge(strapi.controllers, strapi.api[api].controllers);
+          strapi.controllers = _.merge(strapi.controllers, strapi.api[api.name].controllers);
 
           // Merge API models with the main ones.
-          strapi.models = _.merge(strapi.models, strapi.api[api].models);
+          strapi.models = _.merge(strapi.models, strapi.api[api.name].models);
 
           // Merge API policies with the main ones.
-          strapi.policies = _.merge(strapi.policies, strapi.api[api].policies);
+          strapi.policies = _.merge(strapi.policies, strapi.api[api.name].policies);
 
           // Merge API routes with the main ones.
-          strapi.config.routes = _.merge(strapi.config.routes, strapi.api[api].config.routes);
+          strapi.config.routes = _.merge(strapi.config.routes, strapi.api[api.name].config.routes);
         });
       });