Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration/src/main/java/org/wso2/carbon/dynamic/client/registration/impl/DynamicClientRegistrationServiceImpl.java

@@ -123,9 +123,6 @@ public class DynamicClientRegistrationServiceImpl implements DynamicClientRegist
         String grantType = profile.getGrantType();
         String callbackUrl = profile.getCallbackUrl();
         boolean isSaaSApp = profile.isSaasApp();
-        String audience = profile.getAudience();
-        String assertionConsumerURL = profile.getAssertionConsumerURL();
-        String recipientValidationURL = profile.getRecepientValidationURL();
 
         if (userId == null || userId.isEmpty()) {
             return null;
@@ -220,13 +217,6 @@ public class DynamicClientRegistrationServiceImpl implements DynamicClientRegist
 
             SAMLSSOServiceProviderDTO samlssoServiceProviderDTO = new SAMLSSOServiceProviderDTO();
             samlssoServiceProviderDTO.setIssuer(MDM);
-            samlssoServiceProviderDTO.setAssertionConsumerUrls(new String[] {assertionConsumerURL});
-            samlssoServiceProviderDTO.setDoSignResponse(true);
-            samlssoServiceProviderDTO.setRequestedAudiences(new String[] { audience });
-            samlssoServiceProviderDTO.setDefaultAssertionConsumerUrl(assertionConsumerURL);
-            samlssoServiceProviderDTO.setRequestedRecipients(new String[] {recipientValidationURL});
-            samlssoServiceProviderDTO.setDoSignAssertions(true);
-
 
             SAMLSSOConfigAdmin configAdmin = new SAMLSSOConfigAdmin(getConfigSystemRegistry());
             configAdmin.addRelyingPartyServiceProvider(samlssoServiceProviderDTO);

components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/BSTAuthenticator.java

@@ -132,7 +132,7 @@ public class BSTAuthenticator implements WebappAuthenticator {
                 authenticationInfo.setStatus(WebappAuthenticator.Status.CONTINUE);
             } else {
                 String bearerToken = new String(
-                        Base64.decodeBase64(request.getContext().findParameter("BST").getBytes()));
+                        Base64.decodeBase64(request.getAttribute("BST").toString().getBytes()));
 
                 String resource = requestUri + ":" + requestMethod;
 
@@ -198,7 +198,7 @@ public class BSTAuthenticator implements WebappAuthenticator {
         if (bstHeader == null || bstHeader.isEmpty()) {
             return false;
         }
-        request.getContext().addParameter("BST", bstHeader);
+        request.setAttribute("BST", bstHeader);
         return true;
     }