demonstrate an identity_cache

3 files changed, 18 insertions, 3 deletions

diff --git a/docs/tutorials/wiki2/src/authentication/tutorial/security.py b/docs/tutorials/wiki2/src/authentication/tutorial/security.py
index 48149d6e5..1027ddd0a 100644
--- a/docs/tutorials/wiki2/src/authentication/tutorial/security.py
+++ b/docs/tutorials/wiki2/src/authentication/tutorial/security.py
@@ -1,5 +1,6 @@
 from pyramid.authentication import AuthTktCookieHelper
 from pyramid.csrf import CookieCSRFStoragePolicy
+from pyramid.request import RequestLocalCache
 
 from . import models
 
@@ -7,8 +8,9 @@ from . import models
 class MySecurityPolicy:
     def __init__(self, secret):
         self.authtkt = AuthTktCookieHelper(secret)
+        self.identity_cache = RequestLocalCache(self.load_identity)
 
-    def authenticated_identity(self, request):
+    def load_identity(self, request):
         identity = self.authtkt.identify(request)
         if identity is None:
             return None
@@ -17,6 +19,9 @@ class MySecurityPolicy:
         user = request.dbsession.query(models.User).get(userid)
         return user
 
+    def authenticated_identity(self, request):
+        return self.identity_cache.get_or_create(request)
+
     def authenticated_userid(self, request):
         user = self.authenticated_identity(request)
         if user is not None:
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/security.py b/docs/tutorials/wiki2/src/authorization/tutorial/security.py
index 448183c95..7a99fb9e9 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/security.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/security.py
@@ -1,6 +1,7 @@
 from pyramid.authentication import AuthTktCookieHelper
 from pyramid.authorization import ACLHelper
 from pyramid.csrf import CookieCSRFStoragePolicy
+from pyramid.request import RequestLocalCache
 from pyramid.security import (
     Authenticated,
     Everyone,
@@ -12,9 +13,10 @@ from . import models
 class MySecurityPolicy:
     def __init__(self, secret):
         self.authtkt = AuthTktCookieHelper(secret)
+        self.identity_cache = RequestLocalCache(self.load_identity)
         self.acl = ACLHelper()
 
-    def authenticated_identity(self, request):
+    def load_identity(self, request):
         identity = self.authtkt.identify(request)
         if identity is None:
             return None
@@ -23,6 +25,9 @@ class MySecurityPolicy:
         user = request.dbsession.query(models.User).get(userid)
         return user
 
+    def authenticated_identity(self, request):
+        return self.identity_cache.get_or_create(request)
+
     def authenticated_userid(self, request):
         user = self.authenticated_identity(request)
         if user is not None:
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/security.py b/docs/tutorials/wiki2/src/tests/tutorial/security.py
index 448183c95..7a99fb9e9 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/security.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/security.py
@@ -1,6 +1,7 @@
 from pyramid.authentication import AuthTktCookieHelper
 from pyramid.authorization import ACLHelper
 from pyramid.csrf import CookieCSRFStoragePolicy
+from pyramid.request import RequestLocalCache
 from pyramid.security import (
     Authenticated,
     Everyone,
@@ -12,9 +13,10 @@ from . import models
 class MySecurityPolicy:
     def __init__(self, secret):
         self.authtkt = AuthTktCookieHelper(secret)
+        self.identity_cache = RequestLocalCache(self.load_identity)
         self.acl = ACLHelper()
 
-    def authenticated_identity(self, request):
+    def load_identity(self, request):
         identity = self.authtkt.identify(request)
         if identity is None:
             return None
@@ -23,6 +25,9 @@ class MySecurityPolicy:
         user = request.dbsession.query(models.User).get(userid)
         return user
 
+    def authenticated_identity(self, request):
+        return self.identity_cache.get_or_create(request)
+
     def authenticated_userid(self, request):
         user = self.authenticated_identity(request)
         if user is not None: