From 09c60ba42d224fe79b1612a347d5b863901703ca Mon Sep 17 00:00:00 2001 From: Max Goodman Date: Thu, 15 Mar 2012 00:05:43 -0700 Subject: [PATCH] Switch user ids to id36s for consistency and str type keys. --- r2/r2/controllers/oauth2.py | 4 ++-- r2/r2/models/token.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/r2/r2/controllers/oauth2.py b/r2/r2/controllers/oauth2.py index 25da67509..a957a6099 100644 --- a/r2/r2/controllers/oauth2.py +++ b/r2/r2/controllers/oauth2.py @@ -128,7 +128,7 @@ class OAuth2FrontendController(RedditController): self._check_redirect_uri(client, redirect_uri) if not c.errors: - code = OAuth2AuthorizationCode._new(client._id, redirect_uri, c.user._id, scope) + code = OAuth2AuthorizationCode._new(client._id, redirect_uri, c.user._id36, scope) resp = {"code": code._id, "state": state} return self.redirect(redirect_uri+"?"+urlencode(resp), code=302) else: @@ -213,7 +213,7 @@ class OAuth2ResourceController(MinimalController): access_token = OAuth2AccessToken.get_token(self._get_bearer_token()) require(access_token) c.oauth2_access_token = access_token - account = Account._byID(access_token.user_id, data=True) + account = Account._byID36(access_token.user_id, data=True) require(account) require(not account._deleted) c.oauth_user = account diff --git a/r2/r2/models/token.py b/r2/r2/models/token.py index 6b5c5642b..33baf2823 100644 --- a/r2/r2/models/token.py +++ b/r2/r2/models/token.py @@ -241,6 +241,7 @@ class OAuth2AuthorizationCode(ConsumableToken): ] ) _int_props = ("user_id",) + _warn_on_partial_ttl = False _use_db = True _connection_pool = "main" @@ -271,7 +272,6 @@ class OAuth2AccessToken(Token): _defaults = dict(scope="", token_type="bearer", ) - _int_props = ("user_id",) _use_db = True _connection_pool = "main"