Skip to content

Commit

Permalink
Merge pull request pettazz#41 from gkuenning/remove-galx
Browse files Browse the repository at this point in the history
Fix login to do without GALX
  • Loading branch information
pettazz authored Jun 21, 2017
2 parents 9e1761e + e3bf270 commit 612669a
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions googlevoice/voice.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,21 +72,19 @@ def login(self, email=None, passwd=None, smsKey=None):

content = self.__do_page('login').read()
# holy hackjob
galx = re.search(r"type=\"hidden\"\s+name=\"GALX\"\s+value=\"(.+)\"", content).group(1)
gxf = re.search(r"type=\"hidden\"\s+name=\"gxf\"\s+value=\"(.+)\"", content).group(1)
result = self.__do_page('login_post', {'Email': email, 'Passwd': passwd, 'GALX': galx, 'gxf': gxf})
result = self.__do_page('login_post', {'Email': email, 'Passwd': passwd, 'gxf': gxf})

if result.geturl().startswith(getattr(settings, "SMSAUTH")):
content = self.__smsAuth(smsKey)

try:
smsToken = re.search(r"name=\"smsToken\"\s+value=\"([^\"]+)\"", content).group(1)
galx = re.search(r"name=\"GALX\"\s+value=\"([^\"]+)\"", content).group(1)
content = self.__do_page('login', {'smsToken': smsToken, 'service': "grandcentral", 'GALX': galx})
content = self.__do_page('login', {'smsToken': smsToken, 'service': "grandcentral"})
except AttributeError:
raise LoginError

del smsKey, smsToken, galx, gxf
del smsKey, smsToken, gxf

del email, passwd

Expand Down

0 comments on commit 612669a

Please sign in to comment.