added data from env

bbcli/endpoints.py

@@ -6,10 +6,17 @@ import typer
 #from string_builder import StringBuilder
 import click
 from typing import Optional
+from dotenv import load_dotenv
+import os
+
+
 
 app = typer.Typer()
 
-cookies = {'BbRouter' : 'expires:1645629198,id:B568F329FB52485B02F9D45307C27083,signature:e13c22f908162232cf18e5f4bbe698d5f7c904edca932f6a27263b374f5e7ac5,site:f4fe20be-98b0-4ecd-9039-d18ce2989292,timeout:10800,user:15bd75dd85af4f56b31283276eb8da7c,v:2,xsrf:03f9f512-620d-4f11-b84f-65f1daba0cfc'}
+
+load_dotenv()
+cookies = {'BbRouter' : os.getenv("BB_ROUTER")}
+headers = {'X-Blackboard-XSRF': os.getenv('XSRF')}
 base_url = 'https://ntnu.blackboard.com/learn/api/public/v1/'
 
 

bbcli/login.py

@@ -128,9 +128,6 @@ def scrape_microsoft_login_response(response, request_data):
     # Remove certaint parts of the script content to be able to use json.loads
     script_tag = script_tag.contents[0][20:len(script_tag.contents[0]) - 7]
     script_content = json.loads(script_tag)
-    f = open('file.html', 'w')
-    f.write(soup.prettify())
-    f.close()
 
     global ctx
     global session_id
@@ -178,10 +175,8 @@ def begin_auth(session, request_data):
 
     if auth_method_id == 'PhoneAppNotification':
         begin_phone_app_auth(session, request_data)
-    elif auth_method_id == 'OneWaySMS':
-        begin_one_way_sms_auth(session, request_data)
-    # else:
-        # begin_security_key_auth(session, request_data)
+    elif auth_method_id == 'OneWaySMS' or auth_method_id == 'PhoneAppOTP':
+        begin_one_time_code_auth(session, request_data)
 
 
 def begin_phone_app_auth(session, request_data):
@@ -191,14 +186,14 @@ def begin_phone_app_auth(session, request_data):
     j = json.loads(response.text)
     app_auth_wait(session, request_data, j['CorrelationId'], j['FlowToken'])
 
-def begin_one_way_sms_auth(session, request_data):
+def begin_one_time_code_auth(session, request_data):
     global otc
     global flowtoken
 
     response = session.post(
         'https://login.microsoftonline.com/common/SAS/BeginAuth', data=request_data.data)
 
-    SMS_code = input('Enter SMS code: ')
+    SMS_code = input('Enter code: ')
     otc = SMS_code
     j = json.loads(response.text)