Merge pull request #232 from Scanerr-io/dev

Dev

Author: lrodden

app/api/utils/imager.py

@@ -267,7 +267,7 @@ def scan_vrt(self, driver: object=None) -> list:
                 break
 
             # scroll single frame if not first frame and not auto_height
-            if index != 0 and not self.scan.configs.get('auto_height', True):
+            if index != 0:
                 driver.execute_script("window.scrollBy(0, document.documentElement.clientHeight);")
                 time.sleep(int(self.scan.configs.get('min_wait_time', 10)))
 

app/api/v1/auth/services.py

@@ -288,7 +288,7 @@ def jwt_login(*, user: object) -> str:
 
     # get JWTs for user
     refresh = RefreshToken.for_user(user)
-    access = str(refresh.access_token)
+    token = str(refresh.access_token)
     refresh = str(refresh)
 
     # create API token if none exists
@@ -307,7 +307,7 @@ def jwt_login(*, user: object) -> str:
 
     # building params for redirect
     param_string = str(
-        '?access='+str(access)+'&refresh='+str(refresh)+
+        '?token='+str(token)+'&refresh='+str(refresh)+
         '&username='+str(user.username)+'&id='+str(user.id)+
         '&email='+str(user.email)+'&is_active='+str(is_active)+
         '&created='+str(user.date_joined)+'&updated='+str(timezone.now())+