diff --git a/requirements.txt b/requirements.txt index 0ddcf25..d68de0c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,5 +9,5 @@ unittest2==1.1 zope.component==4.2.1 configparser==3.5 mozsvc==0.9 -https://github.com/mozilla-services/tokenserver/archive/1.2.27.zip -https://github.com/mozilla-services/server-syncstorage/archive/1.6.12.zip +https://github.com/mozilla-services/tokenserver/archive/1.3.0.zip +https://github.com/mozilla-services/server-syncstorage/archive/1.6.13.zip diff --git a/syncserver/__init__.py b/syncserver/__init__.py index 108ac4b..40ac95b 100644 --- a/syncserver/__init__.py +++ b/syncserver/__init__.py @@ -116,6 +116,11 @@ def includeme(config): issuer = urlparse(idp_config["auth_server_base_url"]).netloc settings["browserid.trusted_issuers"] = [issuer] settings["browserid.allowed_issuers"] = [issuer] + if "oauth.backend" not in settings: + settings["oauth.backend"] = "tokenserver.verifiers.RemoteOAuthVerifier" + # If an IdP was specified, use it for oauth verification. + if idp is not None: + settings["oauth.server_url"] = idp_config["oauth_server_base_url"] if "loggers" not in settings: # Default to basic logging config. root_logger = logging.getLogger("")