Merge branch 'fence-integration-release/0003' into Test-Open-Access-L…

…ogin-Code
hms-dbmi · Oct 17, 2023 · 60d6d42 · 60d6d42
2 parents 2fc4cf3 + 18e1e4d
commit 60d6d42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ices/src/main/java/edu/harvard/hms/dbmi/avillach/auth/data/repository/UserRepository.java b/...ices/src/main/java/edu/harvard/hms/dbmi/avillach/auth/data/repository/UserRepository.java
@@ -77,7 +77,7 @@ public List<User> listUnmatchedByConnectionId(Connection connection) {
      * @return
      */
     public User findOrCreate(User inputUser) {
-        User user;
+        User user = null;
         String subject = inputUser.getSubject();
         try {
             user = findBySubject(subject);

diff --git a/...main/java/edu/harvard/hms/dbmi/avillach/auth/service/auth/FENCEAuthenticationService.java b/...main/java/edu/harvard/hms/dbmi/avillach/auth/service/auth/FENCEAuthenticationService.java
@@ -340,7 +340,7 @@ private User createUserFromFENCEProfile(JsonNode node) {
      * @param roleDescription Description of the Role
      * @return boolean Whether the Role was successfully added to the User or not
      */
-    private boolean upsertRole(User u,  String roleName, String roleDescription) {
+    public boolean upsertRole(User u,  String roleName, String roleDescription) {
         boolean status = false;
         logger.debug("upsertRole() starting for user subject:"+u.getSubject());