Updated Branches: refs/heads/master 01006fc07 -> f8dd42be9
sso fixes Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f8dd42be Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f8dd42be Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f8dd42be Branch: refs/heads/master Commit: f8dd42be9385089f638da56daa82d25d8b03b41a Parents: 01006fc Author: Pradeep Fernando <[email protected]> Authored: Sun Jan 12 18:31:56 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Sun Jan 12 18:31:56 2014 +0530 ---------------------------------------------------------------------- .../console/config/console.json | 2 +- .../console/controllers/login.jag | 8 ++++---- .../org.apache.stratos.manager.console/sso/views/login.jag | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f8dd42be/components/org.apache.stratos.manager.console/console/config/console.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/config/console.json b/components/org.apache.stratos.manager.console/console/config/console.json index 23efa7c..e91e850 100644 --- a/components/org.apache.stratos.manager.console/console/config/console.json +++ b/components/org.apache.stratos.manager.console/console/config/console.json @@ -6,7 +6,7 @@ "oauthConfiguration":{ "clientId":"", "clientSecret":"", - "tokenGrantEndpoint":"" + "tokenEndpoint":"https://localhost:9445/oauth2/token"; }, "ssoConfiguration": { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f8dd42be/components/org.apache.stratos.manager.console/console/controllers/login.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/login.jag b/components/org.apache.stratos.manager.console/console/controllers/login.jag index 828c874..a45ab4e 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/login.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/login.jag @@ -8,9 +8,9 @@ requestedPage = request.getParameter("requestedPage"), relayState = '/console',log = new Log(); log.info(dataConfig.ssoConfiguration.issuer); - var encodedSAMLAuthRequest = sso.client.getEncodedSAMLAuthRequest(dataConfig.ssoConfiguration.issuer); - postUrl = "https://"; + process.getProperty('carbon.local.ip') + ":" + process.getProperty('https.port'); - + var encodedSAMLAuthRequest = sso.client.getEncodedSAMLAuthRequest(dataConfig.ssoConfiguration.issuer); + postUrl = "https://"; + process.getProperty('carbon.local.ip') + ":" + "9443"; + log.info(postUrl); if (!session.get("Loged")) { %> @@ -19,7 +19,7 @@ <p>You are now being redirected to Identity Server. If the redirection fails, please click on the button below.</p> - <form method="post" action="<%=postUrl%>/admin/samlsso"> + <form method="post" action="<%=postUrl%>/samlsso"> <p> <input type="hidden" name="SAMLRequest" value="<%= encodedSAMLAuthRequest %>"/> <input type="hidden" name="RelayState" value="<%= relayState %>"/> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f8dd42be/components/org.apache.stratos.manager.console/sso/views/login.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/sso/views/login.jag b/components/org.apache.stratos.manager.console/sso/views/login.jag index ae57a8c..fd87a3d 100644 --- a/components/org.apache.stratos.manager.console/sso/views/login.jag +++ b/components/org.apache.stratos.manager.console/sso/views/login.jag @@ -54,7 +54,7 @@ if( e == null){ <div class="container"> <div class="row"> <div class="col-lg-12 login-box-wrapper"> - <form id="loginForm" action="/admin/commonauth" method="POST" > + <form id="loginForm" action="/commonauth" method="POST" > <div class="login-box"> <div class="login-box-top"> <h2 class="login-sub-title">Login to create cartridges</h2>
