Merge remote-tracking branch 'origin/version_4.2.2' into version_4.2.2

GluuFederation · Dec 9, 2020 · 1d2ec03 · 1d2ec03
2 parents 8910d5a + 8a2e7b1
commit 1d2ec03
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/Server/src/main/java/org/gluu/oxauth/service/AppInitializer.java b/Server/src/main/java/org/gluu/oxauth/service/AppInitializer.java
@@ -179,7 +179,11 @@ public class AppInitializer {
 
 	@PostConstruct
 	public void createApplicationComponents() {
-		SecurityProviderUtility.installBCProvider();
+		try {
+			SecurityProviderUtility.installBCProvider();
+		} catch (ClassCastException ex) {
+			log.error("Failed to install BC provider properly");
+		}
 	}
 
 	public void applicationInitialized(@Observes @Initialized(ApplicationScoped.class) Object init) {

diff --git a/Server/uma/sample/UmaClaimsGathering.py b/Server/uma/sample/UmaClaimsGathering.py
@@ -5,6 +5,8 @@
 #
 
 from org.gluu.model.custom.script.type.uma import UmaClaimsGatheringType
+from org.gluu.service.cdi.util import CdiUtil
+from org.gluu.oxauth.uma.service import UmaPctService
 
 class UmaClaimsGathering(UmaClaimsGatheringType):
 
@@ -85,6 +87,19 @@ def getStepsCount(self, context):
         return 2
 
     def getPageForStep(self, step, context):
+        print "Trying to get claims from PCT ..."
+        pctCode = context.getRequestParameters().get("pct")
+        if pctCode is not None:
+            pct = CdiUtil.bean(UmaPctService).getByCode(pctCode[0])
+            country = pct.getClaims().getClaimAsString("country")
+            print "Country from pct: " + country
+            city = pct.getClaims().getClaimAsString("city")
+            print "City from pct: " + city
+
+            if country == 'US' and city == 'NY':
+                return ""
+
+        print "Claims not found in pct ..."
         if step == 1:
             return "/uma2/sample/country.xhtml"
         elif step == 2: