From 970bb352601a94e2e0c1b134a48316aeae28bb36 Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Tue, 3 Jan 2017 13:35:08 +0530
Subject: [PATCH] Adding sso by default for analytics portal application.

---
 .../distribution/src/ues/designer.json        | 32 +++++++++++++------
 .../conf/identity/sso-idp-config.xml          | 16 ++++++++++
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/modules/analytics/distribution/src/ues/designer.json b/modules/analytics/distribution/src/ues/designer.json
index 9d15c49e..116aeb3c 100644
--- a/modules/analytics/distribution/src/ues/designer.json
+++ b/modules/analytics/distribution/src/ues/designer.json
@@ -7,16 +7,21 @@
         "ignoreProviders": ["rt"]
     },
     "authentication": {
-        "activeMethod": "basic",
+        "activeMethod": "sso",
         "methods": {
             "sso": {
                 "attributes": {
-                    "issuer": "portal",
+                    "issuer": "analyticsportal",
                     "identityProviderURL": "https://localhost:9443/samlsso",
-                    "responseSigningEnabled": "false",
-                    "acs": "https://localhost:9444/portal/acs",
+                    "responseSigningEnabled": true,
+                    "validateAssertionValidityPeriod": true,
+                    "validateAudienceRestriction": true,
+                    "assertionSigningEnabled": true,
+                    "acs": "https://localhost:9445/portal/acs",
                     "identityAlias": "wso2carbon",
-                    "useTenantKey": false
+                    "defaultNameIDPolicy": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
+                    "useTenantKey": false,
+                    "isPassive": false
                 }
             },
             "basic": {
@@ -33,14 +38,14 @@
                     "oauthProvider": {
                         "appRegistration": {
                             "appType": "webapp",
-                            "clientName": "portal",
+                            "clientName": "analyticsportal",
                             "owner": "admin",
                             "password":"admin",
                             "dynamicClientAppRegistrationServiceURL": "https://localhost:9443/client-registration/v0.10/register",
-                            "apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants",
+                            "apiManagerClientAppRegistrationServiceURL": "https://localhost:9443/api-application-registration/register/tenants",
                             "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer",
                             "tokenScope": "admin",
-                            "callbackUrl": "%https.host%/portal",
+                            "callbackUrl": "https://localhost:9445/portal",
                             "saasApp":true
                         },
                         "tokenServiceURL": "https://localhost:9443/oauth2/token"
@@ -65,6 +70,15 @@
     "cacheSizeBytes": "1073741824",
     "defaultDashboardRedirect": false,
     "isCreateGadgetEnable": true,
+    "isSecureVaultEnabled" : false,
+    "assets": {
+        "gadget": {
+            "fileSizeLimit": 5
+        },
+        "layout": {
+            "fileSizeLimit": 1
+        }
+    },
     "oauth": {
         "username": "admin",
         "password": "admin"
@@ -77,4 +91,4 @@
     "queryParameters" : {
         "passBetweenPages" : ["shared"]
     }
-}
+}
\ No newline at end of file
diff --git a/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml b/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml
index 21adc90b..fb00571f 100755
--- a/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml
+++ b/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml
@@ -100,5 +100,21 @@
                 <Recipient>https://localhost:9443/oauth2/token</Recipient>
             </RecipientList>
         </ServiceProvider>
+        <ServiceProvider>
+            <Issuer>analyticsportal</Issuer>
+            <AssertionConsumerServiceURLs>
+                <AssertionConsumerServiceURL>https://localhost:9445/portal/acs</AssertionConsumerServiceURL>
+            </AssertionConsumerServiceURLs>
+            <DefaultAssertionConsumerServiceURL>https://localhost:9445/portal/acs</DefaultAssertionConsumerServiceURL>
+            <SignResponse>true</SignResponse>
+            <EnableAudienceRestriction>true</EnableAudienceRestriction>
+            <EnableRecipients>true</EnableRecipients>
+            <AudiencesList>
+                <Audience>https://localhost:9443/oauth2/token</Audience>
+            </AudiencesList>
+            <RecipientList>
+                <Recipient>https://localhost:9443/oauth2/token</Recipient>
+            </RecipientList>
+        </ServiceProvider>
     </ServiceProviders>
 </SSOIdentityProviderConfig>
\ No newline at end of file