Skip to content

cloudscraper, update csrf_regexp, auth dict #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
UnusualPi wants to merge 1 commit into from
Closed

cloudscraper, update csrf_regexp, auth dict #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions personalcapital/personalcapital.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import cloudscraper
import requests
import re

csrf_regexp = re.compile(r"globals.csrf='([a-f0-9-]+)'")
csrf_regexp = re.compile(r"window.csrf ='([a-f0-9-]+)'")
base_url = 'https://home.personalcapital.com'
api_endpoint = base_url + '/api'

Expand Down Expand Up @@ -38,7 +39,7 @@ class LoginFailedException(Exception):

class PersonalCapital(object):
def __init__(self):
self.__session = requests.Session()
self.__session = cloudscraper.create_scraper()
self.__csrf = ""

def login(self, username, password):
Expand All @@ -49,14 +50,14 @@ def login(self, username, password):
self.__csrf = csrf
if auth_level != AuthLevelEnum.USER_REMEMBERED:
raise RequireTwoFactorException()
result = self.__authenticate_password(password).json()
result = self.__authenticate_password(username, password).json()
if getSpHeaderValue(result, SUCCESS_KEY) == False:
raise LoginFailedException(getErrorValue(result))
else:
raise LoginFailedException()

def authenticate_password(self, password):
return self.__authenticate_password(password)
def authenticate_password(self, username, password):
self.__authenticate_password(username, password)

def two_factor_authenticate(self, mode, code):
if mode == TwoFactorVerificationModeEnum.SMS:
Expand Down Expand Up @@ -172,14 +173,15 @@ def __authenticate_sms(self, code):
data = self.__generate_authentication_payload(code)
return self.post("/credential/authenticateSms", data)

def __authenticate_password(self, passwd):
def __authenticate_password(self, username, passwd):
data = {
"bindDevice": "true",
"deviceName": "",
"redirectTo": "",
"skipFirstUse": "",
"skipLinkAccount": "false",
"referrerId": "",
"username": username,
"passwd": passwd,
"apiClient": "WEB",
"csrf": self.__csrf
Expand Down