From 9b6fa7d6ec36f412be1f0b5ca83d3add33a0c8c3 Mon Sep 17 00:00:00 2001
From: Ghawken <ghawken@hotkey.net.au>
Date: Sun, 30 Apr 2023 12:14:41 +1000
Subject: [PATCH] 1.5.1

Apple has big server changes which this is a response to.

Remove support for 'Friends'.  Bugger.

What does this mean?
It means we can no longer access Friend data in any fashion.
We can access Family and Own Device data (every family device, and every personal device)

What does this mean?
Well I suspect most usage is within Families, so I would go into current iFriendDevice and edit it to iFriend Family device.
Save and restart Plugin - hopefully everything now continues

non-2FA accounts have largely been depreciated given back end issues.
---
 .../Contents/Info.plist                       |   2 +-
 .../Contents/Server Plugin/Devices.xml        |   2 +-
 .../Contents/Server Plugin/PluginConfig.xml   |  14 +-
 .../Contents/Server Plugin/plugin.py          | 173 +++++++++++-------
 .../Server Plugin/pyicloud/__init__.py        |   2 +-
 .../Contents/Server Plugin/pyicloud/base.py   | 170 ++++++++++++++++-
 .../pyicloud/services/findmyfriends.py        |   2 +
 7 files changed, 289 insertions(+), 76 deletions(-)

diff --git a/iFindFriendsMini.indigoPlugin/Contents/Info.plist b/iFindFriendsMini.indigoPlugin/Contents/Info.plist
index 20952aa..fc3bb0f 100755
--- a/iFindFriendsMini.indigoPlugin/Contents/Info.plist
+++ b/iFindFriendsMini.indigoPlugin/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>PluginVersion</key>
-	<string>1.3.11</string>
+	<string>1.5.1</string>
 	<key>ServerApiVersion</key>
 	<string>3.0</string>
 	<key>CFBundleDisplayName</key>
diff --git a/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/Devices.xml b/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/Devices.xml
index 8dc280b..0d6c7dc 100755
--- a/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/Devices.xml	
+++ b/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/Devices.xml	
@@ -290,7 +290,7 @@
     </Device>
 
  <Device type="custom" id="myDevice" >
-        <Name>FindFriends My Own Device</Name>
+        <Name>FindFriends Family Device</Name>
 
         <ConfigUI>
   			<Field id="autoLabela22"
diff --git a/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/PluginConfig.xml b/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/PluginConfig.xml
index d355b8b..209d599 100755
--- a/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/PluginConfig.xml	
+++ b/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/PluginConfig.xml	
@@ -258,7 +258,7 @@
         <Description>Debug Geofence Exit/Entry Separate Logfile created</Description>
     </Field>
     <Field id="showDebugLevel" type="menu" defaultValue="20" tooltip="Controls the amount of debug information written to the log.">
-        <Label>Debug level:</Label>
+        <Label>Indigo Log Debug level:</Label>
         <Description>Level of Debug information to show in Indigo</Description>
         <List>
             <Option value="5">Detailed Debugging Messages</Option>
@@ -268,6 +268,18 @@
             <Option value="40">Error Messages</Option>
             <Option value="50">Critical Errors Only</Option>
         </List>
+    </Field>
+        <Field id="showDebugFileLevel" type="menu" defaultValue="5" tooltip="Controls the amount of debug information written to the log.">
+        <Label>File Debug level:</Label>
+        <Description>Level of Debug information saved to File</Description>
+        <List>
+            <Option value="5">Detailed Debugging Messages</Option>
+            <Option value="10">Debugging Messages</Option>
+            <Option value="20">Informational Messages</Option>
+            <Option value="30">Warning Messages</Option>
+            <Option value="40">Error Messages</Option>
+            <Option value="50">Critical Errors Only</Option>
+        </List>
     </Field>
         <Field id="deleteSession"
 				   type="button"
diff --git a/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/plugin.py b/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/plugin.py
index 9452e9f..d7c717b 100755
--- a/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/plugin.py	
+++ b/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/plugin.py	
@@ -30,7 +30,9 @@
 import logging
 #import OpenSSL
 import WazeRouteCalculator
-
+import os
+from os import path
+import traceback
 import time as t
 import json
 try:
@@ -39,6 +41,8 @@
     MajorProblem = 2  #1 to restart, 2 to disable
     pass
 
+import itertools
+
 try:
     from pyicloud import PyiCloudService
     #from pyicloud.exceptions import PyiCloudFailedLoginException
@@ -189,13 +193,76 @@
     u'updaterEmailsEnabled': False  # Notification of plugin updates wanted.
 }
 
+# update to python3 changes
+################################################################################
+class IndigoLogHandler(logging.Handler):
+    def __init__(self, display_name, level=logging.NOTSET):
+        super().__init__(level)
+        self.displayName = display_name
+
+    def emit(self, record):
+        """ not used by this class; must be called independently by indigo """
+        logmessage = ""
+        try:
+            levelno = int(record.levelno)
+            is_error = False
+            is_exception = False
+            if self.level <= levelno:  ## should display this..
+                if record.exc_info !=None:
+                    is_exception = True
+                if levelno == 5:	# 5
+                    logmessage = '({}:{}:{}): {}'.format(path.basename(record.pathname), record.funcName, record.lineno, record.getMessage())
+                elif levelno == logging.DEBUG:	# 10
+                    logmessage = '({}:{}:{}): {}'.format(path.basename(record.pathname), record.funcName, record.lineno, record.getMessage())
+                elif levelno == logging.INFO:		# 20
+                    logmessage = record.getMessage()
+                elif levelno == logging.WARNING:	# 30
+                    logmessage = record.getMessage()
+                elif levelno == logging.ERROR:		# 40
+                    logmessage = '({}: Function: {}  line: {}):    Error :  Message : {}'.format(path.basename(record.pathname), record.funcName, record.lineno, record.getMessage())
+                    is_error = True
+                if is_exception:
+                    logmessage = '({}: Function: {}  line: {}):    Exception :  Message : {}'.format(path.basename(record.pathname), record.funcName, record.lineno, record.getMessage())
+                    indigo.server.log(message=logmessage, type=self.displayName, isError=is_error, level=levelno)
+                    if record.exc_info !=None:
+                        etype,value,tb = record.exc_info
+                        tb_string = "".join(traceback.format_tb(tb))
+                        indigo.server.log(f"Traceback:\n{tb_string}", type=self.displayName, isError=is_error, level=levelno)
+                        indigo.server.log(f"Error in plugin execution:\n\n{traceback.format_exc(30)}", type=self.displayName, isError=is_error, level=levelno)
+                    indigo.server.log(f"\nExc_info: {record.exc_info} \nExc_Text: {record.exc_text} \nStack_info: {record.stack_info}",type=self.displayName, isError=is_error, level=levelno)
+                    return
+                indigo.server.log(message=logmessage, type=self.displayName, isError=is_error, level=levelno)
+        except Exception as ex:
+            indigo.server.log(f"Error in Logging: {ex}",type=self.displayName, isError=is_error, level=levelno)
+
 
 class Plugin(indigo.PluginBase):
     def __init__(self, pluginId, pluginDisplayName, pluginVersion, pluginPrefs):
         """ docstring placeholder """
+        indigo.PluginBase.__init__(self, pluginId, pluginDisplayName, pluginVersion, pluginPrefs)
+
+        pfmt = logging.Formatter('%(asctime)s.%(msecs)03d\t%(levelname)s\t%(name)s.%(funcName)s:%(filename)s:%(lineno)s:\t%(message)s', datefmt='%d-%m-%Y %H:%M:%S')
+        self.plugin_file_handler.setFormatter(pfmt)
+        ################################################################################
+        # Setup Logging
+        ################################################################################
+        self.logger.setLevel(logging.DEBUG)
+        try:
+            self.logLevel = int(self.pluginPrefs["showDebugLevel"])
+            self.fileloglevel = int(self.pluginPrefs["showDebugFileLevel"])
+        except:
+            self.logLevel = logging.INFO
+            self.fileloglevel = logging.DEBUG
+
+        self.logger.removeHandler(self.indigo_log_handler)
+        self.previousVersion = self.pluginPrefs.get("previousVersion", "0.0.1")
+        self.indigo_log_handler = IndigoLogHandler(pluginDisplayName, logging.INFO)
+        ifmt = logging.Formatter("%(message)s")
+        self.indigo_log_handler.setFormatter(ifmt)
+        self.indigo_log_handler.setLevel(self.logLevel)
+        self.logger.addHandler(self.indigo_log_handler)
 
 
-        indigo.PluginBase.__init__(self, pluginId, pluginDisplayName, pluginVersion, pluginPrefs)
         self.startingUp = True
         apleAPI = None
         self.pluginIsInitializing = True
@@ -213,10 +280,6 @@ def __init__(self, pluginId, pluginDisplayName, pluginVersion, pluginPrefs):
         self.logger.info(u"{0:=^130}".format(""))
 
         self.iprefDirectory = '{}/Preferences/Plugins/com.GlennNZ.indigoplugin.FindFriendsMini'.format(indigo.server.getInstallFolderPath())
-        #Change to logging
-        pfmt = logging.Formatter('%(asctime)s.%(msecs)03d\t[%(levelname)8s] %(name)20s.%(funcName)-25s%(msg)s',
-                                 datefmt='%Y-%m-%d %H:%M:%S')
-        self.plugin_file_handler.setFormatter(pfmt)
 
         try:
             self.logLevel = int(self.pluginPrefs[u"showDebugLevel"])
@@ -227,7 +290,7 @@ def __init__(self, pluginId, pluginDisplayName, pluginVersion, pluginPrefs):
         try:
             self.newloggerhandler = logging.FileHandler(u"{0}/Logs/com.GlennNZ.indigoplugin.FindFriendsMini/FFM-GeofenceData.log".format(
             indigo.server.getInstallFolderPath()))
-            formatter = logging.Formatter('%(asctime)s.%(msecs)03d\t[%(levelname)8s] %(name)20s.%(funcName)-25s%(msg)s',
+            formatter = logging.Formatter('%(asctime)s.%(msecs)03d\t[%(levelname)8s] %(name)20s.%(funcName)-25s%(message)s',
                                      datefmt='%Y-%m-%d %H:%M:%S')
             self.newloggerhandler.setFormatter(formatter)
             self.newlogger = logging.getLogger('FindFriends-GeofenceData')
@@ -261,6 +324,17 @@ def __init__(self, pluginId, pluginDisplayName, pluginVersion, pluginPrefs):
             self.newlogger.info(u"{0:<30} {1}".format("Major Problem equals: ", MajorProblem))
             self.newlogger.info(u"{0:=^130}".format(""))
 
+        if self.debugicloud:
+            pyatv_logging = logging.getLogger("Plugin.pyiCloud2fa")
+
+            pyatv_logging.setLevel(logging.THREADDEBUG)
+            #pyatv_logging.addHandler(self.indigo_log_handler)
+            pyatv_logging.addHandler(self.plugin_file_handler)
+
+        else:
+            pyatv_logging = logging.getLogger("Plugin.pyiCloud2fa")
+            pyatv_logging.setLevel(logging.INFO)
+            pyatv_logging.addHandler(self.plugin_file_handler)
 
         self.TwoFAverified = False
 
@@ -808,31 +882,7 @@ def refreshData(self):
                 self.logger.debug(str('Follower is Type: '+ str(type(follower))))
             if self.debugicloud:
                 self.logger.debug(str('More debugging: Follower: '+str(follower)))
-            if len(follower) == 0:
-                self.logger.info(u'No Followers Found for this Account.  Have you any friends?')
-                if self.debugicloud:
-                    self.logger.debug(u'Full Dump of self.appleAPI data follows:')
-                    self.logger.debug(u"{0:=^130}".format(""))
-                    self.logger.debug(u"{0:=^130}".format(""))
-                    self.logger.debug(str(friendsdata))
-                    self.logger.debug(u"{0:=^130}".format(""))
-                    self.logger.debug(u"{0:=^130}".format(""))
-                    self.logger.debug(u'Please PM developer this log.')
-                    self.logger.debug(u"{0:=^130}".format(""))
-                return
 
-            if follower is None:
-                self.logger.info(u'No Followers Found for this Account.  Have you any (enabled) friends?')
-                if self.debugicloud:
-                    self.logger.debug(u'Full Dump of self.appleAPI data follows:')
-                    self.logger.debug(u"{0:=^130}".format(""))
-                    self.logger.debug(u"{0:=^130}".format(""))
-                    self.logger.debug(str(iLogin[1].friends.data))
-                    self.logger.debug(u"{0:=^130}".format(""))
-                    self.logger.debug(u"{0:=^130}".format(""))
-                    self.logger.debug(u'Please PM developer this log.')
-                    self.logger.debug(u"{0:=^130}".format(""))
-                return
 
             for dev in indigo.devices.iter("self.FindFriendsFriend"):
                 # Check AppleID of Device
@@ -840,15 +890,16 @@ def refreshData(self):
                     targetFriend = dev.pluginProps['targetFriend']
                     if self.debugicloud:
                         self.logger.debug(u'targetFriend of Device equals:' + str(targetFriend))
-                    for follow in follower:
-                        if self.debugicloud:
-                            self.logger.debug (str(follow['id']))
-                        if follow['id'] == targetFriend:
+                    if follower !=None:
+                        for follow in follower:
                             if self.debugicloud:
-                                self.logger.debug(u'Found Target Friend in Data:  Updating Device:' + str(dev.name))
-                                self.logger.debug(str(follow))
-                            # Update device with data from iFindFriends service
-                            self.refreshDataForDev(dev, follow)
+                                self.logger.debug (str(follow['id']))
+                            if follow['id'] == targetFriend:
+                                if self.debugicloud:
+                                    self.logger.debug(u'Found Target Friend in Data:  Updating Device:' + str(dev.name))
+                                    self.logger.debug(str(follow))
+                                # Update device with data from iFindFriends service
+                                self.refreshDataForDev(dev, follow)
 
             for dev in indigo.devices.iter("self.myDevice"):
                 # Check AppleID of Device
@@ -942,7 +993,6 @@ def checkGeofence(self):
 
             self.logger.debug('Check GeoFences Called..')
 
-
             # need to start with GeofFence and then go through all devices
             # iDevName = dev.states['friendName']
             # Check GeoFences after devices
@@ -965,20 +1015,18 @@ def checkGeofence(self):
                     self.logger.debug(u'Old GeoDevice Friends Equals:')
                     self.logger.debug(str(iGeolistFriends))
 
-                    for dev in indigo.devices.iter("self.FindFriendsFriend"):
+                    for dev in itertools.chain(indigo.devices.iter("self.FindFriendsFriend"), indigo.devices.iter("self.myDevice")):
                         #add online check here
+                        #self.logger.error(f"{dev.name}")
                         if dev.enabled and dev.states['deviceIsOnline'] == True:
                             self.logger.debug('Geo Details on check:' + str(igeoName) + ' For Friend:' + str(dev.name))
                             iDevLatitude = float(dev.states['latitude'])
                             iDevLongitude = float(dev.states['longitude'])
                             iDevUniqueName = dev.pluginProps['friendName']
                             iDevAccuracy = float(dev.states['horizontalAccuracy'])
-
-
                             #self.logger.error(str(iDevUniqueName))
                             # Now check the distance for each device
                             # Calculate the distance
-
                             self.logger.debug('Point 1' + ' ' + str(igeoLat) + ',' + str(igeoLong) + ' Point 2 ' + str(iDevLatitude) + ',' + str(iDevLongitude))
                             iSeparation = self.iDistance(igeoLat, igeoLong, iDevLatitude, iDevLongitude)
 
@@ -1626,17 +1674,20 @@ def myFriendDevices(self, filter=0, valuesDict=None, typeId="", targetId=0):
                 iFriendArray.append(iWait)
                 return iFriendArray
 
-            following = iLogin[1].friends.data['following']
-            for fol in following:
-                # self.logger.info(str(fol['id']))
-                # self.logger.info(str(fol['invitationFromEmail']))
-                iOption2 = fol['id'], fol['invitationAcceptedByEmail']
-                #self.logger.info(str(iOption2))
-                iFriendArray.append(iOption2)
+            if 'following' in iLogin[1].friends.data:
+                following = iLogin[1].friends.data['following']
+                if following !=None:
+                    for fol in following:
+                        # self.logger.info(str(fol['id']))
+                        # self.logger.info(str(fol['invitationFromEmail']))
+                        iOption2 = fol['id'], fol['invitationAcceptedByEmail']
+                        #self.logger.info(str(iOption2))
+                        iFriendArray.append(iOption2)
             return iFriendArray
 
         except:
             self.logger.info(u'Error within myFriendsDevices')
+            self.logger.debug(f"Exception details", exc_info=True)
             return []
 
 
@@ -1733,12 +1784,13 @@ def iAuthorise(self, iUsername, iPassword):
                 self.logger.debug(u"{0:=^130}".format(""))
                 self.logger.debug(u'type self.appleAPI result equals:')
                 self.logger.debug(str(type(self.appleAPI)))
+
                 #self.logger.debug(u'self.appleAPI.devices equals:')
                 #self.logger.debug(str(self.appleAPI.devices))
                 self.logger.debug(u"{0:=^130}".format(""))
                 self.logger.debug(u"{0:=^130}".format(""))
                 self.logger.debug(u'self.appleAPI.friends.details equals:')
-                self.logger.debug(str(self.appleAPI.friends.details))
+               # self.logger.erlogger.errorror(f"{self.appleAPI.friends.data}")
                 self.logger.debug(u"{0:=^130}".format(""))
                 self.logger.debug(u"{0:=^130}".format(""))
                 self.logger.debug(u'self.appleAPI.friends.locations equals:')
@@ -1757,20 +1809,13 @@ def iAuthorise(self, iUsername, iPassword):
                 self.logger.debug(str(self.appleAPI.friends.data))
                 self.logger.debug(u"{0:=^130}".format(""))
                 self.logger.debug(u"{0:=^130}".format(""))
-                self.logger.debug(u'self.appleAPI.friends.data[followers] equals:')
-                self.logger.debug(str(self.appleAPI.friends.data['followers']))
+               # self.logger.debug(u'self.appleAPI.friends.data[followers] equals:')
+                #self.logger.debug(str(self.appleAPI.friends.data['followers']))
                 self.logger.debug(u"{0:=^130}".format(""))
                 self.logger.debug(u"{0:=^130}".format(""))
 
-                follower = self.appleAPI.friends.data['followers']
-                self.logger.debug(u'follower or self.appleAPI.friends.data[followers] equals:')
-                for fol in follower:
-                    self.logger.debug(u"{0:=^130}".format(""))
-                    self.logger.debug(u"{0:=^130}".format(""))
-                    self.logger.debug(u'Follower in follower: ID equals')
-                    self.logger.debug(str(fol['id']))
-                    self.logger.debug(u'email address from Id equals:')
-                    self.logger.debug(str(fol['invitationFromEmail']))
+                #follower = self.appleAPI.friends.data['followers']
+                #self.logger.debug(u'follower or self.appleAPI.friends.data[followers] equals:')
 
                 self.logger.debug(u"{0:=^130}".format(""))
                 self.logger.debug(u"{0:=^130}".format(""))
@@ -1823,7 +1868,7 @@ def iAuthorise(self, iUsername, iPassword):
         except Exception as e:
             self.logger.debug(u'Login Failed General Error.   ' + str(e) + str(e.__dict__))
             self.logger.info(u"Issue connecting to icloud.  ?Internet issue, or temp icloud server down...")
-            self.logger.debug(e)
+            self.logger.debug(f"{e}", exc_info=True)
             return 1, 'NI'
 
     def deleteAccount(self,valuesDict):
diff --git a/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/pyicloud/__init__.py b/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/pyicloud/__init__.py
index 828de14..ef73a36 100644
--- a/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/pyicloud/__init__.py	
+++ b/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/pyicloud/__init__.py	
@@ -2,4 +2,4 @@
 import logging
 from pyicloud.base import PyiCloudService
 
-logging.getLogger(__name__).addHandler(logging.NullHandler())
+LOGGER = logging.getLogger("Plugin.pyiCloud2fa")
diff --git a/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/pyicloud/base.py b/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/pyicloud/base.py
index 251a781..cfb3606 100644
--- a/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/pyicloud/base.py	
+++ b/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/pyicloud/base.py	
@@ -1,14 +1,20 @@
 """Library base file."""
+import urllib.request
+import re
+
+import urllib3
 from six import PY2, string_types
 from uuid import uuid1
 import inspect
 import json
 import logging
 from requests import Session
+import requests
 from tempfile import gettempdir
 from os import path, mkdir
 from re import match
 import http.cookiejar as cookielib
+from urllib import parse
 
 #import http.cookiejar as cookielib
 
@@ -116,6 +122,8 @@ def request(self, method, url, **kwargs):  # pylint: disable=arguments-differ
             except Exception:
                 pass
 
+            LOGGER.debug(f"Headers: {response.headers}, Reason {response.reason}, Response {response.text}")
+
             if has_retried is None and response.status_code in [421, 450, 500]:
                 api_error = PyiCloudAPIResponseException( response.reason, response.status_code, retry=True   )
                 request_logger.debug(api_error)
@@ -125,7 +133,8 @@ def request(self, method, url, **kwargs):  # pylint: disable=arguments-differ
             self._raise_error(response.status_code, response.reason)
 
         if content_type not in json_mimetypes:
-            LOGGER.debug("Response:"+str(response))
+            LOGGER.debug("Response:2:"+str(response))
+            LOGGER.debug(f"Response Headers {response.headers}")
             return response
 
         try:
@@ -155,7 +164,7 @@ def request(self, method, url, **kwargs):  # pylint: disable=arguments-differ
             if reason:
                 self._raise_error(code, reason)
 
-        LOGGER.debug("Response:" + str(response))
+        LOGGER.debug("Response:1:" + str(response))
         return response
 
     def _raise_error(self, code, reason):
@@ -307,10 +316,10 @@ def authenticate(self, force_refresh=False):
                             self.params.update({"dsid": self.data["dsInfo"]["dsid"]}) ## should already be set, but no harm...
                     else:
                         login_successful = False
-                        self.logger.error(u"No DSID in return data:"+str(self.data))
+                        self.logger.debug(u"No DSID in return data:"+str(self.data))
                 else:
                     login_successful = False
-                    self.logger.error(u"No DSID in return data:" + str(self.data))
+                    self.logger.debug(u"No DSID in return data:" + str(self.data))
 
 
             except PyiCloudAPIResponseException:
@@ -334,8 +343,9 @@ def authenticate(self, force_refresh=False):
             if self.session_data.get("session_id"):
                 headers["X-Apple-ID-Session-Id"] = self.session_data.get("session_id")
 
-            #LOGGER.error("************ Headers for /validate with Token Session ***************")
-           # LOGGER.error(str(headers))
+            LOGGER.debug("************ Headers for /validate with Token Session ***************")
+            LOGGER.debug(str(headers))
+
             try:
                 req = self.session.post(
                     "%s/signin" % self.AUTH_ENDPOINT,
@@ -347,14 +357,156 @@ def authenticate(self, force_refresh=False):
                 msg = "Invalid email/password combination."
                 raise PyiCloudFailedLoginException(msg, error)
 
-            self._authenticate_with_token()
+            LOGGER.debug(f"**** Success.  Headers:{req.headers}  {req}")
 
+            if "X-Apple-Repair-Session-Token" in req.headers:
+                LOGGER.debug(f"*************** Repair Token Found: NON 2fa being stuffed.")
+                self._bypass_Repair2FA(req)
+
+            self._authenticate_with_token()
+            self.params.update({
+                "dsid": self.data.get("dsInfo").get("dsid")
+            })
             #self.trust_session()  ## delete me afte rlogging
 
         self._webservices = self.data["webservices"]
 
         LOGGER.debug("Authentication completed successfully")
 
+    def _get_auth_non2FA_headers(self, overrides=None):
+        headers = {
+            "Accept": "*/*",
+            "Content-Type": "application/json",
+            "X-Apple-OAuth-Client-Id": "d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d",
+            "X-Apple-OAuth-Client-Type": "firstPartyAuth",
+            "X-Apple-OAuth-Redirect-URI": "https://www.icloud.com",
+            "X-Apple-OAuth-Require-Grant-Code": "true",
+            "X-Apple-OAuth-Response-Mode": "web_message",
+            "X-Apple-OAuth-Response-Type": "code",
+            "X-Apple-Frame-Id": self.client_id,
+            "X-Apple-Domain-Id": 3,
+            "X-Apple-OAuth-State": self.client_id,
+            "X-Apple-Widget-Key": "d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d",
+        }
+        if overrides:
+            headers.update(overrides)
+        return headers
+
+    def _bypass_Repair2FA(self, response):
+        LOGGER.info("Non 2FA being used, Apple wants to repair this/upgrade this, attempting to bypass and resume usual login")
+
+        http = urllib3.PoolManager()
+
+        old_location = f"{response.headers['location']}"
+        widgetKey = parse.parse_qs(parse.urlparse(old_location).query)['widgetKey'][0]
+        ##  if &rv=1 fails (!) That was 2 hours I won't get back
+        location = old_location.replace("&rv=1","&rv=3")
+        LOGGER.debug(f"Location:{location}")
+        needuseragent = {}
+        needuseragent['Content-Type'] = 'application/json'
+        needuseragent['Accept'] ='text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9'
+        needuseragent["User-Agent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"
+
+        LOGGER.debug(f"Using URL: {location}\n Headers:\n {needuseragent}")
+        missed_req = http.request("GET", url=location, headers=needuseragent)
+
+        LOGGER.debug(f"Missed_Req:url {location}\n{missed_req}, \n widgetKey {widgetKey}, \n missed_req headers {missed_req.headers}")
+        LOGGER.debug(f"Status of Missed one: {missed_req.status}")
+        #LOGGER.error(f"Data returned:{missed_req.content}")
+
+        LOGGER.debug("Need to get SAet-Cookie aidsp")
+        LOGGER.debug(f'{missed_req.headers["Set-Cookie"]}')
+        cookies =f'{missed_req.headers["Set-Cookie"]}'
+        result = re.search('aidsp=(.*); Domain=', cookies)  ## Split off aidsp from the cookie string.
+        LOGGER.debug(f"Result cookies = {result.group(1)}")
+        SessionID = result.group(1)
+
+        url = "https://appleid.apple.com/account/manage/repair/options"
+        new_headers =  {} #response.headers
+        new_headers['scnt'] = missed_req.headers['scnt']
+        new_headers['X-Apple-ID-Session-Id'] = SessionID
+        ## Session ID comes from set-Cookie aidsp, from the repair Widget request
+        new_headers['X-Apple-Session-Token'] = response.headers['X-Apple-Repair-Session-Token']
+        new_headers['X-Apple-Skip-Repair-Attributes'] = '[]'
+        new_headers['X-Apple-Widget-Key'] = widgetKey
+        new_headers['Content-Type'] = 'application/json'
+        new_headers['X-Requested-With'] = 'XMLHttpRequest'
+        new_headers['Accept'] = 'application/json, text/javascript'
+        #new_headers['X-Apple-OAuth-Context']= missed_req.headers['X-Apple-OAuth-Context']
+     #   new_headers['Referer'] = "https://appleid.apple.com/"
+    #    new_headers['Host'] = "appleid.apple.com"
+        new_headers['User-Agent']= "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"
+
+        #    req = self.session.post("%s/validate" % self.SETUP_ENDPOINT, params=self.params, data="null")
+        LOGGER.debug(f"myattempt: url: {url} \n new_headers {new_headers}")
+        myattempt = http.request("GET", url=url, headers=new_headers)
+        LOGGER.debug(f"Try myattempt: {myattempt}, {myattempt.headers} ")
+
+        LOGGER.debug(f"Status of MyAttempt: {myattempt.status}")
+
+        next_headers = {}
+        url = "https://appleid.apple.com/account/security/upgrade/setuplater"
+        next_headers['scnt'] = missed_req.headers['scnt']
+        next_headers['X-Apple-ID-Session-Id'] = SessionID
+        next_headers['X-Apple-Session-Token'] = myattempt.headers['X-Apple-Session-Token']
+        next_headers['X-Apple-Skip-Repair-Attributes'] = '["hsa2_enrollment"]'
+        next_headers['X-Apple-Widget-Key'] = widgetKey
+        next_headers['Content-Type'] = 'application/json'
+        next_headers['X-Requested-With'] = 'XMLHttpRequest'
+        next_headers['Accept'] = 'application/json, text/javascript'
+        next_headers['User-Agent']= "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"
+
+        LOGGER.debug(f"NextAttempt: url: {url} \n new_headers {next_headers}")
+        nextattempt = http.request("GET", url=url, headers=next_headers)
+        LOGGER.debug(f"Try nextattempt: {nextattempt}, {nextattempt.headers}")
+        LOGGER.debug(f"Status of NextAttempt: {nextattempt.status}")
+
+        last_headers =self._get_auth_non2FA_headers()
+
+        url = "https://idmsa.apple.com/appleauth/auth/repair/complete"
+        last_headers['scnt'] = missed_req.headers['scnt']
+
+        last_headers['X-Apple-ID-Session-Id'] = SessionID
+        #next_headers['X-Apple-Session-Token'] = myattempt.headers['X-Apple-Session-Token']
+        last_headers['X-Apple-Repair-Session-Token'] = myattempt.headers['X-Apple-Session-Token']
+        last_headers['X-Apple-Widget-Key'] = widgetKey
+
+        last_headers['Content-Type'] = 'application/json'
+        last_headers['X-Requested-With'] = 'XMLHttpRequest'
+        last_headers['Accept'] = 'application/json;charset=utf-8'
+
+        #last_headers['User-Agent'] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"
+       # LOGGER.debug(f'X-Auth: {response.headers["X-Apple-Auth-Attributes"]}')
+       # last_headers["X-Apple-Auth-Attributes"]= response.headers["X-Apple-Auth-Attributes"]
+       # last_headers["Content-Length"]=0
+       # last_headers["Origin"]= "https://idmsa.apple.com"
+       # last_headers["Referer"]= "https://idmsa.apple.com/"
+       # last_headers["Host"] = "idmsa.apple.com"
+       # last_headers["X-Apple-Locale"] = "en_GB"
+       # LOGGER.error(f'Response Set-Cookie: {response.headers["Set-Cookie"]}')
+       # last_headers["Set-Cookie"]= response.headers["Set-Cookie"]
+        #data = json.dumps({})
+       # last_headers["X-Apple-I-FD-Client-Info"]= '{"U":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36","L":"en-GB","Z":"GMT+11:00","V":"1.1","F":"Fta44j1e3NlY5BNlY5BSs5uQ32SCVc8NTjN37FSHmr9k.uJtHoqvynx9MsFyxY25CKw..BN.Fg4JRK8mcK9rTKIwBfxFETlWY5BNlYJNNlY5QB4bVNjMk.3v5"}'
+        data = {}
+        data["trustTokens"] = []
+        if self.session_data.get("trust_token"):
+            data["trustTokens"] = [self.session_data.get("trust_token")]
+
+
+        #if self.session_data.get("trust_token"):
+        #    data["trustTokens"] = [self.session_data.get("trust_token")]
+
+
+        last_attempt = http.request("POST", url=url, body=json.dumps(data), headers=last_headers)
+        LOGGER.debug(f"Try last: Status:{last_attempt.status} ")
+        LOGGER.debug(f" Total: {last_attempt},\nHeaders: {last_attempt.headers} ")
+        LOGGER.debug(f"lastOne: url:\n{url}\n last_headers:\n{last_headers}")
+        LOGGER.debug(f" Last_Attempt: {last_attempt.data} ")
+
+        if last_attempt.status == 204:
+            LOGGER.info("Repair of non 2FA skipped, successfully it would seem. Hopefully logins normally now")
+        return
+
     def _authenticate_with_token(self):
         """Authenticate using session token."""
         data = {
@@ -363,6 +515,7 @@ def _authenticate_with_token(self):
             "extended_login": True,
             "trustToken": self.session_data.get("trust_token", ""),
         }
+
         LOGGER.debug("************ Headers for _authenicate with Token /accountLogin Session ***************")
         LOGGER.debug(str(self.session.headers))
         try:
@@ -378,6 +531,7 @@ def _authenticate_with_token(self):
 
     def _update_dsid(self,data):
         try:
+            LOGGER.debug((f"updating dsid {data}"))
             if 'dsInfo' in data:  ## check self.data returned and contains dsid
                 if 'dsid' in data['dsInfo']:        # as above
                     self.params["dsid"]= str(data["dsInfo"]["dsid"])
@@ -627,4 +781,4 @@ def __str__(self):
         return as_str
 
     def __repr__(self):
-        return "<%s>" % str(self)
+        return "<%s>" % str(self)
\ No newline at end of file
diff --git a/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/pyicloud/services/findmyfriends.py b/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/pyicloud/services/findmyfriends.py
index 061e287..90975f2 100644
--- a/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/pyicloud/services/findmyfriends.py	
+++ b/iFindFriendsMini.indigoPlugin/Contents/Server Plugin/pyicloud/services/findmyfriends.py	
@@ -1,6 +1,8 @@
 from __future__ import absolute_import
 
 
+
+
 class FindFriendsService(object):
     """
     The 'Find my Friends' iCloud service