From 25439c2dbd4ff971e2a32ac96fc893de0bdcefd3 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Mon, 30 Dec 2019 13:29:25 -0600
Subject: rename identify(request) to authenticated_identity(request)

---
 docs/narr/security.rst                                  | 14 +++++++-------
 docs/quick_tutorial/authentication/tutorial/security.py |  4 ++--
 docs/quick_tutorial/authorization/tutorial/security.py  |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'docs')

diff --git a/docs/narr/security.rst b/docs/narr/security.rst
index ac64cba0a..e3820ce19 100644
--- a/docs/narr/security.rst
+++ b/docs/narr/security.rst
@@ -69,7 +69,7 @@ A simple security policy might look like the following:
     from pyramid.security import Allowed, Denied
 
     class SessionSecurityPolicy:
-        def identify(self, request):
+        def authenticated_identity(self, request):
             """ Return app-specific user object. """
             userid = request.session.get('userid')
             if userid is None:
@@ -78,14 +78,14 @@ A simple security policy might look like the following:
 
         def authenticated_userid(self, request):
             """ Return a string ID for the user. """
-            identity = self.identify(request)
+            identity = self.authenticated_identity(request)
             if identity is None:
                 return None
             return string(identity.id)
 
         def permits(self, request, context, permission):
             """ Allow access to everything if signed in. """
-            identity = self.identify(request)
+            identity = self.authenticated_identity(request)
             if identity is not None:
                 return Allowed('User is signed in.')
             else:
@@ -144,7 +144,7 @@ For example, our above security policy can leverage these helpers like so:
         def __init__(self):
             self.helper = SessionAuthenticationHelper()
 
-        def identify(self, request):
+        def authenticated_identity(self, request):
             """ Return app-specific user object. """
             userid = self.helper.authenticated_userid(request)
             if userid is None:
@@ -153,14 +153,14 @@ For example, our above security policy can leverage these helpers like so:
 
         def authenticated_userid(self, request):
             """ Return a string ID for the user. """
-            identity = self.identify(request)
+            identity = self.authenticated_identity(request)
             if identity is None:
                 return None
             return str(identity.id)
 
         def permits(self, request, context, permission):
             """ Allow access to everything if signed in. """
-            identity = self.identify(request)
+            identity = self.authenticated_identity(request)
             if identity is not None:
                 return Allowed('User is signed in.')
             else:
@@ -249,7 +249,7 @@ might look like so:
 
     class SecurityPolicy:
         def permits(self, request, context, permission):
-            identity = self.identify(request)
+            identity = self.authenticated_identity(request)
 
             if identity is None:
                 return Denied('User is not signed in.')
diff --git a/docs/quick_tutorial/authentication/tutorial/security.py b/docs/quick_tutorial/authentication/tutorial/security.py
index acec06e7a..e8d323ea7 100644
--- a/docs/quick_tutorial/authentication/tutorial/security.py
+++ b/docs/quick_tutorial/authentication/tutorial/security.py
@@ -22,13 +22,13 @@ class SecurityPolicy:
             hashalg='sha512',
         )
 
-    def identify(self, request):
+    def authenticated_identity(self, request):
         identity = self.authtkt.identify(request)
         if identity is not None and identity['userid'] in USERS:
             return identity
 
     def authenticated_userid(self, request):
-        identity = self.identify(request)
+        identity = self.authenticated_identity(request)
         if identity is not None:
             return identity['userid']
 
diff --git a/docs/quick_tutorial/authorization/tutorial/security.py b/docs/quick_tutorial/authorization/tutorial/security.py
index a968f680d..a004a20f2 100644
--- a/docs/quick_tutorial/authorization/tutorial/security.py
+++ b/docs/quick_tutorial/authorization/tutorial/security.py
@@ -26,13 +26,13 @@ class SecurityPolicy:
         )
         self.acl = ACLHelper()
 
-    def identify(self, request):
+    def authenticated_identity(self, request):
         identity = self.authtkt.identify(request)
         if identity is not None and identity['userid'] in USERS:
             return identity
 
     def authenticated_userid(self, request):
-        identity = self.identify(request)
+        identity = self.authenticated_identity(request)
         if identity is not None:
             return identity['userid']
 
-- 
cgit v1.2.3