Merge pull request #861 from MerginMaps/avalable_auth_id_check

Export auth IDs available in the auth DB

Author: MarcelGeo

Mergin/projects_manager.py

@@ -449,7 +449,7 @@ def sync_project(self, project_dir, project_name=None):
             if not dlg.is_complete:
                 # we were cancelled
                 return
-            
+
             if is_file_changed(pull_changes, AUTH_CONFIG_FILENAME):
                 AuthSync().import_auth()
 

Mergin/utils_auth.py

@@ -620,7 +620,10 @@ def get_auth_config_hash(self, auth_ids: list[str]) -> str:
     def export_auth(self, client) -> None:
         """Export auth DB credentials for protected layers if they have changed"""
 
-        auth_ids = self.get_layers_auth_ids()
+        referenced_ids = self.get_layers_auth_ids()
+        available_ids = self.auth_mngr.configIds()
+        auth_ids = [aid for aid in referenced_ids if aid in available_ids]
+
         if not auth_ids:
             if os.path.exists(self.auth_file):
                 os.remove(self.auth_file)