From 159cb9f60000e27ed04197571ddb29da19faa552 Mon Sep 17 00:00:00 2001
From: Keith Mitchell <kemitche@reddit.com>
Date: Tue, 2 Dec 2014 10:41:12 -0800
Subject: [PATCH] Prefix OAuth2 Access Tokens with user ID

---
 r2/r2/models/token.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/r2/r2/models/token.py b/r2/r2/models/token.py
index afd800e37..f2ee32bae 100644
--- a/r2/r2/models/token.py
+++ b/r2/r2/models/token.py
@@ -572,7 +572,13 @@ class OAuth2AccessToken(Token):
 
     @classmethod
     def _new(cls, client_id, user_id, scope, refresh_token=None, device_id=None):
+        try:
+            user_id_prefix = int(user_id, 36)
+        except (ValueError, TypeError):
+            user_id_prefix = ""
+        _id = "%s-%s" % (user_id_prefix, cls._generate_unique_token())
         return super(OAuth2AccessToken, cls)._new(
+                     _id=_id,
                      client_id=client_id,
                      user_id=user_id,
                      scope=str(scope),