1.7.10

- Fix for failure to allow 2FA code to progress.  Apple servers rejected 2nd try.
(Delete account details and start afresh)

1.7.04
- Couple of fixes
- Still odd messaging from icloud...

1.7

Some fixes for old password types using different encryption.
Fixes for failure to connect successfully at times.

Add override - Disable all Communication in PluginConfig, with action Groups to enable/disable.  Enables plugin to be disabled completely and reenabled at users wish.

Add url_mapping - which will include a google maps embedded url.  Individual API Key needs access for this to be useful.  (use in Kiosk Home iFrame)

Update embed mapping

iFindFriendsMini.indigoPlugin/Contents/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>PluginVersion</key>
-	<string>1.7.04</string>
+	<string>1.7.10</string>
 	<key>ServerApiVersion</key>
 	<string>3.4</string>
 	<key>CFBundleDisplayName</key>

iFindFriendsMini.indigoPlugin/Contents/Server Plugin/plugin.py

@@ -1871,7 +1871,7 @@ def iAuthorise(self, iUsername, iPassword):
                 self.logger.debug(u'Login to account successful...')
                 self.logger.debug(u"Account Requires 2FA:")
 
-            if self.appleAPI:
+            elif self.appleAPI:
                 self.appleAPI.authenticate(force_refresh=False)
                 self.logger.debug(u'Refresh Session appleAPI only.')
 

iFindFriendsMini.indigoPlugin/Contents/Server Plugin/pyicloud/base.py

@@ -459,9 +459,10 @@ def set_encrypt_info(self, protocol: str, salt: bytes, iterations: int, key_leng
                     self.protocol = protocol
                     self.salt = salt
                     self.iterations = iterations
-                    self.key_length = key_length
+                    self.key_length = 32 # key_length
 
                 def encode(self):
+                    key_length = 32
                     if (self.protocol == 's2k_fo'):
                         password_hash = hashlib.sha256(self.password.encode('utf-8')).hexdigest()[:-1]
                     else:
@@ -494,7 +495,7 @@ def encode(self):
 
             try:
                 init_resp = self.session.post(init_url, data=json.dumps(init_data), headers=headers)
-                init_resp.raise_for_status()
+                #init_resp.raise_for_status()
 
             except PyiCloudAPIResponseException as e:
                 msg = f"SRP init failed: {e}"
@@ -545,7 +546,7 @@ def encode(self):
             if self.session_data.get("trust_token"):
                 complete_data["trustTokens"] = [self.session_data.get("trust_token")]
 
-            LOGGER.debug(f"Sending: Complete_data\n {complete_data}\n")
+            LOGGER.debug(f"Sending: Complete_data\n {json.dumps(complete_data)}\n")
             LOGGER.debug(f"With Complete Headers:\n\n{headers}")
             # Send 'm1' to the server