Merge pull request #3041 from pypeclub/bugfix/OP-3072_GDrive-provider-ignore-that-site-is-disabled

SiteSync: Providers ignore that site is disabled
This commit is contained in:
Petr Kalis 2022-04-08 13:13:52 +02:00 committed by GitHub
commit 3754d48b86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 14 deletions

View file

@ -17,6 +17,7 @@ class DropboxHandler(AbstractProvider):
self.active = False
self.site_name = site_name
self.presets = presets
self.dbx = None
if not self.presets:
log.info(
@ -24,6 +25,11 @@ class DropboxHandler(AbstractProvider):
)
return
if not self.presets["enabled"]:
log.debug("Sync Server: Site {} not enabled for {}.".
format(site_name, project_name))
return
token = self.presets.get("token", "")
if not token:
msg = "Sync Server: No access token for dropbox provider"
@ -44,16 +50,13 @@ class DropboxHandler(AbstractProvider):
log.info(msg)
return
self.dbx = None
if self.presets["enabled"]:
try:
self.dbx = self._get_service(
token, acting_as_member, team_folder_name
)
except Exception as e:
log.info("Could not establish dropbox object: {}".format(e))
return
try:
self.dbx = self._get_service(
token, acting_as_member, team_folder_name
)
except Exception as e:
log.info("Could not establish dropbox object: {}".format(e))
return
super(AbstractProvider, self).__init__()

View file

@ -73,6 +73,11 @@ class GDriveHandler(AbstractProvider):
format(site_name))
return
if not self.presets["enabled"]:
log.debug("Sync Server: Site {} not enabled for {}.".
format(site_name, project_name))
return
current_platform = platform.system().lower()
cred_path = self.presets.get("credentials_url", {}). \
get(current_platform) or ''
@ -97,11 +102,10 @@ class GDriveHandler(AbstractProvider):
return
self.service = None
if self.presets["enabled"]:
self.service = self._get_gd_service(cred_path)
self.service = self._get_gd_service(cred_path)
self._tree = tree
self.active = True
self._tree = tree
self.active = True
def is_active(self):
"""