[FIX] fix fstogedcom

diff --git a/getmyancestors/__init__.py b/getmyancestors/__init__.py
index 355637aa024728df3b2f1930cce1bf24139576ae..5be33165caa1a2b625362390620522d65c88ce4f 100644 (file)
--- a/getmyancestors/__init__.py
+++ b/getmyancestors/__init__.py
@@ -3,4 +3,4 @@
 from . import getmyancestors
 from . import mergemyancestors
 
-__version__ = "1.1.1"
+__version__ = "1.1.2"

diff --git a/getmyancestors/classes/gui.py b/getmyancestors/classes/gui.py
index 4b4c7d951a2d70b19da9a0117a247516361e8005..c5382e1f80ad46967a233931a2b053c925276b9b 100644 (file)
--- a/getmyancestors/classes/gui.py
+++ b/getmyancestors/classes/gui.py
@@ -512,7 +512,7 @@ class Download(Frame):
         cache.add("save_password", save_pass)
 
         url = "/service/tree/tree-data/reservations/person/%s/ordinances" % self.fs.fid
-        lds_account = self.fs.get_url(url, {}).get("status") == "OK"
+        lds_account = self.fs.get_url(url, {}, no_api=True).get("status") == "OK"
         self.options = Options(self.form, lds_account)
         self.info("")
         self.sign_in.destroy()

diff --git a/getmyancestors/classes/session.py b/getmyancestors/classes/session.py
index 03fa619571a1001f32c93ee55c11f12cf3fa0821..183d3050e21ab1b1e565a887a9f4bf8c8600f507 100644 (file)
--- a/getmyancestors/classes/session.py
+++ b/getmyancestors/classes/session.py
@@ -10,6 +10,9 @@ from fake_useragent import UserAgent
 # local imports
 from getmyancestors.classes.translation import translations
 
+DEFAULT_CLIENT_ID = "a02j000000KTRjpAAH"
+DEFAULT_REDIRECT_URI = "https://misbach.github.io/fs-auth/index_raw.html"
+
 
 class Session(requests.Session):
     """Create a FamilySearch session
@@ -23,8 +26,8 @@ class Session(requests.Session):
         self,
         username,
         password,
-        client_id,
-        redirect_uri,
+        client_id=None,
+        redirect_uri=None,
         verbose=False,
         logfile=False,
         timeout=60,
@@ -32,8 +35,8 @@ class Session(requests.Session):
         super().__init__()
         self.username = username
         self.password = password
-        self.client_id = client_id
-        self.redirect_uri = redirect_uri
+        self.client_id = client_id or DEFAULT_CLIENT_ID
+        self.redirect_uri = redirect_uri or DEFAULT_REDIRECT_URI
         self.verbose = verbose
         self.logfile = logfile
         self.timeout = timeout

diff --git a/getmyancestors/getmyancestors.py b/getmyancestors/getmyancestors.py
index b72c55eb25d3c283440f807c996042dfcba08c94..fc9e7e5e3ba301663bb67c93382e2861165f51a1 100644 (file)
--- a/getmyancestors/getmyancestors.py
+++ b/getmyancestors/getmyancestors.py
@@ -14,8 +14,6 @@ import argparse
 from getmyancestors.classes.tree import Tree
 from getmyancestors.classes.session import Session
 
-DEFAULT_CLIENT_ID = "a02j000000KTRjpAAH"
-DEFAULT_REDIRECT_URI = "https://misbach.github.io/fs-auth/index_raw.html"
 
 
 def main():
@@ -180,8 +178,8 @@ def main():
     fs = Session(
         args.username,
         args.password,
-        args.client_id or DEFAULT_CLIENT_ID,
-        args.redirect_uri or DEFAULT_REDIRECT_URI,
+        args.client_id,
+        args.redirect_uri,
         args.verbose,
         args.logfile,
         args.timeout,