Skip to content

Commit 1e7df8a

Browse files
committed
Merge branch 'feature/gv-auth' into develop
Closes #412
2 parents 2963571 + fecbb85 commit 1e7df8a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

waterbutler/core/utils.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ def make_provider(name: str, auth: dict, credentials: dict, settings: dict, **kw
3737
try:
3838
manager = driver.DriverManager(
3939
namespace='waterbutler.providers',
40-
name=name,
40+
# with gravyvalet active, "name" is opaque id for a specific addon
41+
# instance and osf puts the provider name in settings['service']
42+
name=settings.pop('service', name),
4143
invoke_on_load=True,
4244
invoke_args=(auth, credentials, settings),
4345
invoke_kwds=kwargs,

0 commit comments

Comments
 (0)