Merge pull request #535 from whole-tale/deriva_scope

Only add new globus scopes during plugin load

server/__init__.py

@@ -19,6 +19,7 @@
 from girder.exceptions import GirderException
 from girder.models.model_base import ValidationException
 from girder.models.notification import Notification, ProgressState
+from girder.models.setting import Setting
 from girder.models.user import User
 from girder.plugins.jobs.constants import JobStatus
 from girder.plugins.jobs.models.job import Job as JobModel
@@ -494,6 +495,9 @@ def store_other_globus_tokens(event):
 
 
 def load(info):
+    from girder.plugins.oauth.providers.globus import Globus
+    deriva_scopes = Setting().get(PluginSettings.DERIVA_SCOPES)
+    Globus.addScopes(list(deriva_scopes.values()))
     info['apiRoot'].wholetale = wholeTale()
     info['apiRoot'].instance = Instance()
     tale = Tale()

server/lib/deriva/auth.py

@@ -1,12 +1,7 @@
 from girder.models.setting import Setting
-from ...constants import PluginSettings, DEFAULT_DERIVA_SCOPE
+from ...constants import PluginSettings
 from ..verificator import Verificator
 
-from girder.plugins.oauth.providers.globus import Globus
-
-
-Globus.addScopes([DEFAULT_DERIVA_SCOPE])
-
 
 class DerivaVerificator(Verificator):
     def __init__(self, resource_server=None, key=None, user=None, url=None):