Merge pull request #243 from GoogleCloudPlatform:deferredAuthentication

PiperOrigin-RevId: 649089202 Change-Id: I4a8d4c9b0c0787dba3f88209ad9eed238d3feb57
GoogleCloudPlatform · Jul 3, 2024 · ccb9142 · ccb9142
2 parents b8014d5 + 335fe84
commit ccb9142
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...etty12/src/main/java/com/google/apphosting/runtime/jetty/EE10AppEngineAuthentication.java b/...etty12/src/main/java/com/google/apphosting/runtime/jetty/EE10AppEngineAuthentication.java
@@ -179,10 +179,6 @@ public AuthenticationState validateRequest(Request req, Response res, Callback c
         throw new ServerAuthException("validateRequest called with null response!!!");
       }
 
-      if (AuthenticationState.Deferred.isDeferred(res)) {
-        return null;
-      }
-
       try {
         UserService userService = UserServiceFactory.getUserService();
         // If the user is authenticated already, just create a
@@ -195,6 +191,10 @@ public AuthenticationState validateRequest(Request req, Response res, Callback c
           }
         }
 
+        if (AuthenticationState.Deferred.isDeferred(res)) {
+          return null;
+        }
+
         try {
           logger.atFine().log(
               "Got %s but no one was logged in, redirecting.", request.getRequestURI());