Repository: incubator-stratos Updated Branches: refs/heads/master 919a1e787 -> 1405d1b3d
Fixing issue STRATOS-577 Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/1405d1b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/1405d1b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/1405d1b3 Branch: refs/heads/master Commit: 1405d1b3d3ad85c78d11665d142cc180427838b7 Parents: 919a1e7 Author: Chanaka Jayasena <[email protected]> Authored: Fri Apr 11 17:32:48 2014 +0530 Committer: Chanaka Jayasena <[email protected]> Committed: Fri Apr 11 17:32:48 2014 +0530 ---------------------------------------------------------------------- .../console/controllers/login.jag | 1 + .../console/controllers/loginSubmit.jag | 51 +++++++++++--------- .../console/themes/theme1/partials/header.hbs | 6 +-- .../console/themes/theme1/ui/css/main.css | 2 +- .../themes/theme1/ui/js/tenant_management.js | 20 +++++++- .../carbon/scripts/server/server.js | 6 ++- 6 files changed, 58 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1405d1b3/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 e42719f..e60a435 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/login.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/login.jag @@ -20,6 +20,7 @@ * */ (function(){ + pri(k822); var log = new Log("controllers.login.jag"); var dataConfig = require('/config/console.js').config(); if(!dataConfig.ssoConfiguration.enabled){ http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1405d1b3/components/org.apache.stratos.manager.console/console/controllers/loginSubmit.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/loginSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/loginSubmit.jag index f2a4424..52af115 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/loginSubmit.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/loginSubmit.jag @@ -31,29 +31,36 @@ session.put("error","Enter your username and password."); } //authenticate with carbon usr-store - var auth = server.authenticate(username, password); - if(!auth){ - session.put("error","The username or password you entered is incorrect.") - }else{ - var userObject = carbon.server.tenantUser(username); - var um = new carbon.user.UserManager({}, userObject.tenantId); - var user = um.getUser(userObject.username); - var roles = user.getRoles(); - //storing in session - session.put("USER_NAME",username); - session.put("TENANT_DOMAIN",userObject.domain); - session.put("ROLE_ARRAY",roles); - //call the authentication rest-endpoint and get the JSESSION_ID - var result = utils.consoleAppUtil.getSessionCookie(username,password); - //TODO: handle the error scenario - //save the JSESSION_ID in current console.session. - var jSessionId = result.data.Success.sessionId; - session.put("JSESSIONID",jSessionId); - require('console').server.current(session,username); - } - //redirect - response.sendRedirect(request.getContextPath()+'/index.jag'); + + try{ + var auth = server.authenticate(username, password); + + if(!auth){ + session.put("error","The username or password you entered is incorrect."); + }else{ + var userObject = carbon.server.tenantUser(username); + var um = new carbon.user.UserManager({}, userObject.tenantId); + var user = um.getUser(userObject.username); + var roles = user.getRoles(); + //storing in session + session.put("USER_NAME",username); + session.put("TENANT_DOMAIN",userObject.domain); + session.put("ROLE_ARRAY",roles); + //call the authentication rest-endpoint and get the JSESSION_ID + var result = utils.consoleAppUtil.getSessionCookie(username,password); + //TODO: handle the error scenario + //save the JSESSION_ID in current console.session. + var jSessionId = result.data.Success.sessionId; + session.put("JSESSIONID",jSessionId); + require('console').server.current(session,username); + //redirect + } + response.sendRedirect(request.getContextPath()+'/index.jag'); + }catch (e){ + session.put("error",e.toString()); + response.sendRedirect(request.getContextPath()+'/index.jag'); + } }()); %> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1405d1b3/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs index 6587a22..dca5316 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs @@ -51,7 +51,7 @@ <ul class="dropdown-menu"> <!--li><a><i class="fa fa-file-text-o"></i> View Profile</a></li --> <li> - <a href="{{url "/controllers/logout.jag"}}"><i class="icons-sign-out"></i> logout</a> + <a href="{{url "/controllers/logout.jag"}}"><i class="icons-sign-out" style="font-size:11px;"></i> logout</a> </li> </ul> </li> @@ -71,8 +71,8 @@ </div> {{#if has_action_buttons}} <div class="col-lg-4 action-buttons"> - <button class="btn btn-default" onclick="manage_selected('activate')" type="button">Activate</button> - <button class="btn btn-default" onclick="manage_selected('deactivate')">Deactivate</button> + <button class="btn btn-default" onclick="manage_selected('activate')" type="button" id="activateTenantsBtn">Activate</button> + <button class="btn btn-default" onclick="manage_selected('deactivate')" type="button" id="deactivateTenantsBtn">Deactivate</button> <!--<button class="btn btn-default" onclick="manage_selected('delete')">Delete</button>--> </div> <div class="col-lg-5 help-section"> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1405d1b3/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css index e1b6623..892f78e 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css @@ -669,4 +669,4 @@ label.error{ } pre{ margin-top:20px; -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1405d1b3/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js index 69d354d..b19fb9c 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js @@ -18,6 +18,19 @@ * under the License. * */ +var toggleButtonState = function(){ + var $activateTenantsBtn = $('#activateTenantsBtn'); + var $deactivateTenantsBtn = $('#deactivateTenantsBtn'); + + if($('table input.js_domainCheck:checked').length == 0 ){ + $activateTenantsBtn.prop("disabled",true); + $deactivateTenantsBtn.prop("disabled",true); + }else{ + $activateTenantsBtn.prop("disabled",false); + $deactivateTenantsBtn.prop("disabled",false); + } +}; + $(function(){ $('#checkAll').click(function(){ @@ -26,8 +39,11 @@ $(function(){ } else{ $('table input.js_domainCheck').prop('checked',false); } + toggleButtonState(); + }); + $('table input.js_domainCheck').click(function(){ + toggleButtonState(); }); - $( "#newTenantForm" ).validate({ rules: { adminPassword: {required:true,maxlength:30,minlength:5}, @@ -37,6 +53,8 @@ $(function(){ } }); + toggleButtonState(); + }); function manage_selected(action){ var checked = ""; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1405d1b3/products/stratos/conf/temp-artifacts/carbon/scripts/server/server.js ---------------------------------------------------------------------- diff --git a/products/stratos/conf/temp-artifacts/carbon/scripts/server/server.js b/products/stratos/conf/temp-artifacts/carbon/scripts/server/server.js index 4a8a69b..ba6300d 100644 --- a/products/stratos/conf/temp-artifacts/carbon/scripts/server/server.js +++ b/products/stratos/conf/temp-artifacts/carbon/scripts/server/server.js @@ -97,7 +97,11 @@ realmService = server.osgiService('org.wso2.carbon.user.core.service.RealmService'); user = carbon.server.tenantUser(username); realm = realmService.getTenantUserRealm(user.tenantId); - return realm.getUserStoreManager().authenticate(user.username, password); + if(realm == null){ + throw new Error("Invalid domain or unactivated tenant login"); + }else{ + return realm.getUserStoreManager().authenticate(user.username, password); + } }; Server.prototype.login = function (username, password) {
