Merge branch 'master' into master

La0 · Apr 6, 2018 · 1d8338f · 1d8338f
2 parents b08832e + 2bdd407
commit 1d8338f
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/garmin_uploader/api.py b/garmin_uploader/api.py
@@ -5,8 +5,7 @@
 URL_HOSTNAME = 'https://connect.garmin.com/modern/auth/hostname'
 URL_LOGIN = 'https://sso.garmin.com/sso/login'
 URL_POST_LOGIN = 'https://connect.garmin.com/modern/'
-URL_CHECK_LOGIN = 'https://connect.garmin.com/user/username'
-URL_SESSION = 'https://connect.garmin.com/legacy/session'
+URL_PROFILE = 'https://connect.garmin.com/modern/proxy/userprofile-service/socialProfile/'  # noqa
 URL_HOST_SSO = 'sso.garmin.com'
 URL_HOST_CONNECT = 'connect.garmin.com'
 URL_UPLOAD = 'https://connect.garmin.com/modern/proxy/upload-service/upload'
@@ -124,19 +123,18 @@ def authenticate(self, username, password):
         if res.status_code != 200 and not res.history:
             raise Exception('Second auth step failed.')
 
-        # Get Jsessionid
-        res = session.get(URL_SESSION)
-        res.raise_for_status()
+        # Check session cookie
+        if 'SESSIONID' not in session.cookies:
+            raise Exception('Missing session auth cookie')
         if 'JSESSIONID' not in session.cookies:
             raise Exception('Missing jsession auth cookie')
 
         # Check login
-        res = session.get(URL_CHECK_LOGIN)
-        garmin_user = res.json()
-        username = garmin_user.get('username')
-        if not res.ok or not username:
+        res = session.get(URL_PROFILE)
+        if not res.ok:
             raise Exception("Login check failed.")
-        logger.info('Logged in as {}'.format(username))
+        garmin_user = res.json()
+        logger.info('Logged in as {}'.format(garmin_user['fullName']))
 
         return session