Merge pull request #32 from razakpm/main

chore: update error message #15

hub-prime/pom.xml

@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.techbd</groupId>
 	<artifactId>hub-prime</artifactId>
-	<version>0.65.2</version>
+	<version>0.65.3</version>
 	<packaging>war</packaging>
 	<name>TechBD Hub (Prime)</name>
 	<description>TechBD Hub (Primary)</description>

hub-prime/src/main/java/org/techbd/service/http/filter/GitHubUserAuthorizationFilter.java

@@ -18,7 +18,7 @@
 import java.util.Optional;
 
 public class GitHubUserAuthorizationFilter extends OncePerRequestFilter {
-
+  private static final String supportEmail = "NYeC QCS Support <[email protected]>";
   private static final Logger LOGGER = LoggerFactory.getLogger(GitHubUserAuthorizationFilter.class);
 
   static List<Controller.AuthenticatedUser> newListUsers;
@@ -30,7 +30,8 @@ protected void doFilterInternal(@NotNull HttpServletRequest request, @NotNull Ht
     try {
       newListUsers = new GitHubUserService().getUserList().users();
       for (Controller.AuthenticatedUser user : newListUsers) {
-        LOGGER.info("List of Users available in sensitive repo: \ngithub-id: {}\nname: {}\ntenantId: {}\nroles: {}",
+        LOGGER.info(
+            "[GITHUB-AUTH] List of Users available in sensitive repo: \tgithub-id: {}\tname: {}\ttenantId: {}\troles: {}",
             user.gitHubId(), user.name(), user.tenantId(), user.roles());
       }
     } catch (IOException e) {
@@ -40,12 +41,15 @@ protected void doFilterInternal(@NotNull HttpServletRequest request, @NotNull Ht
     if (authentication != null && authentication.isAuthenticated()) {
       DefaultOAuth2User authUser = (DefaultOAuth2User) authentication.getPrincipal();
       String githubId = authUser.getAttribute("login");
+      LOGGER.info("[GITHUB-AUTH] Attempted User: \t github-id: {}\t name: {}",
+          githubId, authUser.getAttribute("name"));
       Optional<Controller.AuthenticatedUser> user = newListUsers.stream()
           .filter(u -> u.gitHubId().equals(githubId) && u.roles().contains("USER"))
           .findFirst();
       if (!user.isPresent()) {
         response.setStatus(HttpServletResponse.SC_FORBIDDEN);
-        response.getWriter().write("Access Denied");
+        response.getWriter().write("You do not have permission to access this resource. Please send an email to "
+            + supportEmail + " with your GitHub ID to request access.");
         return;
       }