SSL is now the only way to consume the REST API

java/org/webservice/fotolia/FotoliaApi.java

@@ -31,7 +31,7 @@
 
 public class FotoliaApi
 {
-    public static String REST_URI = "api.fotolia.com/Rest";
+    public static String REST_URI = "https://api.fotolia.com/Rest";
 
     public static String REST_VERSION = "1";
 
@@ -68,11 +68,6 @@ public class FotoliaApi
      */
     private final String _api_key;
 
-    /**
-     * HTTPs mode flag
-     */
-    private boolean _use_https;
-
     /**
      * Current session ID
      */
@@ -98,12 +93,10 @@ public FotoliaApi(final String api_key)
      * Constructor
      *
      * @param  api_key
-     * @param  use_https
      */
-    public FotoliaApi(final String api_key, final boolean use_https)
+    public FotoliaApi(final String api_key)
     {
         this._api_key = api_key;
-        this.setHttpsMode(use_https);
     }
 
     /**
@@ -116,18 +109,6 @@ public String getApiKey()
         return this._api_key;
     }
 
-    /**
-     * Sets the HTTPs mode flag
-     *
-     * @param  flag
-     * @return FotoliaApi
-     */
-    public FotoliaApi setHttpsMode(final boolean flag)
-    {
-        this._use_https = flag;
-        return this;
-    }
-
     /**
      * Fotolia API test mode
      *
@@ -1431,13 +1412,7 @@ private String _getUri(final String method_name, final FotoliaApiArgs args)
             namespace += "/";
         }
 
-        uri = "http";
-
-        if (this._use_https) {
-            uri += 's';
-        }
-
-        uri += "://" + FotoliaApi.REST_URI + "/" + FotoliaApi.REST_VERSION + "/" + namespace + method_name;
+        uri = FotoliaApi.REST_URI + "/" + FotoliaApi.REST_VERSION + "/" + namespace + method_name;
 
         if (args != null) {
             uri += "?" + args;

php/fotolia-api.php

@@ -22,7 +22,7 @@ class Fotolia_Api
     /**
      * Fotolia REST uri
      */
-    const FOTOLIA_REST_URI = 'api.fotolia.com/Rest';
+    const FOTOLIA_REST_URI = 'https://api.fotolia.com/Rest';
 
     /**
      * Fotolia REST API version
@@ -65,11 +65,6 @@ class Fotolia_Api
      */
     private $_api_key;
 
-    /**
-     * HTTPs mode flag
-     */
-    private $_use_https;
-
     /**
      * Current session id
      *
@@ -89,12 +84,11 @@ class Fotolia_Api
      *
      * @param  string $api_key
      */
-    public function __construct($api_key, $use_https = FALSE)
+    public function __construct($api_key)
     {
         $this->_api_key = $api_key;
         $this->_session_id = NULL;
         $this->_session_id_timestamp = NULL;
-        $this->_use_https = $use_https;
     }
 
     /**
@@ -107,15 +101,6 @@ public function getApiKey()
         return $this->_api_key;
     }
 
-    /**
-     * Toggle HTTPS
-     */
-    public function setHttpsMode($flag)
-    {
-        $this->_use_https = $flag;
-        return $this;
-    }
-
     /**
      * This method makes possible to search media in fotolia image bank.
      * Full search capabilities are available through the API
@@ -434,21 +419,12 @@ public function getMediaComp($id)
      */
     public function loginUser($login, $pass)
     {
-        $old_https_flag = $this->_use_https;
-        if (!$old_https_flag) {
-            $this->setHttpsMode(true);
-        }
-
         $res = $this->_api('loginUser',
                              array(
                                  'login' => $login,
                                  'pass' => $pass,
                              ));
 
-        if (!$old_https_flag) {
-            $this->setHttpsMode(false);
-        }
-
         $this->_session_id = $res['session_token'];
         $this->_session_id_timestamp = time();
     }
@@ -1042,14 +1018,12 @@ protected function _getSessionId($auto_refresh_token = TRUE)
      */
     private function _getFullURI($method, array $query = NULL)
     {
-        $scheme = $this->_use_https ? 'https' : 'http';
-
         $namespace = $this->_getNamespace($method);
         if (!empty($namespace)) {
             $namespace .= '/';
         }
 
-        $uri = $scheme . '://' . Fotolia_Api::FOTOLIA_REST_URI . '/'
+        $uri = Fotolia_Api::FOTOLIA_REST_URI . '/'
             . Fotolia_Api::FOTOLIA_REST_VERSION . '/' . $namespace . $method;
 
         if ($query !== NULL) {

python/fotolia_api/__init__.py

@@ -1,4 +1,4 @@
-REST_URI = "api.fotolia.com/Rest"
+REST_URI = "https://api.fotolia.com/Rest"
 REST_VERSION = "1"
 
 LANGUAGE_ID_FR_FR = 1

python/fotolia_api/rest.py

@@ -15,22 +15,18 @@ class Rest:
     # api key
     _api_key = None
 
-    # https toggle flag
-    _use_https = False
-
     # session ID if any
     _session_id = None
 
     # session ID timestamp if any
     _session_id_timestamp = None
 
-    def __init__(self, api_key, use_https = False):
+    def __init__(self, api_key):
         """
         Constructor
         """
 
         self._api_key = api_key
-        self._use_https = use_https
         self._session_id = None
         self._session_id_timestamp = None
 
@@ -41,13 +37,6 @@ def get_api_key(self):
 
         return self._api_key
 
-    def set_https_mode(self, flag):
-        """
-        Toggle HTTPS
-        """
-
-        self._use_https = flag
-
     def get_search_results(self, search_params, result_columns = []):
         """
         This method makes possible to search media in fotolia image bank.
@@ -722,17 +711,13 @@ def _get_full_uri(self, method, query = None):
         Generate the full URI to use for API calls
         """
 
-        scheme = 'http'
-        if self._use_https:
-            scheme += 's'
-
         namespace = self._get_namespace(method)
         if namespace != None:
             namespace += '/'
         else:
             namespace = ''
 
-        uri = scheme + '://' + fotolia_api.REST_URI + '/' + fotolia_api.REST_VERSION + '/' + namespace + method
+        uri = fotolia_api.REST_URI + '/' + fotolia_api.REST_VERSION + '/' + namespace + method
 
         if query != None:
             uri += '?' + self._recursive_urlencode(query)