Merge pull request #1890 from NYPL-Simplified/qa

Deploy 4.1.5 to Production

Author: keithbauer

.gitignore

@@ -2,6 +2,9 @@
 .vscode/
 .idea/
 
+# Environments
+.venv/
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

api/authenticator.py

@@ -125,6 +125,7 @@ def __init__(self,
                  neighborhood=None,
                  cached_neighborhood=None,
                  complete=True,
+                 is_new=False,
                  ):
         """Store basic information about a patron.
 
@@ -203,6 +204,8 @@ def __init__(self,
         complete data we are likely to get for this patron from this
         data source, or is it an abbreviated version of more complete
         data we could get some other way?
+
+        :param is_new: Is this the first time we are seeing this Patron?
         """
         self.permanent_id = permanent_id
 
@@ -214,6 +217,7 @@ def __init__(self,
         self.block_reason = block_reason
         self.library_identifier = library_identifier
         self.complete = complete
+        self.is_new = is_new
 
         # We do not store personal_name in the database, but we provide
         # it to the client if possible.
@@ -442,7 +446,8 @@ def scrub(value, default=None):
             external_type=self.external_type,
             block_reason=self.block_reason,
             personal_name=self.personal_name,
-            email_address=self.email_address
+            email_address=self.email_address,
+            is_new=self.is_new,
         )
         data = dict((k, scrub(v)) for k, v in list(data.items()))
 
@@ -1787,6 +1792,8 @@ class BasicAuthenticationProvider(AuthenticationProvider, HasSelfTests):
     # indicates that no value should be used.)
     class_default = object()
 
+    patron_is_new = False
+
     def __init__(self, library, integration, analytics=None):
         """Create a BasicAuthenticationProvider.
 
@@ -1851,6 +1858,8 @@ def __init__(self, library, integration, analytics=None):
             _db, self.HTTP_BASIC_OAUTH_ENABLED, library, integration
         ).bool_value or self.HTTP_BASIC_OAUTH_ENABLED_DEFAULT
 
+        self.patron_is_new = False
+
     def remote_patron_lookup(self, patron_or_patrondata):
         """Ask the remote for information about this patron, and then make sure
         the patron belongs to the library associated with thie BasicAuthenticationProvider."""
@@ -2023,6 +2032,7 @@ def _authenticate_from_credentials(self, _db, credentials):
             # Just make sure our local data is up to date with
             # whatever we just got from remote.
             self.apply_patrondata(patrondata, patron)
+            self.patron_is_new = False
             return patron
 
         # At this point there are two possibilities:
@@ -2051,6 +2061,7 @@ def _authenticate_from_credentials(self, _db, credentials):
             # For whatever reason, the remote lookup implementation
             # returned a Patron object instead of a PatronData. Just
             # use that Patron object.
+            self.patron_is_new = False
             return patrondata
 
         # At this point we have a _complete_ PatronData object which we
@@ -2064,6 +2075,9 @@ def _authenticate_from_credentials(self, _db, credentials):
             patron, is_new = patrondata.get_or_create_patron(
                 _db, self.library_id, analytics=self.analytics
             )
+            self.patron_is_new = is_new
+        else:
+            self.patron_is_new = False
 
         # The lookup failed in the first place either because the
         # Patron did not exist on the local side, or because one of
@@ -2506,6 +2520,7 @@ def oauth_callback(self, _db, code):
         patron, is_new = patrondata.get_or_create_patron(
             _db, self.library_id, analytics=self.analytics
         )
+        patrondata.is_new = is_new
 
         # Create a credential for the Patron.
         credential, is_new = self.create_token(_db, patron, token)
@@ -2687,6 +2702,7 @@ def oauth_authentication_callback(self, _db, params):
             access_token=simplified_token,
             patron_info=patron_info,
             root_lane=root_lane,
+            is_new=patrondata.is_new,
         )
         return redirect(client_redirect_uri + "#" + urllib.parse.urlencode(params))
 
@@ -2775,6 +2791,11 @@ def get_or_create_token(self, _db, patron):
     def basic_auth_temp_token(self, params, _db):
         """Generate and return a temporary token from HTTP Basic Auth credentials.
         """
+        short_name = self.authenticator.current_library_short_name
+        providers = self.authenticator.library_authenticators[short_name].providers
+        basic_auth_providers = list(filter(lambda provider: isinstance(provider, BasicAuthenticationProvider), providers))
+        is_new = any([provider.patron_is_new for provider in basic_auth_providers])
+
         patron = self.authenticator.authenticated_patron(
             _db, flask.request.authorization)
 
@@ -2806,6 +2827,7 @@ def basic_auth_temp_token(self, params, _db):
                 token_type="bearer",
                 expires_in=BasicAuthTempTokenController.TOKEN_DURATION.seconds,
                 root_lane=root_lane,
+                is_new=is_new,
             )
 
             return flask.jsonify(data)

api/clever/__init__.py

@@ -158,6 +158,8 @@ def oauth_callback(self, _db, code):
 
         # Convert the PatronData into a Patron object.
         patron, is_new = patrondata.get_or_create_patron(_db, self.library_id)
+        if is_new:
+            patrondata.is_new = True
 
         # Create a credential for the Patron.
         credential, is_new = self.create_token(_db, patron, token)
@@ -328,7 +330,8 @@ def remote_patron_lookup(self, token):
             permanent_id=identifier,
             authorization_identifier=identifier,
             external_type=external_type,
-            complete=True
+            complete=True,
+            is_new=False,
         )
         return patrondata