Merge pull request #14 from ParsePlatform/api-console-always

Enable API Console for all apps as it relies on no optional features

Author: drew-gross

README.md

@@ -37,13 +37,13 @@ You can also manage your apps that are hosted on Parse.com from the same dashboa
       "appId": "myAppId",
       "masterKey": "myMasterKey",
       "javascriptKey": "myJavascriptKey",
-      "appName": "My App"
+      "appName": "My Parse.Com App"
     },
     {
       "serverURL": "http://localhost:1337/parse",
       "appId": "myAppId",
       "masterKey": "myMasterKey",
-      "appName": "My Parse.Com App"
+      "appName": "My Parse Server App"
     }
   ]
 }

dashboard/Dashboard.js

@@ -101,7 +101,6 @@ class Dashboard extends React.Component {
             jobs: false, //jobs still goes through rails
             logs: true,
             config: true,
-            apiConsole: false, //api console needs to be modified to use server url of the app
             //Other features would be much harder to add, although push console should just need the hiding
             //of scheduled push related stuff
             pushConsole: false,

dashboard/DashboardView.react.js

@@ -70,12 +70,10 @@ export default class DashboardView extends React.Component {
       });
     }
 
-    if (this.context.currentApp.enabledFeatures.apiConsole) {
-      coreSubsections.push({
-        name: 'API Console',
-        link: '/api_console'
-      });
-    }
+    coreSubsections.push({
+      name: 'API Console',
+      link: '/api_console'
+    });
 
     if (this.context.currentApp.migration) {
       coreSubsections.push({

dashboard/Data/ApiConsole/request.js

@@ -10,15 +10,17 @@ import Parse from 'parse';
 export default function request(app, method, path, body, options) {
   let xhr = new XMLHttpRequest();
   let promise = new Parse.Promise();
-  if (path[0] === '/') {
+  if (path.startsWith('/') && app.serverURL.endsWith('/')) {
     path = path.substr(1);
   }
-  let url = location.protocol + '//' + location.host + '/1/' + path;
-  xhr.open(method, url, true);
+  if (!path.startsWith('/') && !app.serverURL.endsWith('/')) {
+    path = '/' + path;
+  }
+  xhr.open(method, app.serverURL + path, true);
   xhr.setRequestHeader('X-Parse-Application-Id', app.applicationId);
   if (options.useMasterKey) {
     xhr.setRequestHeader('X-Parse-Master-Key', app.masterKey);
-  } else {
+  } else if (app.restKey) {
     xhr.setRequestHeader('X-Parse-REST-API-Key', app.restKey);
   }
   if (options.sessionToken) {

lib/ParseApp.js

@@ -23,48 +23,37 @@ function setEnablePushSource(setting, enable) {
 
 export default class ParseApp {
   constructor({
-    name,
     appName,
     created_at,
-    key,
-    applicationId,
+    clientKey,
     appId,
-    friendly_id,
     appNameForURL,
     dashboardURL,
-    secret,
-    clientKey,
-    javascript_key,
     javascriptKey,
-    push_key,
     masterKey,
-    rest_api_key,
     restKey,
-    windows_key,
     windowsKey,
-    webhook_key,
     webhookKey,
-    api_key,
     apiKey,
     serverURL,
     enabledFeatures,
     ...params,
   }) {
-    this.name = name || appName;
+    this.name = appName;
     this.createdAt = created_at ? new Date(created_at) : new Date();
-    this.applicationId = appId || key || applicationId;
-    this.slug = friendly_id || appNameForURL || appName;
+    this.applicationId = appId;
+    this.slug = appNameForURL || appName;
     if (!this.slug && dashboardURL) {
       let pieces = dashboardURL.split('/');
       this.slug = pieces[pieces.length - 1];
     }
-    this.clientKey = secret || clientKey;
-    this.javascriptKey = javascript_key || javascriptKey;
-    this.masterKey = push_key || masterKey;
-    this.restKey = rest_api_key || restKey;
-    this.windowsKey = windows_key || windowsKey;
-    this.webhookKey = webhook_key || webhookKey;
-    this.fileKey = api_key || apiKey;
+    this.clientKey = clientKey;
+    this.javascriptKey = javascriptKey;
+    this.masterKey = masterKey;
+    this.restKey = restKey;
+    this.windowsKey = windowsKey;
+    this.webhookKey = webhookKey;
+    this.fileKey =  apiKey;
     this.production = !!params['is_production?'];
     this.serverURL = serverURL;
     this.enabledFeatures = enabledFeatures;