Merge pull request #21 from materials-data-facility/mdfcc-dev

Support Toolbox native-login

Author: jgaff

.travis.yml

@@ -15,8 +15,7 @@ before_install:
 - openssl aes-256-cbc -K $encrypted_99dd1c7c40fb_key -iv $encrypted_99dd1c7c40fb_iv
   -in travis.tar.enc -out travis.tar -d
 - tar xvf travis.tar
-- mkdir -p ~/.mdf/credentials/
-- mv MDF_Connect_Client_tokens.json ~/.mdf/credentials/MDF_Connect_Client_tokens.json
+- mv .globus-native-apps.cfg ~/.globus-native-apps.cfg
 after_success:
 - coveralls
 notifications:

mdf_connect_client/mdfcc.py

@@ -26,7 +26,8 @@
 class MDFConnectClient:
     """The MDF Connect Client is the Python client to easily submit datasets to MDF Connect."""
     __app_name = "MDF_Connect_Client"
-    __login_services = ["connect"]
+    __client_id = "fcb9bf5a-4492-4e25-970f-510b69abc964"
+    __login_services = ["mdf_connect"]
     __allowed_authorizers = [
         globus_sdk.RefreshTokenAuthorizer,
         globus_sdk.ClientCredentialsAuthorizer,
@@ -76,9 +77,9 @@ def __init__(self, test=False, service_instance=None, authorizer=None):
         if any([isinstance(authorizer, allowed) for allowed in self.__allowed_authorizers]):
             self.__authorizer = authorizer
         else:
-            self.__authorizer = mdf_toolbox.login({"app_name": self.__app_name,
-                                                   "services": self.__login_services
-                                                   }).get("connect")
+            self.__authorizer = mdf_toolbox.login(services=self.__login_services,
+                                                  client_id=self.__client_id,
+                                                  app_name=self.__app_name).get("mdf_connect")
         if not self.__authorizer:
             raise ValueError("Unable to authenticate")
 
@@ -88,7 +89,7 @@ def logout(self):
         """
         self.reset_submission()
         self.__authorizer = None
-        mdf_toolbox.logout()
+        mdf_toolbox.logout(client_id=self.__client_id, app_name=self.__app_name)
         return "Logged out. You must create a new MDF Connect Client to log back in."
 
     # ***********************************************

setup.py

@@ -2,13 +2,13 @@
 
 setup(
     name='mdf_connect_client',
-    version='0.3.4',
+    version='0.3.5',
     packages=['mdf_connect_client'],
     description='Materials Data Facility Connect Client',
     long_description=("The MDF Connect Client is the Python client to easily submit"
                       " datasets to MDF Connect."),
     install_requires=[
-        "mdf-toolbox>=0.2.6",
+        "mdf-toolbox>=0.5.0",
         "nameparser>=1.0.4",
         "requests>=2.18.4"
     ],