From f4824c6c6c6a036c5d01b7a6710f51477a49a3fb Mon Sep 17 00:00:00 2001
From: Arnab Dutta <32794267+duttarnab@users.noreply.github.com>
Date: Mon, 30 May 2022 22:25:21 +0530
Subject: [PATCH] feat: fix the dependencies and code issues (#1473)

---
 .../src/main/java/io/jans/configapi/util/ApiConstants.java | 2 +-
 jans-config-api/plugins/admin-ui-plugin/pom.xml            | 7 -------
 .../plugin/fido2/service/Fido2RegistrationService.java     | 4 +---
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/jans-config-api/common/src/main/java/io/jans/configapi/util/ApiConstants.java b/jans-config-api/common/src/main/java/io/jans/configapi/util/ApiConstants.java
index c0561e45b36..79b3dac5420 100644
--- a/jans-config-api/common/src/main/java/io/jans/configapi/util/ApiConstants.java
+++ b/jans-config-api/common/src/main/java/io/jans/configapi/util/ApiConstants.java
@@ -73,7 +73,7 @@ private ApiConstants() {}
     public static final String USER = "/user";
     public static final String ORG = "/org";
     public static final String SERVER_STAT = "/server-stat";
-    public static final String USERNAME_PATH = "{username}";
+    public static final String USERNAME_PATH = "/{username}";
 
     public static final String LIMIT = "limit";
     public static final String START_INDEX = "startIndex";
diff --git a/jans-config-api/plugins/admin-ui-plugin/pom.xml b/jans-config-api/plugins/admin-ui-plugin/pom.xml
index 9d1e3ff92e8..beee5b036c3 100644
--- a/jans-config-api/plugins/admin-ui-plugin/pom.xml
+++ b/jans-config-api/plugins/admin-ui-plugin/pom.xml
@@ -10,13 +10,6 @@
     <groupId>io.jans.jans-config-api.plugins</groupId>
     <artifactId>admin-ui-plugin</artifactId>
 
-    <repositories>
-        <repository>
-            <id>jdk-java</id>
-            <url>https://licensespring-maven.s3.eu-central-1.amazonaws.com/</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <!-- config api -->
         <dependency>
diff --git a/jans-config-api/plugins/fido2-plugin/src/main/java/io/jans/configapi/plugin/fido2/service/Fido2RegistrationService.java b/jans-config-api/plugins/fido2-plugin/src/main/java/io/jans/configapi/plugin/fido2/service/Fido2RegistrationService.java
index 44b89fa2b4c..ec149d7e0a4 100644
--- a/jans-config-api/plugins/fido2-plugin/src/main/java/io/jans/configapi/plugin/fido2/service/Fido2RegistrationService.java
+++ b/jans-config-api/plugins/fido2-plugin/src/main/java/io/jans/configapi/plugin/fido2/service/Fido2RegistrationService.java
@@ -73,11 +73,9 @@ public List<Fido2RegistrationEntry> findAllRegisteredByUsername(String username)
             }
         }
 
-        Filter userInumFilter = Filter.createEqualityFilter("personInum", userInum);
         Filter registeredFilter = Filter.createEqualityFilter("jansStatus", Fido2RegistrationStatus.registered.getValue());
-        Filter filter = Filter.createANDFilter(userInumFilter, registeredFilter);
 
-        List<Fido2RegistrationEntry> fido2RegistrationnEntries = persistenceEntryManager.findEntries(baseDn, Fido2RegistrationEntry.class, filter);
+        List<Fido2RegistrationEntry> fido2RegistrationnEntries = persistenceEntryManager.findEntries(baseDn, Fido2RegistrationEntry.class, registeredFilter);
 
         return fido2RegistrationnEntries;
     }