From 3a2324484d9f3211ba8272e10a87ba9c7a9b7cbd Mon Sep 17 00:00:00 2001
From: Jad El-khoury <jad.el.khoury@scania.com>
Date: Thu, 19 May 2022 11:14:50 +0200
Subject: [PATCH] passing HttpServletRequest from CredentialFilter to Auth
 Class when user not logged in

---
 .../oslc4j/codegenerator/files/generateApplicationBinder.mtl  | 4 ++--
 .../codegenerator/files/generateAuthenticationApplication.mtl | 2 +-
 .../oslc4j/codegenerator/files/generateCredentialsFilter.mtl  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateApplicationBinder.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateApplicationBinder.mtl
index c9345c93..0a34e2b7 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateApplicationBinder.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateApplicationBinder.mtl
@@ -91,7 +91,7 @@ protected void configure() {
 [/template]
 
 [template public generateResourcesFactoryFactory(anAdaptorInterface : AdaptorInterface) post (trim())]
-private static final class ResourcesFactoryFactory implements Factory<[anAdaptorInterface.javaClassNameForResourcesFactory()/]> {
+private final class ResourcesFactoryFactory implements Factory<[anAdaptorInterface.javaClassNameForResourcesFactory()/]> {
     @Override
     public [anAdaptorInterface.javaClassNameForResourcesFactory()/] provide() {
         return new [anAdaptorInterface.javaClassNameForResourcesFactory()/](OSLC4JUtils.getServletURI());
@@ -105,7 +105,7 @@ private static final class ResourcesFactoryFactory implements Factory<[anAdaptor
 
 [template public generateStorePoolFactory(anAdaptorInterface : AdaptorInterface) post (trim())]
 [if (anAdaptorInterface.storeEnabled())]
-private static final class StorePoolFactory implements Factory<StorePool> {
+private final class StorePoolFactory implements Factory<StorePool> {
 
     private Optional<String> getPropertyFromEnvironment(String envKey) {
         final Map<String, String> env = System.getenv();
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAuthenticationApplication.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAuthenticationApplication.mtl
index 7bbac287..8713c2d8 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAuthenticationApplication.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAuthenticationApplication.mtl
@@ -260,7 +260,7 @@ public class [anAdaptorInterface.javaClassNameForAuthenticationApplication()/] i
      * @throws IOException
      * @throws ServletException
      */
-    public void sendUnauthorizedResponse(HttpServletResponse response, Exception e) throws IOException, ServletException {
+    public void sendUnauthorizedResponse(HttpServletRequest request, HttpServletResponse response, Exception e) throws IOException, ServletException {
         // [protected ('sendUnauthorizedResponse_init')]
         // [/protected]
         // Accept basic access or OAuth authentication.
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateCredentialsFilter.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateCredentialsFilter.mtl
index 8891780d..11c50875 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateCredentialsFilter.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateCredentialsFilter.mtl
@@ -197,7 +197,7 @@ public class [anAdaptorInterface.javaClassNameForCredentialsFilter() /] implemen
                         } catch (AuthenticationException e) {
                             // [protected ('basicAuth_authenticationException')]
                             // [/protected]
-                            authenticationApplication.sendUnauthorizedResponse(response, e);
+                            authenticationApplication.sendUnauthorizedResponse(request, response, e);
                             return;
                         } 
                     }