Merge pull request #67 from evileye2000/parseserver_embedded

Issue #63, patch for part of unix

Author: francip

include/parse.h

@@ -50,6 +50,11 @@ extern "C"
  */
 #define CLIENT_KEY_MAX_LEN 40
 
+ /*! \def SERVER_URL_MAX_LEN
+ *  \brief The length of server url
+ */
+#define SERVER_URL_MAX_LEN 256
+
 /*! \def OBJECT_ID_MAX_LEN
  *  \brief The length of object id
  */
@@ -142,6 +147,25 @@ typedef void (*parsePushCallback)(ParseClient client, int error, const char* dat
  */
 ParseClient parseInitialize(const char *applicationId, const char *clientKey);
 
+/*! \fn ParseClient parseInitializeWithURL(const char *applicationId, const char *clientKey, const char *serverURL)
+ *  \brief Initialize the Parse client and user session with parse server URL
+ *
+ *  This method only initializes the Parse client, used for subsequent API requests with parse-server URL. It does
+ *  not start the push service, and does not create or load the installation object for the client.
+ *
+ *  \param[in]  applicationId    The application id for the Parse application. (required)
+ *  \param[in]  clientKey        The client API key for the Parse application. (required)
+ *  \param[in]  serverURL        The server URL for the Parse-server connection . (required)
+ *
+ *  \result                      The client handle to use with the SDK.
+ *
+ *  The caller retains ownership of the applicationId and clientKey buffers, and is responsible for
+ *  freeing them and reclaiming the memory after this call.
+ *  The SDK will make copies of the buffers.
+ */
+ParseClient parseInitializeWithServerURL(const char *applicationId,  const char *clientKey, const char *serverURL);
+
+
 /*! \fn void parseSetInstallationId(ParseClient client, const char *installationId)
  *  \brief Set the installation object id for this client.
  *

unix/src/parse.c

@@ -43,6 +43,7 @@
 #define PARSE_INSTALLATION_ID "installationID"
 #define PARSE_SESSION_TOKEN "sessionToken"
 #define PARSE_LAST_PUSH_TIME "lastPushTime"
+#define PARSE_DEFAULT_SERVER_URL "https://api.parse.com"
 
 typedef struct _ParseClientInternal {
     const char *applicationId;
@@ -52,6 +53,7 @@ typedef struct _ParseClientInternal {
     char *sessionToken;
     char *osVersion;
     char *lastPushTime;
+    char *serverURL;
     parsePushCallback pushCallback;
     CURL *pushCurlHandle;
     unsigned long long lastHearbeat;
@@ -118,9 +120,10 @@ static size_t curlDataCallback(void *contents, size_t size, size_t nmemb, void *
     return size * nmemb;
 }
 
-ParseClient parseInitialize(
+ParseClient parseInitializeWithServerURL(
         const char *applicationId,
-        const char *clientKey)
+        const char *clientKey,
+        const char *serverURL)
 {
     parseSetLogLevel(PARSE_LOG_WARN);
 
@@ -134,6 +137,11 @@ ParseClient parseInitialize(
     if (clientKey != NULL)
         client->clientKey = strdup(clientKey);
 
+    if (serverURL != NULL)
+        client->serverURL = strdup(serverURL);
+    else if (serverURL == NULL)
+        client->serverURL = strdup(PARSE_DEFAULT_SERVER_URL);
+
     char version[256];
     parseOsGetVersion(version, sizeof(version));
     client->osVersion = strdup(version);
@@ -159,6 +167,13 @@ ParseClient parseInitialize(
     return (ParseClient)client;
 }
 
+ParseClient parseInitialize(
+        const char *applicationId,
+        const char *clientKey)
+{
+    return parseInitializeWithServerURL(applicationId, clientKey, NULL);
+}
+
 static void setInstallationCallback(ParseClient client, int error, int httpStatus, const char* httpResponseBody)
 {
     if (error != 0) {
@@ -539,7 +554,7 @@ static void parseSendRequestInternal(
         }
     }
 
-    int urlSize = strlen("https://api.parse.com");
+    int urlSize = strlen(clientInternal->serverURL);
     urlSize += strlen(httpPath) + 1;
     char* getEncodedBody = NULL;
     if (getRequestBody) {
@@ -551,7 +566,15 @@ static void parseSendRequestInternal(
         if (callback != NULL) callback(client, ENOMEM, 0, NULL);
         return;
     }
-    strncat(fullUrl, "https://api.parse.com", urlSize);
+    
+    if(clientInternal->serverURL != NULL){
+        strncat(fullUrl, clientInternal->serverURL, urlSize);
+    }
+    else {
+        strncat(fullUrl, PARSE_DEFAULT_SERVER_URL, urlSize);
+    }
+
+    
     strncat(fullUrl, httpPath, urlSize - strlen(fullUrl));
     if (getRequestBody) {
         strncat(fullUrl, "?", urlSize - strlen(fullUrl));