diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/CommandOperationDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/CommandOperationDAOImpl.java
index 464597dc05..d21872b103 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/CommandOperationDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/CommandOperationDAOImpl.java
@@ -99,7 +99,7 @@ public class CommandOperationDAOImpl extends GenericOperationDAOImpl {
if (rs.next()) {
commandOperation = new CommandOperation();
- commandOperation.setEnabled(rs.getInt("ENABLED") != 0);
+ commandOperation.setEnabled(rs.getBoolean("ENABLED"));
}
} catch (SQLException e) {
throw new OperationManagementDAOException("SQL Error occurred while retrieving the command operation " +
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag
index 160a7ff517..88babb54f0 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag
@@ -22,7 +22,7 @@ var log = new Log("api/data-tables-invoker-api.jag");
var uri = request.getRequestURI();
var uriMatcher = new URIMatcher(String(uri));
-var devicemgtProps = require('/app/conf/devicemgt-props.js').config();
+var devicemgtProps = require("/app/conf/devicemgt-props.js").config();
var serviceInvokers = require("/app/modules/backend-service-invoker.js")["backendServiceInvoker"];
if (uriMatcher.match("/{context}/api/data-tables/invoker")) {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/backend-service-invoker.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/backend-service-invoker.js
index 30c5edaff8..19e5a7c379 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/backend-service-invoker.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/backend-service-invoker.js
@@ -1,43 +1,47 @@
/*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
/**
- * This backendServiceInvoker contains the wrappers for back end jaggary calls.
+ * This backendServiceInvoker contains the wrappers for back end jaggery calls.
*/
var backendServiceInvoker = function () {
var log = new Log("/app/modules/backend-service-invoker.js");
+
var publicXMLHTTPInvokers = {};
+ var publicHTTPClientInvokers = {};
+
var privateMethods = {};
var publicWSInvokers = {};
- var publicHTTPClientInvokers = {};
- var IS_OAUTH_ENABLED = true;
+
var TOKEN_EXPIRED = "Access token expired";
var TOKEN_INVALID = "Invalid input. Access token validation failed";
+
+ var devicemgtProps = require("/app/conf/devicemgt-props.js").config();
var constants = require("/app/modules/constants.js");
- var tokenUtil = require("/app/modules/api-wrapper-util.js").apiWrapperUtil;
- var devicemgtProps = require('/app/conf/devicemgt-props.js').config();
+ var userModule = require("/app/modules/user.js")["userModule"];
+ var tokenUtil = require("/app/modules/api-wrapper-util.js")["apiWrapperUtil"];
/**
- * This methoad reads the token pair from the session and return the access token.
+ * This method reads the token pair from the session and return the access token.
* If the token pair s not set in the session this will send a redirect to the login page.
*/
privateMethods.getAccessToken = function () {
- var tokenPair = session.get(constants.ACCESS_TOKEN_PAIR_IDENTIFIER);
+ var tokenPair = session.get(constants["ACCESS_TOKEN_PAIR_IDENTIFIER"]);
if (tokenPair) {
return tokenPair.accessToken;
} else {
@@ -46,152 +50,119 @@ var backendServiceInvoker = function () {
};
/**
- * This method add Oauth authentication header to outgoing XMLHTTP Requests if Oauth authentication is enabled.
- * @param method HTTP request type.
- * @param url target url.
- * @param payload payload/data which need to be send.
- * @param successCallback a function to be called if the respond if successful.
- * @param errorCallback a function to be called if en error is reserved.
+ * ---------------------------------------------------------------------------
+ * Start of XML-HTTP-REQUEST based Interceptor implementations
+ * ---------------------------------------------------------------------------
+ */
+
+ /**
+ * This method add Oauth authentication header to outgoing XML-HTTP Requests if Oauth authentication is enabled.
+ * @param httpMethod HTTP request type.
+ * @param requestPayload payload/data if exists which is needed to be send.
+ * @param endpoint Backend REST API url.
+ * @param responseCallback a function to be called with response retrieved.
* @param count a counter which hold the number of recursive execution
*/
- privateMethods.execute = function (method, url, successCallback, errorCallback, payload, count, contentType, acceptType) {
+ privateMethods.execute = function (httpMethod, requestPayload, endpoint, responseCallback, count) {
var xmlHttpRequest = new XMLHttpRequest();
- xmlHttpRequest.open(method, url);
- if(!contentType){
- contentType = constants.APPLICATION_JSON;
- }
- if(!acceptType){
- acceptType = constants.APPLICATION_JSON;
- }
- xmlHttpRequest.setRequestHeader(constants.CONTENT_TYPE_IDENTIFIER, contentType);
- xmlHttpRequest.setRequestHeader(constants.ACCEPT_IDENTIFIER, acceptType);
- xmlHttpRequest.setRequestHeader(constants.REFERER, String(privateMethods.getClientDomain()));
- if (IS_OAUTH_ENABLED) {
+
+ xmlHttpRequest.open(httpMethod, endpoint);
+ xmlHttpRequest.setRequestHeader(constants["CONTENT_TYPE_IDENTIFIER"], constants["APPLICATION_JSON"]);
+ xmlHttpRequest.setRequestHeader(constants["ACCEPT_IDENTIFIER"], constants["APPLICATION_JSON"]);
+
+ if (devicemgtProps["isOAuthEnabled"]) {
var accessToken = privateMethods.getAccessToken();
if (!accessToken) {
- response.sendRedirect(devicemgtProps["httpsURL"] + "/devicemgt/login");
+ userModule.logout(function () {
+ response.sendRedirect(devicemgtProps["appContext"] + "login");
+ });
} else {
- xmlHttpRequest.setRequestHeader(constants.AUTHORIZATION_HEADER, constants.BEARER_PREFIX + accessToken);
+ xmlHttpRequest.
+ setRequestHeader(constants["AUTHORIZATION_HEADER"], constants["BEARER_PREFIX"] + accessToken);
}
}
- if (payload) {
- xmlHttpRequest.send(payload);
+
+ if (requestPayload) {
+ xmlHttpRequest.send(requestPayload);
} else {
xmlHttpRequest.send();
}
- if ((xmlHttpRequest.status >= 200 && xmlHttpRequest.status < 300) || xmlHttpRequest.status == 302) {
- if (xmlHttpRequest.responseText != null) {
- return successCallback(parse(xmlHttpRequest.responseText));
- } else {
- return successCallback({"status": xmlHttpRequest.status, "messageFromServer": "Operation Completed"});
- }
- } else if (xmlHttpRequest.status == 401 && (xmlHttpRequest.responseText == TOKEN_EXPIRED ||
- xmlHttpRequest.responseText == TOKEN_INVALID ) && count < 5) {
+ log.debug("Service Invoker-URL: " + endpoint);
+ log.debug("Service Invoker-Method: " + httpMethod);
+
+ log.info("Request : " + httpMethod + " " + endpoint);
+ log.info("Request payload if any : " + stringify(requestPayload));
+ log.info("Response status : " + xmlHttpRequest.status);
+ log.info("Response payload if any : " + xmlHttpRequest.responseText);
+ //log.info("Response headers : " + xmlHttpRequest.getAllResponseHeaders());
+
+ if (xmlHttpRequest.status == 401 && (xmlHttpRequest.responseText == TOKEN_EXPIRED ||
+ xmlHttpRequest.responseText == TOKEN_INVALID ) && count < 5) {
tokenUtil.refreshToken();
- return privateMethods.execute(method, url, successCallback, errorCallback, payload, (count + 1));
- } else if (xmlHttpRequest.status == 500) {
- return errorCallback(xmlHttpRequest);
+ return privateMethods.execute(httpMethod, requestPayload, endpoint, responseCallback, ++count);
} else {
- return errorCallback(xmlHttpRequest);
+ return responseCallback(xmlHttpRequest);
}
};
/**
- * This method add Oauth authentication header to outgoing XMLHTTP Requests if Oauth authentication is enabled.
- * @param method HTTP request type.
- * @param url target url.
- * @param payload payload/data which need to be send.
- * @param successCallback a function to be called if the respond if successful.
- * @param errorCallback a function to be called if en error is reserved.
+ * This method add Oauth authentication header to outgoing XML-HTTP Requests if Oauth authentication is enabled.
+ * @param httpMethod HTTP request type.
+ * @param requestPayload payload/data if exists which is needed to be send.
+ * @param endpoint Backend REST API url.
+ * @param responseCallback a function to be called with response retrieved.
*/
- privateMethods.initiateXMLHTTPRequest = function (method, url, successCallback, errorCallback, payload, contentType, acceptType) {
- if (privateMethods.getAccessToken()) {
- return privateMethods.execute(method, url, successCallback, errorCallback, payload, 0, contentType, acceptType);
- }
+ privateMethods.initiateXMLHTTPRequest = function (httpMethod, requestPayload, endpoint, responseCallback) {
+ return privateMethods.execute(httpMethod, requestPayload, endpoint, responseCallback, 0);
};
/**
- * This method add Oauth authentication header to outgoing HTTPClient Requests if Oauth authentication is enabled.
- * @param method HTTP request type.
- * @param url target url.
- * @param payload payload/data which need to be send.
- * @param successCallback a function to be called if the respond if successful.
- * @param errorCallback a function to be called if en error is reserved.
+ * This method invokes return initiateXMLHttpRequest for get calls
+ * @param endpoint Backend REST API url.
+ * @param responseCallback a function to be called with response retrieved.
*/
- privateMethods.initiateHTTPClientRequest = function (method, url, successCallback, errorCallback, payload, contentType, acceptType) {
- var HttpClient = Packages.org.apache.commons.httpclient.HttpClient;
- var httpMethodObject;
- switch (method) {
- case constants.HTTP_POST:
- var PostMethod = Packages.org.apache.commons.httpclient.methods.PostMethod;
- httpMethodObject = new PostMethod(url);
- break;
- case constants.HTTP_PUT:
- var PutMethod = Packages.org.apache.commons.httpclient.methods.PutMethod;
- httpMethodObject = new PutMethod(url);
- break;
- case constants.HTTP_GET:
- var GetMethod = Packages.org.apache.commons.httpclient.methods.GetMethod;
- httpMethodObject = new GetMethod(url);
- break;
- case constants.HTTP_DELETE:
- var DeleteMethod = Packages.org.apache.commons.httpclient.methods.DeleteMethod;
- httpMethodObject = new DeleteMethod(url);
- break;
- default:
- throw new IllegalArgumentException("Invalid HTTP request type: " + method);
- }
- var Header = Packages.org.apache.commons.httpclient.Header;
- var header = new Header();
- header.setName(constants.CONTENT_TYPE_IDENTIFIER);
- header.setValue(contentType);
- httpMethodObject.addRequestHeader(header);
- header = new Header();
- header.setName(constants.ACCEPT_IDENTIFIER);
- header.setValue(acceptType);
- httpMethodObject.addRequestHeader(header);
- header = new Header();
- header.setName(constants.REFERER);
- header.setValue(String(privateMethods.getClientDomain()));
- httpMethodObject.addRequestHeader(header);
- if (IS_OAUTH_ENABLED) {
- var accessToken = privateMethods.getAccessToken();
- if (accessToken) {
- header = new Header();
- header.setName(constants.AUTHORIZATION_HEADER);
- header.setValue(constants.BEARER_PREFIX + accessToken);
- httpMethodObject.addRequestHeader(header);
- } else {
- response.sendRedirect(devicemgtProps["httpsURL"] + "/devicemgt/login");
- }
+ publicXMLHTTPInvokers.get = function (endpoint, responseCallback) {
+ var requestPayload = null;
+ return privateMethods.initiateXMLHTTPRequest(constants["HTTP_GET"], requestPayload, endpoint, responseCallback);
+ };
- }
- if (payload) {
- var stringRequestEntity = new StringRequestEntity(stringify(payload));
- httpMethodObject.setRequestEntity(stringRequestEntity);
- }
- var client = new HttpClient();
- try {
- client.executeMethod(httpMethodObject);
- var status = httpMethodObject.getStatusCode();
- if (status == 200) {
- var responseContentDispositionHeader = httpMethodObject.getResponseHeader(constants.CONTENT_DISPOSITION_IDENTIFIER);
- if (responseContentDispositionHeader) {
- return successCallback(httpMethodObject.getResponseBodyAsStream(), httpMethodObject.getResponseHeaders());
- } else {
- return successCallback(httpMethodObject.getResponseBody());
- }
- } else {
- return errorCallback(httpMethodObject.getResponseBody());
- }
- } catch (e) {
- return errorCallback(response);
- } finally {
- httpMethodObject.releaseConnection();
- }
+ /**
+ * This method invokes return initiateXMLHttpRequest for post calls
+ * @param endpoint Backend REST API url.
+ * @param requestPayload payload/data if exists which is needed to be send.
+ * @param responseCallback a function to be called with response retrieved.
+ */
+ publicXMLHTTPInvokers.post = function (endpoint, requestPayload, responseCallback) {
+ return privateMethods.initiateXMLHTTPRequest(constants["HTTP_POST"], requestPayload, endpoint, responseCallback);
+ };
+
+ /**
+ * This method invokes return initiateXMLHttpRequest for put calls
+ * @param endpoint Backend REST API url.
+ * @param requestPayload payload/data if exists which is needed to be send.
+ * @param responseCallback a function to be called with response retrieved.
+ */
+ publicXMLHTTPInvokers.put = function (endpoint, requestPayload, responseCallback) {
+ return privateMethods.initiateXMLHTTPRequest(constants["HTTP_PUT"], requestPayload, endpoint, responseCallback);
};
+ /**
+ * This method invokes return initiateXMLHttpRequest for delete calls
+ * @param endpoint Backend REST API url.
+ * @param responseCallback a function to be called with response retrieved.
+ */
+ publicXMLHTTPInvokers.delete = function (endpoint, responseCallback) {
+ var requestPayload = null;
+ return privateMethods.initiateXMLHTTPRequest(constants["HTTP_DELETE"], requestPayload, endpoint, responseCallback);
+ };
+
+ /**
+ * ---------------------------------------------------------------------------
+ * Start of WS-REQUEST based Interceptor implementations
+ * ---------------------------------------------------------------------------
+ */
+
/**
* This method add Oauth authentication header to outgoing WS Requests if Oauth authentication is enabled.
* @param action
@@ -202,32 +173,26 @@ var backendServiceInvoker = function () {
* @param soapVersion soapVersion which need to used.
*/
privateMethods.initiateWSRequest = function (action, endpoint, successCallback, errorCallback, soapVersion, payload) {
- var ws = require('ws');
+ var ws = require("ws");
var wsRequest = new ws.WSRequest();
var options = [];
- if (IS_OAUTH_ENABLED) {
+ if (devicemgtProps["isOAuthEnabled"]) {
var accessToken = privateMethods.getAccessToken();
if (accessToken) {
- var authenticationHeaderName = String(constants.AUTHORIZATION_HEADER);
- var authenticationHeaderValue = String(constants.BEARER_PREFIX + accessToken);
+ var authenticationHeaderName = String(constants["AUTHORIZATION_HEADER"]);
+ var authenticationHeaderValue = String(constants["BEARER_PREFIX"] + accessToken);
var headers = [];
var oAuthAuthenticationData = {};
oAuthAuthenticationData.name = authenticationHeaderName;
oAuthAuthenticationData.value = authenticationHeaderValue;
headers.push(oAuthAuthenticationData);
-
- var referrerData = {};
- referrerData.name = constants.REFERER;
- referrerData.value = String(privateMethods.getClientDomain());
- headers.push(referrerData);
-
options.HTTPHeaders = headers;
} else {
- response.sendRedirect(devicemgtProps["httpsURL"] + "/devicemgt/login");
+ response.sendRedirect(devicemgtProps["appContext"] + "login");
}
}
options.useSOAP = soapVersion;
- options.useWSA = constants.WEB_SERVICE_ADDRESSING_VERSION;
+ options.useWSA = constants["WEB_SERVICE_ADDRESSING_VERSION"];
options.action = action;
var wsResponse;
try {
@@ -245,68 +210,104 @@ var backendServiceInvoker = function () {
};
/**
- * This method invokes return initiateXMLHttpRequest for get calls
- * @param url target url.
+ * This method invokes return initiateWSRequest for soap calls
+ * @param action describes particular soap action.
+ * @param requestPayload SOAP request payload which is needed to be send.
+ * @param endpoint service end point to be triggered.
* @param successCallback a function to be called if the respond if successful.
* @param errorCallback a function to be called if en error is reserved.
+ * @param soapVersion soapVersion which need to used.
*/
- publicXMLHTTPInvokers.get = function (url, successCallback, errorCallback, contentType, acceptType) {
- return privateMethods.initiateXMLHTTPRequest(constants.HTTP_GET, url, successCallback, errorCallback, contentType, acceptType);
+ publicWSInvokers.soapRequest = function (action, requestPayload, endpoint, successCallback, errorCallback, soapVersion) {
+ return privateMethods.initiateWSRequest(action, endpoint, successCallback, errorCallback, soapVersion, requestPayload);
};
/**
- * This method invokes return initiateXMLHttpRequest for post calls
- * @param url target url.
- * @param payload payload/data which need to be send.
- * @param successCallback a function to be called if the respond if successful.
- * @param errorCallback a function to be called if en error is reserved.
+ * ---------------------------------------------------------------------------
+ * Start of HTTP-CLIENT-REQUEST based Interceptor implementations
+ * ---------------------------------------------------------------------------
*/
- publicXMLHTTPInvokers.post = function (url, payload, successCallback, errorCallback, contentType, acceptType) {
- return privateMethods.initiateXMLHTTPRequest(constants.HTTP_POST, url, successCallback, errorCallback, payload, contentType, acceptType);
- };
/**
- * This method invokes return initiateXMLHttpRequest for put calls
+ * This method add Oauth authentication header to outgoing HTTPClient Requests if Oauth authentication is enabled.
+ * @param method HTTP request type.
* @param url target url.
* @param payload payload/data which need to be send.
* @param successCallback a function to be called if the respond if successful.
* @param errorCallback a function to be called if en error is reserved.
*/
- publicXMLHTTPInvokers.put = function (url, payload, successCallback, errorCallback, contentType, acceptType) {
- return privateMethods.initiateXMLHTTPRequest(constants.HTTP_PUT, url, successCallback, errorCallback, payload, contentType, acceptType);
- };
-
- /**
- * This method invokes return initiateXMLHttpRequest for delete calls
- * @param url target url.
- * @param successCallback a function to be called if the respond if successful.
- * @param errorCallback a function to be called if en error is reserved.
- */
- publicXMLHTTPInvokers.delete = function (url, successCallback, errorCallback, contentType, acceptType) {
- return privateMethods.initiateXMLHTTPRequest(constants.HTTP_DELETE, url, successCallback, errorCallback, contentType, acceptType);
- };
+ privateMethods.initiateHTTPClientRequest = function (method, url, successCallback, errorCallback, payload) {
+ var HttpClient = Packages.org.apache.commons.httpclient.HttpClient;
+ var httpMethodObject;
+ switch (method) {
+ case constants["HTTP_GET"]:
+ var GetMethod = Packages.org.apache.commons.httpclient.methods.GetMethod;
+ httpMethodObject = new GetMethod(url);
+ break;
+ case constants["HTTP_POST"]:
+ var PostMethod = Packages.org.apache.commons.httpclient.methods.PostMethod;
+ httpMethodObject = new PostMethod(url);
+ break;
+ case constants["HTTP_PUT"]:
+ var PutMethod = Packages.org.apache.commons.httpclient.methods.PutMethod;
+ httpMethodObject = new PutMethod(url);
+ break;
+ case constants["HTTP_DELETE"]:
+ var DeleteMethod = Packages.org.apache.commons.httpclient.methods.DeleteMethod;
+ httpMethodObject = new DeleteMethod(url);
+ break;
+ default:
+ throw new IllegalArgumentException("Invalid HTTP request method: " + method);
+ }
+ var Header = Packages.org.apache.commons.httpclient.Header;
+ var header = new Header();
+ header.setName(constants["CONTENT_TYPE_IDENTIFIER"]);
+ header.setValue(constants["APPLICATION_JSON"]);
+ httpMethodObject.addRequestHeader(header);
+ header = new Header();
+ header.setName(constants["ACCEPT_IDENTIFIER"]);
+ header.setValue(constants["APPLICATION_JSON"]);
+ httpMethodObject.addRequestHeader(header);
- /**
- * This method invokes return initiateWSRequest for soap calls
- * @param endpoint service end point to be triggered.
- * @param payload soap payload which need to be send.
- * @param successCallback a function to be called if the respond if successful.
- * @param errorCallback a function to be called if en error is reserved.
- * @param soapVersion soapVersion which need to used.
- */
- publicWSInvokers.soapRequest = function (action, endpoint, payload, successCallback, errorCallback, soapVersion) {
- return privateMethods.initiateWSRequest(action, endpoint, successCallback, errorCallback, soapVersion, payload);
+ if (devicemgtProps["isOAuthEnabled"]) {
+ var accessToken = privateMethods.getAccessToken();
+ if (accessToken) {
+ header = new Header();
+ header.setName(constants["AUTHORIZATION_HEADER"]);
+ header.setValue(constants["BEARER_PREFIX"] + accessToken);
+ httpMethodObject.addRequestHeader(header);
+ } else {
+ response.sendRedirect(devicemgtProps["appContext"] + "login");
+ }
+ }
+ var stringRequestEntity = new StringRequestEntity(stringify(payload));
+ httpMethodObject.setRequestEntity(stringRequestEntity);
+ var client = new HttpClient();
+ try {
+ client.executeMethod(httpMethodObject);
+ var status = httpMethodObject.getStatusCode();
+ if (status == 200) {
+ return successCallback(httpMethodObject.getResponseBody());
+ } else {
+ return errorCallback(httpMethodObject.getResponseBody());
+ }
+ } catch (e) {
+ return errorCallback(response);
+ } finally {
+ method.releaseConnection();
+ }
};
-
/**
* This method invokes return initiateHTTPClientRequest for get calls
* @param url target url.
* @param successCallback a function to be called if the respond if successful.
* @param errorCallback a function to be called if en error is reserved.
*/
- publicHTTPClientInvokers.get = function (url, successCallback, errorCallback, contentType, acceptType) {
- return privateMethods.initiateHTTPClientRequest(constants.HTTP_GET, url, successCallback, errorCallback, null, contentType, acceptType);
+ publicHTTPClientInvokers.get = function (url, successCallback, errorCallback) {
+ var requestPayload = null;
+ return privateMethods.
+ initiateHTTPClientRequest(constants["HTTP_GET"], url, successCallback, errorCallback, requestPayload);
};
/**
@@ -316,9 +317,9 @@ var backendServiceInvoker = function () {
* @param successCallback a function to be called if the respond if successful.
* @param errorCallback a function to be called if en error is reserved.
*/
- publicHTTPClientInvokers.post = function (url, payload, successCallback, errorCallback, contentType, acceptType) {
+ publicHTTPClientInvokers.post = function (url, payload, successCallback, errorCallback) {
return privateMethods.
- initiateHTTPClientRequest(constants.HTTP_POST, url, successCallback, errorCallback, payload, contentType, acceptType);
+ initiateHTTPClientRequest(constants["HTTP_POST"], url, successCallback, errorCallback, payload);
};
/**
@@ -328,8 +329,9 @@ var backendServiceInvoker = function () {
* @param successCallback a function to be called if the respond if successful.
* @param errorCallback a function to be called if en error is reserved.
*/
- publicHTTPClientInvokers.put = function (url, payload, successCallback, errorCallback, contentType, acceptType) {
- return privateMethods.initiateHTTPClientRequest(constants.HTTP_PUT, url, successCallback, errorCallback, payload, contentType, acceptType);
+ publicHTTPClientInvokers.put = function (url, payload, successCallback, errorCallback) {
+ return privateMethods.
+ initiateHTTPClientRequest(constants["HTTP_PUT"], url, successCallback, errorCallback, payload);
};
/**
@@ -338,23 +340,16 @@ var backendServiceInvoker = function () {
* @param successCallback a function to be called if the respond if successful.
* @param errorCallback a function to be called if en error is reserved.
*/
- publicHTTPClientInvokers.delete = function (url, successCallback, errorCallback, contentType, acceptType) {
- return privateMethods.initiateHTTPClientRequest(constants.HTTP_DELETE, url, successCallback, errorCallback, contentType, acceptType);
+ publicHTTPClientInvokers.delete = function (url, successCallback, errorCallback) {
+ var requestPayload = null;
+ return privateMethods.
+ initiateHTTPClientRequest(constants["HTTP_DELETE"], url, successCallback, errorCallback, requestPayload);
};
- /**
- * This method fetch the current logged user from the session and returns
- * the tenant domain name of the user
- * @returns {tenantDomain}
- */
- privateMethods.getClientDomain = function () {
- var user = session.get(constants.USER_SESSION_KEY);
- return user.domain;
- }
+ var publicMethods = {};
+ publicMethods.XMLHttp = publicXMLHTTPInvokers;
+ publicMethods.WS = publicWSInvokers;
+ publicMethods.HttpClient = publicHTTPClientInvokers;
- var publicInvokers = {};
- publicInvokers.XMLHttp = publicXMLHTTPInvokers;
- publicInvokers.WS = publicWSInvokers;
- publicInvokers.HttpClient = publicHTTPClientInvokers;
- return publicInvokers;
-}();
\ No newline at end of file
+ return publicMethods;
+}();
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/util.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/util.js
index 1deb5c6093..3334ea6664 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/util.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/util.js
@@ -25,11 +25,12 @@ var util = function () {
var carbon = require('carbon');
var constants = require("/app/modules/constants.js");
var adminUser = devicemgtProps["adminUser"];
+ var clientName = devicemgtProps["clientName"];
module.getDyanmicCredentials = function (owner) {
var payload = {
"callbackUrl": devicemgtProps.callBackUrl,
- "clientName": "devicemgt",
+ "clientName": clientName,
"tokenScope": "admin",
"owner": adminUser,
"applicationType": "webapp",
@@ -79,7 +80,7 @@ var util = function () {
*/
module.getTokenWithPasswordGrantType = function (username, password, encodedClientKeys, scope) {
var xhr = new XMLHttpRequest();
- var tokenEndpoint = devicemgtProps.idPServer + "/token";
+ var tokenEndpoint = devicemgtProps.idPServer;
xhr.open("POST", tokenEndpoint, false);
xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
xhr.setRequestHeader("Authorization", "Basic " + encodedClientKeys);
@@ -119,7 +120,7 @@ var util = function () {
encodedExtractedAssertion = this.encode(extractedAssertion);
var xhr = new XMLHttpRequest();
- var tokenEndpoint = devicemgtProps.idPServer + "/token";
+ var tokenEndpoint = devicemgtProps.idPServer;
xhr.open("POST", tokenEndpoint, false);
xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
xhr.setRequestHeader("Authorization", "Basic " + clientKeys);
@@ -140,7 +141,7 @@ var util = function () {
module.refreshToken = function (tokenPair, clientData, scope) {
var xhr = new XMLHttpRequest();
- var tokenEndpoint = devicemgtProps.idPServer + "/token";
+ var tokenEndpoint = devicemgtProps.idPServer;
xhr.open("POST", tokenEndpoint, false);
xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
xhr.setRequestHeader("Authorization", "Basic " + clientData);
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
index 6c29b73a40..2ef13959c3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
@@ -1,21 +1,23 @@
/*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
+var deviceMgtAPIsBasePath = "/api/device-mgt/v1.0";
+
/**
* Checks if provided input is valid against RegEx input.
*
@@ -35,10 +37,10 @@ function inputIsValid(regExp, inputString) {
$(function () {
var sortableElem = '.wr-sortable';
$(sortableElem).sortable({
- beforeStop: function () {
- var sortedIDs = $(this).sortable('toArray');
- }
- });
+ beforeStop: function () {
+ $(this).sortable('toArray');
+ }
+ });
$(sortableElem).disableSelection();
});
@@ -46,11 +48,9 @@ var modalPopup = ".wr-modalpopup";
var modalPopupContainer = modalPopup + " .modalpopup-container";
var modalPopupContent = modalPopup + " .modalpopup-content";
var body = "body";
-var isInit = true;
+//var isInit = true;
$(".icon .text").res_text(0.2);
-var resetPasswordServiceURL = "/devicemgt_admin/users/reset-password";
-
/*
* set popup maximum height function.
*/
@@ -80,11 +80,9 @@ function hidePopup() {
*/
function getSelectedUsernames() {
var usernameList = [];
- var userList = $("#user-grid").find('> tbody > tr');
+ var userList = $("#user-grid").find('tr.DTTT_selected');
userList.each(function () {
- if ($(this).hasClass('DTTT_selected')) {
- usernameList.push($(this).attr('data-username'));
- }
+ usernameList.push($(this).data('username'));
});
return usernameList;
}
@@ -96,7 +94,7 @@ function getSelectedUsernames() {
*/
$("a.invite-user-link").click(function () {
var usernameList = getSelectedUsernames();
- var inviteUserAPI = "/devicemgt_admin/users/email-invitation";
+ var inviteUserAPI = deviceMgtAPIsBasePath + "/users/send-invitation";
if (usernameList.length == 0) {
$(modalPopupContent).html($("#errorUsers").html());
@@ -108,20 +106,25 @@ $("a.invite-user-link").click(function () {
$("a#invite-user-yes-link").click(function () {
invokerUtil.post(
- inviteUserAPI,
- usernameList,
- function () {
+ inviteUserAPI,
+ usernameList,
+ // The success callback
+ function (data, textStatus, jqXHR) {
+ if (jqXHR.status == 200) {
$(modalPopupContent).html($('#invite-user-success-content').html());
$("a#invite-user-success-link").click(function () {
hidePopup();
});
- },
- function () {
- $(modalPopupContent).html($('#invite-user-error-content').html());
- $("a#invite-user-error-link").click(function () {
- hidePopup();
- });
}
+ },
+ // The error callback
+ function (jqXHR) {
+ console.log("error in invite-user API, status code: " + jqXHR.status);
+ $(modalPopupContent).html($('#invite-user-error-content').html());
+ $("a#invite-user-error-link").click(function () {
+ hidePopup();
+ });
+ }
);
});
@@ -137,16 +140,17 @@ $("a.invite-user-link").click(function () {
*/
function removeUser(uname, uid) {
var username = uname;
- var userid = uid;
- var removeUserAPI = "/devicemgt_admin/users?username=" + username;
+ var userId = uid;
+ var removeUserAPI = deviceMgtAPIsBasePath + "/users/" + username;
$(modalPopupContent).html($('#remove-user-modal-content').html());
showPopup();
$("a#remove-user-yes-link").click(function () {
invokerUtil.delete(
- removeUserAPI,
- function () {
- $("#" + userid).remove();
+ removeUserAPI,
+ function (data, textStatus, jqXHR) {
+ if (jqXHR.status == 200) {
+ $("#" + userId).remove();
// get new user-list-count
var newUserListCount = $(".user-list > span").length;
// update user-listing-status-msg with new user-count
@@ -156,13 +160,16 @@ function removeUser(uname, uid) {
$("a#remove-user-success-link").click(function () {
hidePopup();
});
- },
- function () {
- $(modalPopupContent).html($('#remove-user-error-content').html());
- $("a#remove-user-error-link").click(function () {
- hidePopup();
- });
}
+ },
+ // The error callback
+ function (jqXHR) {
+ console.log("error in remove-user API, status code: " + jqXHR.status);
+ $(modalPopupContent).html($('#remove-user-error-content').html());
+ $("a#remove-user-error-link").click(function () {
+ hidePopup();
+ });
+ }
);
});
@@ -202,29 +209,30 @@ function resetPassword(uname) {
$(errorMsgWrapper).removeClass("hidden");
} else {
var resetPasswordFormData = {};
- resetPasswordFormData.username = user;
- resetPasswordFormData.newPassword = window.btoa(unescape(encodeURIComponent(confirmedPassword)));
+ //resetPasswordFormData.username = user;
+ resetPasswordFormData.newPassword = unescape(confirmedPassword);
+
+ var resetPasswordServiceURL = deviceMgtAPIsBasePath + "/admin/users/"+ user +"/credentials";
invokerUtil.post(
- resetPasswordServiceURL,
- resetPasswordFormData,
- function (data) { // The success callback
- data = JSON.parse(data);
- if (data.statusCode == 201) {
- $(modalPopupContent).html($('#reset-password-success-content').html());
- $("a#reset-password-success-link").click(function () {
- hidePopup();
- });
- }
- }, function (data) { // The error callback
- if (data.statusCode == 400) {
- $(errorMsg).text("Old password does not match with the provided value.");
- $(errorMsgWrapper).removeClass("hidden");
- } else {
- $(errorMsg).text("An unexpected error occurred. Please try again later.");
- $(errorMsgWrapper).removeClass("hidden");
- }
+ resetPasswordServiceURL,
+ resetPasswordFormData,
+ // The success callback
+ function (data, textStatus, jqXHR) {
+ if (jqXHR.status == 200) {
+ $(modalPopupContent).html($('#reset-password-success-content').html());
+ $("a#reset-password-success-link").click(function () {
+ hidePopup();
+ });
}
+ },
+ // The error callback
+ function (jqXHR) {
+ console.log("error in reset-password API, status code: " + jqXHR.status);
+ var payload = JSON.parse(jqXHR.responseText);
+ $(errorMsg).text(payload.message);
+ $(errorMsgWrapper).removeClass("hidden");
+ }
);
}
});
@@ -250,7 +258,7 @@ $("#search-btn").click(function () {
* when a user clicks on the list item
* initial mode and with out select mode.
*/
-function InitiateViewOption() {
+function initiateViewOption() {
if ($("#can-view").val()) {
$(location).attr('href', $(this).data("url"));
} else {
@@ -259,74 +267,112 @@ function InitiateViewOption() {
}
}
-function loadUsers(searchParam) {
- $("#loading-content").show();
- var userListing = $("#user-listing");
- var userListingSrc = userListing.attr("src");
- $.template("user-listing", userListingSrc, function (template) {
- var serviceURL = "/devicemgt_admin/users";
- if (searchParam) {
- serviceURL = serviceURL + "/view-users?username=" + searchParam;
- }
- var successCallback = function (data) {
- if (!data) {
- $('#ast-container').addClass('hidden');
- $('#user-listing-status-msg').text('No users are available to be displayed.');
- return;
+function loadUsers() {
+ var loadingContentIcon = "#loading-content";
+ $(loadingContentIcon).show();
+
+ var dataFilter = function (data) {
+ data = JSON.parse(data);
+
+ var objects = [];
+
+ $(data.users).each(function (index) {
+ objects.push({
+ username: data.users[index].username,
+ firstname: data.users[index].firstname ? data.users[index].firstname: '' ,
+ lastname: data.users[index].lastname ? data.users[index].lastname : '',
+ emailAddress : data.users[index].emailAddress ? data.users[index].emailAddress: '',
+ DT_RowId : "role-" + data.users[index].username})
+ });
+
+ var json = {
+ "recordsTotal": data.count,
+ "recordsFiltered": data.count,
+ "data": objects
+ };
+
+ return JSON.stringify(json);
+ };
+
+ var fnCreatedRow = function(nRow, aData, iDataIndex) {
+ console.log(JSON.stringify(aData));
+ $(nRow).attr('data-type', 'selectable');
+ $(nRow).attr('data-username', aData["username"]);
+ };
+
+ var columns = [
+ {
+ class: "remove-padding icon-only content-fill",
+ data: null,
+ defaultContent:
+ '