fixing jaggery app performance issue

modules/distribution/src/repository/jaggeryapps/iotserver/api/device-api.jag

@@ -33,27 +33,88 @@ var carbonHttpsServletTransport = carbon.server.address('https');
 
 var result;
 
-if (uriMatcher.match("/{context}/api/device/sketch/download")) {
+if (uriMatcher.match("/{context}/api/device/sketch/download/{downloadId}")) {
-	sketchType = request.getParameter("sketchType");
+	downloadId = uriMatcher.elements().downloadId;
-	deviceType = request.getParameter("deviceType");
+	if(downloadId){
+		//Just download the already created zip archive
+		var CarbonUtils = Packages.org.wso2.carbon.utils.CarbonUtils;
+		var sketchFolder = "repository/resources/sketches";
+		var archivesPath = "file://"+CarbonUtils.getCarbonHome() + "/" + sketchFolder + "/archives/" + downloadId + ".zip";
+		var zipFile = new File(archivesPath);
+		response.addHeader('Content-type', "application/zip, application/octet-stream");
+		response.addHeader('Cache-Control', 'public,max-age=12960000');
+		response.addHeader("Content-Disposition", "attachment; filename=\"" + downloadId + ".zip\"");
+
+		try {
+			zipFile.open('r');
+			var stream = zipFile.getStream();
+			print(stream);
+		}catch(err){
+
+		}finally{
+			if(zipFile!=null) {
+				zipFile.close();
+			}
+		}
 
-	if (!sketchType) {
+	}else {
-		log.error("Sketch Type is empty");
+		//Create a new zip archive and register user calling endpoint
-	}
 
-	var user = session.get(constants.USER_SESSION_KEY);
+		/* This should match with $CARBON_HOME/repository/resources/sketches/{sketchType} */
-	if (!user) {
+		sketchType = request.getParameter("sketchType");
-		response.sendRedirect(dcProps.appContext + "login?#login-required");
+		/* This should be registered device type of the CDMF(Connected Device Management Framework) */
-		exit();
+		deviceType = request.getParameter("deviceType");
+
+		if (!sketchType) {
+			log.error("Sketch Type is empty!");
+			// http status code 400 refers to - Bad request.
+			result = 400;
+		} else {
+			var user = session.get(constants.USER_SESSION_KEY);
+
+			if (!user) {
+				response.sendRedirect(dcProps.appContext + "login?#login-required");
+				exit();
+			}
+
+			//URL: https://localhost:9443/{deviceType}/download?owner={username}
+			deviceManagerService = carbonHttpsServletTransport + "/" + deviceType + "/manager";
+
+			sketchDownloadEndPoint = deviceManagerService + "/device/" + sketchType + "/download";
+			response.sendRedirect(sketchDownloadEndPoint + "?owner=" + user.username);
+			exit();//stop execution
+
+		}
 	}
 
-	//URL: https://localhost:9443/{deviceType}/download?owner={username}
+} else if (uriMatcher.match("/{context}/api/device/sketch/generate_link")) {
-	deviceManagerService = carbonHttpsServletTransport + "/" + deviceType + "/manager";
+
-	sketchDownloadEndPoint = deviceManagerService + "/device/" + sketchType + "/download";
+	var contents = request.getContent();
-	response.sendRedirect(sketchDownloadEndPoint + "?owner=" + user.username);
+	sketchType = contents.sketchType;
-	exit();//stop execution
+	deviceType = contents.deviceType;
+	generateLink = contents.generateLink;
+
+	if (!sketchType) {
+		log.error("Sketch Type is empty!");
+		// http status code 400 refers to - Bad request.
+		result = 400;
+	} else {
+		var user = session.get(constants.USER_SESSION_KEY);
+
+		if (!user) {
+			result = 403;
+		}else {
+			//URL: https://localhost:9443/{deviceType}/download?owner={username}
+			deviceManagerService = carbonHttpsServletTransport + "/" + deviceType + "/manager";
+
+			sketchGenerateLinkEndPoint = deviceManagerService + "/device/" + sketchType + "/generate_link";
+			var fileId = get(sketchGenerateLinkEndPoint + "?owner=" + user.username, null, "text");
+			result = carbonHttpsServletTransport + constants.WEB_APP_CONTEXT + "/api/device/sketch/download/" + fileId.data;
+		}
+	}
 
 } else if (uriMatcher.match("/{context}/api/devices/all")) {
+
 	var user = session.get(constants.USER_SESSION_KEY);
 	if (!user) {
 		response.sendRedirect(dcProps.appContext + "login?#login-required");

modules/distribution/src/repository/jaggeryapps/iotserver/api/operation-api.jag

@@ -0,0 +1,31 @@
+<%
+/*
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+var uri = request.getRequestURI();
+var uriMatcher = new URIMatcher(String(uri));
+
+var log = new Log("api/operation-api.jag");
+
+var deviceModule = require("/modules/device.js").deviceModule;
+
+if (uriMatcher.match("/{context}/api/operation")) {
+    payload = request.getContent();
+    result = deviceModule.performOperation(payload.devices, payload.operation);
+}
+%>

modules/distribution/src/repository/jaggeryapps/iotserver/api/policy-api.jag

@@ -0,0 +1,49 @@
+<%
+/*
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+var uri = request.getRequestURI();
+var uriMatcher = new URIMatcher(String(uri));
+
+var log = new Log("api/policy-api.jag");
+
+var constants = require("/modules/constants.js");
+var dcProps = require('/config/dc-props.js').config();
+var policyModule = require("/modules/policy.js").policyModule;
+
+var result;
+if (uriMatcher.match("/{context}/api/policies/update")) {
+    payload = request.getContent();
+    policyModule.updatePolicyPriorities(payload);
+} else if (uriMatcher.match("/{context}/api/policies/{id}/delete")) {
+    elements = uriMatcher.elements();
+    policyId = elements.id;
+    try {
+        result = policyModule.deletePolicy(policyId);
+    } catch (e) {
+        log.error("Exception occurred while trying to delete policy for id:" + policyId, e);
+        // http status code 500 refers to - Internal Server Error.
+        result = 500;
+    }
+}
+
+// returning the result.
+if (result) {
+    response.content = result;
+}
+%>

modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag

@@ -128,7 +128,7 @@ function getSensorData(table, column, user, deviceId, from, to) {
 	try {
 		fetchedData = statsClient.getDeviceStats(table, column, user, deviceId, from, to);
 	}catch(error){
-		log.info(error);
+		log.error(error);
 	}
 
 	var sensorData = [];

modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag

@@ -25,7 +25,8 @@ var log = new Log("api/user-api.jag");
 var constants = require("/modules/constants.js");
 var dcProps = require('/config/dc-props.js').config();
 var userModule = require("/modules/user.js").userModule;
-var utility = require("/modules/utility.js").utility;
+var deviceModule = require("/modules/device.js").deviceModule;
+var deviceManagementService = utility.getDeviceManagementService();
 
 var result;
 
@@ -40,7 +41,15 @@ if (uriMatcher.match("/{context}/api/user/login/")) {
 			if (log.isDebugEnabled()) {
 				log.debug("User Logged In : " + user);
 			}
-			response.sendRedirect(constants.WEB_APP_CONTEXT);
+
+			var hasDevcies = (deviceManagementService.getDeviceListOfUser(username).size() >= 1);
+
+			if(hasDevcies){
+				response.sendRedirect(constants.WEB_APP_CONTEXT+"/devices");
+			}else{
+				response.sendRedirect(constants.WEB_APP_CONTEXT);
+			}
+
 		}, function () {
 			response.sendRedirect(dcProps.appContext + "login?#auth-failed");
 		});

modules/distribution/src/repository/jaggeryapps/iotserver/config/init.js

@@ -25,4 +25,4 @@ var carbonServer = new carbonModule.server.Server({
 application.put("carbonServer", carbonServer);
 var userModule = require("/modules/user.js").userModule;
 var utility = require("/modules/utility.js").utility;
-utility.insertAppPermissions(userModule, "init");
+utility.insertAppPermissions(userModule, "init");

modules/distribution/src/repository/jaggeryapps/iotserver/jaggery.conf

@@ -3,17 +3,25 @@
   "logLevel": "info",
   "initScripts": ["/config/init.js"],
   "urlMappings": [
+    {
+      "url" : "/testb/*",
+      "path" : "test.jag"
+    },
     {
       "url" : "/test/*",
       "path" : "test/testExecutor.jag"
     },
     {
-          "url": "/api/device/*",
+      "url": "/api/device/*",
-          "path": "/api/device-api.jag"
+      "path": "/api/device-api.jag"
+    },
+    {
+      "url": "/api/devices/*",
+      "path": "/api/device-api.jag"
     },
     {
-              "url": "/api/devices/*",
+      "url": "/api/operation/*",
-              "path": "/api/device-api.jag"
+      "path": "/api/operation-api.jag"
     },
     {
       "url": "/api/user/*",
@@ -27,6 +35,10 @@
       "url": "/api/stats/*",
       "path": "/api/stats-api.jag"
     },
+    {
+      "url": "/api/policies/*",
+      "path": "/api/policy-api.jag"
+    },
     {
       "url": "/sso/login",
       "path": "/lib/login.jag"
@@ -44,4 +56,4 @@
       "path": "/lib/fuse.jag"
     }
   ]
-}
+}

modules/distribution/src/repository/jaggeryapps/iotserver/layouts/fluid-backup.hbs

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>{{ defineZone "title"}}</title>
+    {{ defineZone "topCss"}}
+</head>
+<body>
+
+<div class="navbar navbar-default navbar-fixed-top" role="navigation">
+    <div class="container-liquid">
+        <div class="navbar-header">
+            <a class="navbar-brand" href="#">{{defineZone "brand"}}</a>
+        </div>
+        <div class="navbar-collapse collapse">
+            <ul class="nav navbar-nav navbar-right">
+                <li><a href="/login">Login</a></li>
+                {{ defineZone "upperRight"}}
+            </ul>
+        </div>
+    </div>
+</div>
+
+<div id="wrap">
+    <div class="container-fluid">
+        <div class="row">
+            {{ defineZone "content"}}
+        </div>
+    </div>
+    <!-- /container -->
+</div>
+
+<div class="footer">
+    <div class="container">
+        <div class="row">
+            <div class="col-md-12">
+                {{ defineZone "footer"}}
+            </div>
+        </div>
+    </div>
+</div>
+
+</body>
+</html>

modules/distribution/src/repository/jaggeryapps/iotserver/layouts/fluid.hbs

@@ -1,14 +1,15 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
-<head>
+    <head>
-    <meta charset="utf-8">
+        <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="icon" href="favicon.png" type="image/x-icon" />
-    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+        {{defineZone "favicon"}}
-    <title>{{ defineZone "title"}}</title>
+        <title>
-    {{ defineZone "topLibCss"}}
+            {{ defineZone "title"}}
-    {{ defineZone "topCss"}}
+        </title>
-    {{ defineZone "topJs"}}
+        {{ defineZone "topLibCss"}}
+        {{ defineZone "topCss"}}
     </head>
     <body>
     <div class="wr-modalpopup">
@@ -32,6 +33,7 @@
         {{ defineZone "body"}}
         {{ defineZone "footer"}}
     </div>
+    {{ defineZone "bottomjquery" }}
     {{ defineZone "bottomLibJs" }}
     {{ defineZone "bottomJs" }}
     </body>

modules/distribution/src/repository/jaggeryapps/iotserver/lib/acs.jag

@@ -22,6 +22,8 @@ var sso = require('/modules/sso.js').sso;
 var constants = require('/modules/constants.js');
 var carbonModule = require("carbon");
 var log = new Log();
+var apiWrapperUtil = require("/modules/api-wrapper-util.js").apiWrapperUtil;
+var userModule = require("/modules/user.js").userModule;
 var keyStoreParams = {
     keyStoreName: dataConfig.ssoConfiguration.keyStoreName,
     keyStorePassword: dataConfig.ssoConfiguration.keyStorePassword,
@@ -31,14 +33,18 @@ sso.configure(dataConfig.ssoConfiguration.issuer,
                     dataConfig.ssoConfiguration.appName,
                             keyStoreParams, dataConfig.ssoConfiguration.identityProviderURL);
 sso.acs(
-    function(loggedInUser) {
+    function(loggedInUser, samlResponse) {
         var carbonUser = carbonModule.server.tenantUser(loggedInUser);
         session.put(constants.USER_SESSION_KEY, carbonUser);
         var username = carbonUser.username;
         if(log.isDebugEnabled()){
             log.debug("User logged in: "+username);
         }
-        response.sendRedirect(dataConfig.appContext);
+        var permissions = userModule.getUIPermissions();
+        if (permissions.DASHBOARD_VIEW){
+            apiWrapperUtil.setupAccessTokenPair("saml", samlResponse);
+            response.sendRedirect(dataConfig.appContext + "/device-mgt");
+        }
     }, function() {
         if(log.isDebugEnabled()){
             log.debug("User logged out");

modules/distribution/src/repository/jaggeryapps/iotserver/lib/fuse-router.js

@@ -82,41 +82,8 @@ var route;
     };
 
     var renderStatic = function (unit, path) {
-        var unitModel = null;
+        log.debug('[' + requestId + '] for unit "' + unit + '" a request received for a static file "' + path + '"');
-        var unitName = "";
+        var staticFile = fuse.getFile(unit, 'public' + path);
-        var parts = (unit + path).split("/");
-
-        //'unitName' name can be "unitA" or "categoryA/unitA" or "categoryA/categoryAb/unitB"...etc
-        //incrementally trying to resolve a unit using url path parts.
-        for (var i = 0; i < parts.length; i++) {
-
-            if (unitName == "") {
-                unitName = parts[i];
-            } else {
-                unitName += "/" + parts[i];
-            }
-
-            try {
-                var model = fuse.getUnitDefinition(unitName);
-                if (model) {
-                    unitModel = {
-                        name: model.name,
-                        path: parts.splice(i + 1).join("/")
-                    };
-                    break;
-                }
-            } catch (err) {
-                //unit not found, ignore error
-            }
-        }
-
-        if (unitModel == null) {
-            log.error("unit `"+unit+"` not found!");
-            return false;
-        }
-
-        var staticFile = fuse.getFile(unitModel.name, 'public' + "/" + unitModel.path);
-
         if (staticFile.isExists() && !staticFile.isDirectory()) {
             response.addHeader('Content-type', getMime(path));
             response.addHeader('Cache-Control', 'public,max-age=12960000');
@@ -139,7 +106,7 @@ var route;
         if (jagFile.isExists()) {
             include(jagFile.getPath());
             return true;
-        } else {
+        }else{
             return false;
         }
     };

modules/distribution/src/repository/jaggeryapps/iotserver/lib/fuse.jag

@@ -1,17 +1,10 @@
 <%
 
-var getPath = File.prototype.getPath;
-File.prototype.getPath = function() {
-    var path = getPath.call(this);
-    path = path.replace(/\\/g, '/');
-    return path;
-};
-
 //global object to pass request stat among fuse framework files.
 var fuseState = {
     zones: {},
     appName: '',
-    zoneStack: [],
+    currentZone: [], //TODO: rename to zone Stack
     currentUnit: null
 };
 

modules/distribution/src/repository/jaggeryapps/iotserver/lib/fuse.js

@@ -15,7 +15,6 @@ var getHbsFile, getFile, toRelativePath, cleanupAncestors,
             for (var i = 0; i < definitions.length; i++) {
                 var definition = definitions[i];
                 lookUpTable[definition.name] = i;
-                //log.info("initLookUp()"+definition.name+"<-"+i);
             }
         }
     };
@@ -46,7 +45,6 @@ var getHbsFile, getFile, toRelativePath, cleanupAncestors,
     };
 
     var getAncestorModels = function (unit) {
-        //log.info('[' + requestId + '] getAncestorModels()'+unit);
         var unitModel = getUnitDefinition(unit);
         var ancestors = [unitModel];
         var parentName;
@@ -150,12 +148,11 @@ var getHbsFile, getFile, toRelativePath, cleanupAncestors,
     };
 
     getUnitDefinition = function (unit) {
-        //log.info('[' + requestId + '] getUnitDefinition()'+unit);
         var definitions = getUnitDefinitions();
         initLookUp(definitions);
-        //log.info('[' + requestId + '] lookUpTable[unit]:'+unit);
         var model = definitions[lookUpTable[unit]];
         if (!model) {
+            log.warn('[' + requestId + '] unit "' + unit + '" does not exits');
             throw '[' + requestId + '] unit "' + unit + '" does not exits';
         }
         return model;
@@ -208,7 +205,7 @@ var getHbsFile, getFile, toRelativePath, cleanupAncestors,
             var unitDir = unitDirs[i];
             if (unitDir.isDirectory()) {
                 var unitName = unitDir.getName();
-                //log.info("reading: "+unitName + " basePath:'" + basePath + "'");
+                //log.info("reading: "+unitName + " basePath:"+basePath);
                 var definitionFile = new File(fuse.getUnitPath(basePath+unitName) + '/' + unitName + '.json');
 
                 if(definitionFile.isExists()) {
@@ -384,7 +381,6 @@ var getHbsFile, getFile, toRelativePath, cleanupAncestors,
      * @returns {File}
      */
     getFile = function (unitName, path, opt_suffix) {
-        //log.info("getFile() unitName:"+unitName+", path:"+path+", opt_suffix:"+opt_suffix);
         var slashPath = ((path[0] === '/') ? '' : '/') + path;
         var selfFileName = '';
         var fileName = '';
@@ -403,10 +399,8 @@ var getHbsFile, getFile, toRelativePath, cleanupAncestors,
         var unitDef = getUnitDefinition(unitName);
         if (unitDef.path.indexOf('.hbs', unitDef.path.length - 4) !== -1) {
             if (opt_suffix.indexOf('.hbs', opt_suffix.length - 4) !== -1) {
-                //log.info("1:"+unitDef.path);
                 return new File(unitDef.path);
             } else {
-                //log.info("2:"+unitDef.path.replace(/.hbs$/, opt_suffix));
                 return new File(unitDef.path.replace(/.hbs$/, opt_suffix));
             }
         }
@@ -417,7 +411,7 @@ var getHbsFile, getFile, toRelativePath, cleanupAncestors,
                 '[' + requestId + '] for unit "' + unitName + '" file resolved : "'
                 + slashPath + selfFileName + '" -> "' + selfFile.getPath() + '"'
             );
-            //log.info("3:"+getUnitPath(unitName) + slashPath + selfFileName);
+
             return selfFile;
         }
 
@@ -437,7 +431,6 @@ var getHbsFile, getFile, toRelativePath, cleanupAncestors,
                     '[' + requestId + '] for unit "' + unitName + '" file resolved : "'
                     + slashPath + selfFileName + '" -> "' + file.getPath() + '"'
                 );
-                //log.info("4:"+getUnitPath(ancestorName) + slashPath + fileName);
                 return file;
             }
         }
@@ -445,7 +438,6 @@ var getHbsFile, getFile, toRelativePath, cleanupAncestors,
             '[' + requestId + '] for unit "' + unitName + '" (non-excising) file resolved : "'
             + slashPath + selfFileName + '" -> "' + selfFile.getPath() + '"'
         );
-        //log.info("5:"+getUnitPath(unitName) + slashPath + selfFileName);
         return selfFile;
     };
 

modules/distribution/src/repository/jaggeryapps/iotserver/lib/handlebars-helpers.js

@@ -56,7 +56,7 @@ Handlebars.innerZonesFromUnit = null;
 Handlebars.registerHelper('defineZone', function (zoneName, zoneContent) {
     var result = '';
     var zone = Handlebars.Utils.escapeExpression(zoneName);
-    fuseState.zoneStack.push(zone);
+    fuseState.currentZone.push(zone);
     var unitsToRender = fuseState.zones[zone] || [];
 
     if (Handlebars.innerZones.length > 0) {
@@ -92,12 +92,12 @@ Handlebars.registerHelper('defineZone', function (zoneName, zoneContent) {
         return result;
     }
 
-    fuseState.zoneStack.pop();
+    fuseState.currentZone.pop();
     return new Handlebars.SafeString(result);
 });
 
 Handlebars.registerHelper('zone', function (zoneName, zoneContent) {
-    var currentZone = fuseState.zoneStack[fuseState.zoneStack.length - 1];
+    var currentZone = fuseState.currentZone[fuseState.currentZone.length - 1];
     if (currentZone == null) {
         return 'zone_' + zoneName + ' ';
     }
@@ -113,7 +113,7 @@ Handlebars.registerHelper('zone', function (zoneName, zoneContent) {
 });
 
 Handlebars.registerHelper('layout', function (layoutName) {
-    var currentZone = fuseState.zoneStack[fuseState.zoneStack.length - 1];
+    var currentZone = fuseState.currentZone[fuseState.currentZone.length - 1];
     if (currentZone == null) {
         return 'layout_' + layoutName;
     } else {
@@ -122,7 +122,7 @@ Handlebars.registerHelper('layout', function (layoutName) {
 });
 
 Handlebars.registerHelper('authorized', function () {
-    var currentZone = fuseState.zoneStack[fuseState.zoneStack.length - 1];
+    var currentZone = fuseState.currentZone[fuseState.currentZone.length - 1];
     if (currentZone == null) {
         return '';
     } else {
@@ -155,11 +155,11 @@ Handlebars.registerHelper('unit', function (unitName,options) {
         log.error('unit does not have a main zone');
     }
     //TODO warn when unspecified decencies are included.
-    fuseState.zoneStack.push('main');
+    fuseState.currentZone.push('main');
     var template = fuse.getFile(baseUnit, '', '.hbs');
     log.debug('[' + requestId + '] including "' + baseUnit + '"'+" with configs "+stringify(templateConfigs));
     var result = new Handlebars.SafeString(Handlebars.compileFile(template)(getScope(baseUnit,templateConfigs)));
-    fuseState.zoneStack.pop();
+    fuseState.currentZone.pop();
     return result;
 });
 
@@ -192,7 +192,6 @@ Handlebars.registerHelper('equal', function(lvalue, rvalue, options) {
         return options.fn(this);
     }
 });
-
 Handlebars.registerHelper('unequal', function(lvalue, rvalue, options) {
     if (arguments.length < 3)
         throw new Error("Handlebars Helper equal needs 2 parameters");

modules/distribution/src/repository/jaggeryapps/iotserver/lib/less-rhino-1.7.5.js

@@ -10190,7 +10190,7 @@ var compile = function (args) {
     var parser = new less.Parser(options);
     parser.parse(input, function (e, root) {
         if (e) {
-            log.info(e);
+            log.error(e);
             writeError(e, options);
             quit(1);
         } else {

modules/distribution/src/repository/jaggeryapps/iotserver/modules/api-wrapper-util.js

@@ -0,0 +1,41 @@
+/*
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+var apiWrapperUtil = function () {
+    var module = {};
+    var tokenUtil = require("/modules/util.js").util;
+    module.refreshToken = function () {
+        var tokenPair = session.get("accessTokenPair");
+        tokenPair = tokenUtil.refreshToken(tokenPair);
+        session.put("accessTokenPair", tokenPair);
+        response.addCookie({'name': 'accessToken', 'value': tokenPair.accessToken});
+    };
+    module.setupAccessTokenPair = function (type, properties) {
+        var tokenPair;
+        var clientId = "pY0FbBUC_GI7mfHVS1FvhWAifEwa";
+        var clientSecret = "Tu5Za1R3fHtGc5yH4KK8TNiLVSca";
+        if (type == "password") {
+            //tokenPair = tokenUtil.getTokenWithPasswordGrantType(properties.username, properties.password, clientId, clientSecret);
+        } else if (type == "saml") {
+
+        }
+        //session.put("accessTokenPair", tokenPair);
+        //response.addCookie({'name': 'accessToken', 'value': tokenPair.accessToken});
+    };
+    return module;
+}();

modules/distribution/src/repository/jaggeryapps/iotserver/modules/constants.js

@@ -20,7 +20,7 @@ var WEB_APP_TITLE = "WSO2 DC - Device Cloud";
 var WEB_APP_CONTEXT = "/iotserver";
 var USER_SESSION_KEY = "USER";
 var UNSPECIFIED = "Unspecified";
-var DEVICES_UNIT_PATH="/units/devices/";
+var DEVICES_UNIT_PATH="/units/";
 
 var DEVICE_IDENTIFIER = "deviceIdentifier";
 var DEVICE_NAME = "name";

modules/distribution/src/repository/jaggeryapps/iotserver/modules/device.js

@@ -167,7 +167,7 @@ deviceModule = function () {
 
         var data = {};
         //XMLHTTPRequest's GET
-        log.info(removeDeviceEndpoint);
+        //log.info(removeDeviceEndpoint);
         return del(removeDeviceEndpoint, data, "text");
     };
 
@@ -178,8 +178,8 @@ deviceModule = function () {
 
         var data = {};
         //XMLHTTPRequest's POST
-        log.info(updateDeviceEndpoint+ "?name="+device.name);
+        //log.info(updateDeviceEndpoint+ "?name="+device.name);
-        return post(updateDeviceEndpoint+ "?name="+device.name, data, "text");
+        return post(updateDeviceEndpoint+ "?name="+encodeURIComponent(device.name), data, "text");
     };
 
     /*
@@ -273,4 +273,4 @@ deviceModule = function () {
 
     return publicMethods;
 
-}();
+}();

modules/distribution/src/repository/jaggeryapps/iotserver/modules/util.js

@@ -0,0 +1,89 @@
+/*
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+var util = function () {
+    var module = {};
+    var Base64 = Packages.org.apache.commons.codec.binary.Base64;
+    var String = Packages.java.lang.String;
+    var log = new Log();
+
+    /**
+     * Encode the payload in Base64
+     * @param payload
+     * @returns {Packages.java.lang.String}
+     */
+    function encode(payload){
+        return new String(Base64.encodeBase64(new String(payload).getBytes()));
+    }
+
+    /**
+     * Get an AccessToken pair based on username and password
+     * @param username
+     * @param password
+     * @param clientId
+     * @param clientSecret
+     * @param scope
+     * @returns {{accessToken: "", refreshToken: ""}}
+     */
+    module.getTokenWithPasswordGrantType = function (username, password, clientId, clientSecret, scope) {
+        var xhr = new XMLHttpRequest();
+        var tokenEndpoint = "https://localhost:9443/oauth2/token";
+        var encodedClientKeys = encode(clientId + ":" + clientSecret);
+        xhr.open("POST", tokenEndpoint, false);
+        xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+        xhr.setRequestHeader("Authorization", "Basic " + encodedClientKeys);
+        xhr.send("grant_type=password&username=" + username + "&password=" + password + "&scope=" + scope);
+        delete password, delete clientSecret, delete encodedClientKeys;
+        var tokenPair = {};
+        if (xhr.status == 200) {
+            var data = parse(xhr.responseText);
+            tokenPair.refreshToken = data.refresh_token;
+            tokenPair.accessToken = data.access_token;
+        } else if (xhr.status == 403) {
+            throw "Error in obtaining token with Password Grant Type";
+        } else {
+            throw "Error in obtaining token with Password Grant Type";
+        }
+        return tokenPair;
+    };
+    module.getTokenWithSAMLGrantType = function () {
+
+    };
+    module.refreshToken = function(tokenPair){
+        var xhr = new XMLHttpRequest();
+        var tokenEndpoint = "https://localhost:9443/oauth2/token";
+        var encodedClientKeys = encode(clientId + ":" + clientSecret);
+        xhr.open("POST", tokenEndpoint, false);
+        xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+        xhr.setRequestHeader("Authorization", "Basic " + encodedClientKeys);
+        xhr.send("grant_type=refresh_token&refresh_token=" + tokenPair.refreshToken + "&scope=" + scope);
+        delete password, delete clientSecret, delete encodedClientKeys;
+        var tokenPair = {};
+        if (xhr.status == 200) {
+            var data = parse(xhr.responseText);
+            tokenPair.refreshToken = data.refresh_token;
+            tokenPair.accessToken = data.access_token;
+        } else if (xhr.status == 403) {
+            throw "Error in obtaining token with Password Grant Type";
+        } else {
+            throw "Error in obtaining token with Password Grant Type";
+        }
+        return tokenPair;
+    };
+    return module;
+}();

modules/distribution/src/repository/jaggeryapps/iotserver/modules/utility.js

@@ -41,22 +41,52 @@ utility = function () {
 
     publicMethods.insertAppPermissions = function (userModule, type) {
         userModule.addPermissions([{key: "device-mgt", name: "Device Management"}], "", type);
-        userModule.addPermissions([{key: "admin", name: "Device Management Admin"}], "device-mgt", type);
+        userModule.addPermissions([{
-        userModule.addPermissions([{key: "user", name: "Device Management User"}], "device-mgt", type);
+            key: "admin",
+            name: "Device Management Admin"
+        }], "device-mgt", type);
+        userModule.addPermissions([{
+            key: "user",
+            name: "Device Management User"
+        }], "device-mgt", type);
 
         userModule.addPermissions([{key: "devices", name: "Devices"}], "device-mgt/admin", type);
-        userModule.addPermissions([{key: "devices/list", name: "List Devices"}], "device-mgt/admin", type);
+        userModule.addPermissions([{
-        userModule.addPermissions([{key: "devices/operation", name: "Perform Operation"}], "device-mgt/admin", type);
+            key: "devices/list",
+            name: "List Devices"
+        }], "device-mgt/admin", type);
+        userModule.addPermissions([{
+            key: "devices/operation",
+            name: "Perform Operation"
+        }], "device-mgt/admin", type);
 
         userModule.addPermissions([{key: "users", name: "Users"}], "device-mgt/admin", type);
-        userModule.addPermissions([{key: "users/add", name: "Add New Users"}], "device-mgt/admin", type);
+        userModule.addPermissions([{
-        userModule.addPermissions([{key: "users/invite", name: "Invite Users"}], "device-mgt/admin", type);
+            key: "users/add",
-        userModule.addPermissions([{key: "users/list", name: "List Users"}], "device-mgt/admin", type);
+            name: "Add New Users"
-        userModule.addPermissions([{key: "users/remove", name: "Remove Users"}], "device-mgt/admin", type);
+        }], "device-mgt/admin", type);
+        userModule.addPermissions([{
+            key: "users/invite",
+            name: "Invite Users"
+        }], "device-mgt/admin", type);
+        userModule.addPermissions([{
+            key: "users/list",
+            name: "List Users"
+        }], "device-mgt/admin", type);
+        userModule.addPermissions([{
+            key: "users/remove",
+            name: "Remove Users"
+        }], "device-mgt/admin", type);
 
         userModule.addPermissions([{key: "devices", name: "Devices"}], "device-mgt/user", type);
-        userModule.addPermissions([{key: "devices/list", name: "List Devices"}], "device-mgt/user", type);
+        userModule.addPermissions([{
-        userModule.addPermissions([{key: "devices/operation", name: "Perform Operation"}], "device-mgt/user", "init");
+            key: "devices/list",
+            name: "List Devices"
+        }], "device-mgt/user", type);
+        userModule.addPermissions([{
+            key: "devices/operation",
+            name: "Perform Operation"
+        }], "device-mgt/user", "init");
     };
 
     return publicMethods;

modules/distribution/src/repository/jaggeryapps/iotserver/pages/dashboard.hbs

@@ -1,3 +1,4 @@
+{{authorized}}
 {{layout "fluid"}}
 {{#zone  "title"}}
     WSO2 DC | Device Cloud

modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/android.hbs

@@ -4,5 +4,5 @@
 {{/zone}}
 {{#zone "body"}}
 	{{unit "appbar" link="store" title="STORE"}}
-    {{unit "devices/android"}}
+    {{unit "android"}}
 {{/zone}}

modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/android_sense.hbs

@@ -4,5 +4,5 @@
 {{/zone}}
 {{#zone "body"}}
 	{{unit "appbar" link="store" title="STORE"}}
-    {{unit "devices/android_sense"}}
+    {{unit "android_sense"}}
 {{/zone}}

modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/arduino.hbs

@@ -4,5 +4,5 @@
 {{/zone}}
 {{#zone "body"}}
 	{{unit "appbar" link="store" title="STORE"}}
-    {{unit "devices/arduino"}}
+    {{unit "arduino"}}
 {{/zone}}

modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/digital_display.hbs

@@ -4,5 +4,5 @@
 {{/zone}}
 {{#zone "body"}}
 	{{unit "appbar" link="store" title="STORE"}}
-    {{unit "devices/digital_display"}}
+    {{unit "digital_display"}}
 {{/zone}}

modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/firealarm.hbs

@@ -4,5 +4,5 @@
 {{/zone}}
 {{#zone "body"}}
 	{{unit "appbar" link="store" title="STORE"}}
-    {{unit "devices/firealarm"}}
+    {{unit "firealarm"}}
 {{/zone}}

modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/index.hbs

@@ -4,7 +4,7 @@
     Devices
 {{/zone}}
 {{#zone "body"}}
-    {{unit "appbar" link="device-mgt" title="Device Management"}}
+    {{unit "appbar" link="device-mgt" title="My Devices"}}
     {{unit "extended-search-box"}}
     {{unit "operation-mod"}}
     <div class="wr-device-list row">

modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/raspberrypi.hbs

@@ -4,5 +4,5 @@
 {{/zone}}
 {{#zone "body"}}
 	{{unit "appbar" link="store" title="STORE"}}
-    {{unit "devices/raspberrypi"}}
+    {{unit "raspberrypi"}}
 {{/zone}}

modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/sensebot.hbs

@@ -4,5 +4,5 @@
 {{/zone}}
 {{#zone "body"}}
 	{{unit "appbar" link="store" title="STORE"}}
-    {{unit "devices/sensebot"}}
+    {{unit "sensebot"}}
 {{/zone}}

modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/windows.hbs

@@ -4,5 +4,5 @@
 {{/zone}}
 {{#zone "body"}}
 	{{unit "appbar" link="store" title="STORE"}}
-    {{unit "devices/windows"}}
+    {{unit "windows"}}
 {{/zone}}

modules/distribution/src/repository/jaggeryapps/iotserver/test.jag

@@ -0,0 +1,12 @@
+<%
+var userModule = require("/modules/user.js").userModule;
+userModule.addPermissions([{key: "device-mgt/", name: "Device Management"}], "");
+userModule.addPermissions([{key: "device-mgt/admin", name: "Device Management Admin"}], "");
+userModule.addPermissions([{key: "device-mgt/user", name: "Device Management User"}], "");
+
+userModule.addPermissions([{key: "devices", name: "Device"}], "device-mgt/admin");
+userModule.addPermissions([{key: "devices", name: "Device"}], "device-mgt/user");
+userModule.addPermissions([{key: "devices/list", name: "List all Devices"}], "device-mgt/admin");
+userModule.addPermissions([{key: "devices/list", name: "List own Devices"}], "device-mgt/user");
+new Log().info(userModule.isAuthorized("/permission/device-mgt/admin/devices/list"));
+%>

modules/distribution/src/repository/jaggeryapps/iotserver/test/device-spec.js

@@ -0,0 +1,100 @@
+/*
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+describe('Device Module', function () {
+    var log = new Log();
+    var mobileDB;
+    var cdmDB;
+    var deviceModule = require("/modules/device.js").deviceModule;
+
+    function tearUp() {
+        mobileDB = new Database("MobileDM_DS");
+        cdmDB = new Database("DM_DS");
+        cdmDB.query("insert into dm_device(description, name, date_of_enrollment, date_of_last_update, " +
+                            "ownership,status, device_type_id, device_identification, owner, tenant_id ) " +
+                                "values ('Galaxy Tab','Admin Samsung', 1425467382, 1425467382, 'BYOD', 'ACTIVE'," +
+                                    " 1,'4892813d-0b18-4a02-b7b1-61775257488e', 'admin@wso2.com', '-1234');");
+        cdmDB.query("insert into dm_device(description, name, date_of_enrollment, date_of_last_update, " +
+                            "ownership,status, device_type_id, device_identification, owner, tenant_id ) " +
+                                "values ('Galaxy Tab','Admin Samsung', 1425467382, 1425467382, 'BYOD', 'ACTIVE'," +
+                                    " 1,'4892813d-0b18-4a02-b7b1-61775257488F', 'mdm@wso2.com', '-1234');");
+
+        mobileDB.query("insert into mbl_device (mobile_device_id, push_token, imei ,imsi, os_version, " +
+                        "device_model , vendor ,latitude ,longitude , challenge ,token, unlock_token ,serial ) " +
+                            "values ('4892813d-0b18-4a02-b7b1-61775257488e', 'sdfsdf', 'cxv', 'vbcb', '4.1', " +
+                                "'Galaxy Tab', 'Samsung',  '234234234', '4345345234234', 'dfjsdlfk', 'wuweir234', " +
+                                    "'ksdfjlskfjwer', '234234');");
+        mobileDB.query("insert into mbl_device (mobile_device_id, push_token, imei ,imsi, os_version, " +
+                        "device_model , vendor ,latitude ,longitude , challenge ,token, unlock_token ,serial ) " +
+                            "values ('4892813d-0b18-4a02-b7b1-61775257488F', 'sdfsdf', 'cxv', 'vbcb', '4.1', " +
+                                "'Galaxy Tab', 'Samsung',  '234234234', '4345345234234', 'dfjsdlfk', 'wuweir234', " +
+                                    "'ksdfjlskfjwer', '234234');");
+    }
+
+    function tearDown() {
+        deleteData();
+        mobileDB.close();
+        cdmDB.close();
+    }
+
+    function deleteData(){
+        cdmDB.query("delete from dm_device where device_identification='4892813d-0b18-4a02-b7b1-61775257488e'");
+        cdmDB.query("delete from dm_device where device_identification='4892813d-0b18-4a02-b7b1-61775257488F'");
+        mobileDB.query("delete from mbl_device where mobile_device_id='4892813d-0b18-4a02-b7b1-61775257488e'");
+        mobileDB.query("delete from mbl_device where mobile_device_id='4892813d-0b18-4a02-b7b1-61775257488F'");
+    }
+
+    it('List all Devices - Device Module', function () {
+        try {
+            tearUp();
+            var results = deviceModule.listDevices();
+            expect(results.length).not.toBe(0);
+        } catch (e) {
+            log.error(e);
+            throw e;
+        } finally {
+            tearDown();
+        }
+    });
+    it('List Devices for User - Device Module', function () {
+        try {
+            tearUp();
+            var results = deviceModule.listDevicesForUser("mdm@wso2.com");
+            expect(results.length).toBe(1);
+        } catch (e) {
+            log.error(e);
+            throw e;
+        } finally {
+            tearDown();
+        }
+    });
+    it('Perform operation on the device', function(){
+        try {
+            tearUp();
+            var devices = [{"id": "4892813d-0b18-4a02-b7b1-61775257488e", "type": "android"}];
+            var operation = {"featureName": "DEVICE_LOCK", "type": "COMMAND", "properties": {"enabled": true}}
+            var results = deviceModule.performOperation(devices, operation);
+            expect(results.length).toBe(1);
+        } catch (e) {
+            log.error(e);
+            throw e;
+        } finally {
+            tearDown();
+        }
+    });
+});

modules/distribution/src/repository/jaggeryapps/iotserver/test/user-spec.js

@@ -0,0 +1,88 @@
+/*
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+describe('Device Module', function () {
+    var log = new Log();
+    var mobileDB;
+    var cdmDB;
+    var deviceModule = require("/modules/device.js").deviceModule;
+    var userModule = require("/modules/user.js").userModule;
+    var constants = require("/modules/constants.js");
+    function tearUp() {
+        mobileDB = new Database("MobileDM_DS");
+        cdmDB = new Database("DM_DS");
+        cdmDB.query("insert into dm_device(description, name, date_of_enrollment, date_of_last_update, " +
+        "ownership,status, device_type_id, device_identification, owner, tenant_id ) " +
+        "values ('Galaxy Tab','Admin Samsung', 1425467382, 1425467382, 'BYOD', 'ACTIVE'," +
+        " 1,'4892813d-0b18-4a02-b7b1-61775257488e', 'admin@wso2.com', '-1234');");
+        cdmDB.query("insert into dm_device(description, name, date_of_enrollment, date_of_last_update, " +
+        "ownership,status, device_type_id, device_identification, owner, tenant_id ) " +
+        "values ('Galaxy Tab','Admin Samsung', 1425467382, 1425467382, 'BYOD', 'ACTIVE'," +
+        " 1,'4892813d-0b18-4a02-b7b1-61775257488F', 'mdm@wso2.com', '-1234');");
+
+        mobileDB.query("insert into mbl_device (mobile_device_id, push_token, imei ,imsi, os_version, " +
+        "device_model , vendor ,latitude ,longitude , challenge ,token, unlock_token ,serial ) " +
+        "values ('4892813d-0b18-4a02-b7b1-61775257488e', 'sdfsdf', 'cxv', 'vbcb', '4.1', " +
+        "'Galaxy Tab', 'Samsung',  '234234234', '4345345234234', 'dfjsdlfk', 'wuweir234', " +
+        "'ksdfjlskfjwer', '234234');");
+        mobileDB.query("insert into mbl_device (mobile_device_id, push_token, imei ,imsi, os_version, " +
+        "device_model , vendor ,latitude ,longitude , challenge ,token, unlock_token ,serial ) " +
+        "values ('4892813d-0b18-4a02-b7b1-61775257488F', 'sdfsdf', 'cxv', 'vbcb', '4.1', " +
+        "'Galaxy Tab', 'Samsung',  '234234234', '4345345234234', 'dfjsdlfk', 'wuweir234', " +
+        "'ksdfjlskfjwer', '234234');");
+        session.put(constants.USER_SESSION_KEY, {"username" : "admin", "domain": "carbon.super", "tenantId": "-1234"});
+    }
+
+    function tearDown() {
+        deleteData();
+        mobileDB.close();
+        cdmDB.close();
+        session.put(constants.USER_SESSION_KEY, null);
+    }
+
+    function deleteData(){
+        cdmDB.query("delete from dm_device where device_identification='4892813d-0b18-4a02-b7b1-61775257488e'");
+        cdmDB.query("delete from dm_device where device_identification='4892813d-0b18-4a02-b7b1-61775257488F'");
+        mobileDB.query("delete from mbl_device where mobile_device_id='4892813d-0b18-4a02-b7b1-61775257488e'");
+        mobileDB.query("delete from mbl_device where mobile_device_id='4892813d-0b18-4a02-b7b1-61775257488F'");
+    }
+
+    it('List all users', function () {
+        try {
+            tearUp();
+            var results = userModule.getUsers();
+            expect(results.length).not.toBe(0);
+        } catch (e) {
+            log.error(e);
+            throw e;
+        } finally {
+            tearDown();
+        }
+    });
+    it('Check permission for user', function () {
+        try {
+            tearUp();
+            expect(userModule.isAuthorized("/permission/device-mgt/user/devices/list")).toBe(true);
+        } catch (e) {
+            log.error(e);
+            throw e;
+        } finally {
+            tearDown();
+        }
+    });
+});

modules/distribution/src/repository/jaggeryapps/iotserver/tmp/.gitignore

@@ -0,0 +1,5 @@
+# Ignore everything in this directory.
+# they are auto generated, should not be committed.
+*
+# Except this file
+!.gitignore

modules/distribution/src/repository/jaggeryapps/iotserver/token.jag

@@ -0,0 +1,4 @@
+<%
+var apiWrapperUtil = require("/modules/api-wrapper-util.js").apiWrapperUtil;
+apiWrapperUtil.refreshToken();
+%>

modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.js

@@ -0,0 +1,4 @@
+function onRequest(context){
+    context.sketchPath = "api/device/sketch/download";
+    return context;
+}

modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.js

@@ -0,0 +1,4 @@
+function onRequest(context){
+    context.sketchPath = "api/device/sketch/download";
+    return context;
+}

modules/distribution/src/repository/jaggeryapps/iotserver/units/appbar/appbar.hbs

@@ -41,7 +41,7 @@
     <!-- common navigation -->
 	<div id="hiddenNav" class="wr-hidden-nav">
         <ul>
-			<li><a href="/iotserver/devices"><i class="fw fw-mobile"></i>Device Management</a></li>
+			<li><a href="/iotserver/devices"><i class="fw fw-mobile"></i>My Devices</a></li>
             {{#if permissions.ADD_USER}}
             <li><a href="/iotserver/users"><i class="fw fw-user"></i>User Management</a></li>
             {{/if}}

modules/distribution/src/repository/jaggeryapps/iotserver/units/appbar/appbar.js

@@ -1,6 +1,6 @@
 function onRequest(context) {
     var constants = require("/modules/constants.js");
-    var user = session.get(constants.USER_SESSION_KEY);
+    var carbonUser = session.get(constants.USER_SESSION_KEY);
 
     var links = {
         "users": [],
@@ -18,7 +18,7 @@ function onRequest(context) {
     };
 
     var deviceMgtLink = {
-        title: "Go back to Device Management",
+        title: "Go back to My Devices",
         icon: "fw-left-arrow",
         url: "/iotserver/devices"
     };
@@ -38,9 +38,12 @@ function onRequest(context) {
     links.analytics.push(deviceMgtLink);
     links['device-mgt'].push(dashboardLink);
 
-    if (user) {
+    if (!carbonUser) {
+        //user is not logged in
+    }else{
         var userModule = require("/modules/user.js").userModule;
         var permissions = userModule.getUIPermissions();
+
         context.permissions = permissions;
 
         //if (permissions.ADD_USER) {

modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/arduino.js

@@ -0,0 +1,4 @@
+function onRequest(context){
+    context.sketchPath = "api/device/sketch/download";
+    return context;
+}

modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/device-listing.hbs

@@ -93,7 +93,7 @@
                 <div class="col-lg-5 col-md-6 col-centered">
                     <h3>Device was successfully updated.</h3>
                     <div class="buttons">
-                        <a href="#" id="remove-device-200-link" class="btn-operations">
+                        <a href="#" id="edit-device-200-link" class="btn-operations">
                             &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
                         </a>
                     </div>
@@ -165,4 +165,4 @@
 {{#zone "bottomJs"}}
     <script id="device-listing" data-image-resource="{{self.publicURL}}/images/" src="{{self.publicURL}}/templates/device-listing.hbs" type="text/x-handlebars-template" ></script>
     <script src="{{self.publicURL}}/js/device-listing.js"></script>
-{{/zone}}
+{{/zone}}

modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/js/device-listing.js

@@ -253,24 +253,25 @@ function attachEvents() {
         $("a#remove-device-yes-link").click(function () {
             invokerUtil.get(
                 removeDeviceAPI,
-                function (data) {
+                function (data,txtStatus,jqxhr) {
-                    if (data == 200) {
+		    var status = jqxhr.status;
-                        $("#" + username).addClass("hide");
+                    if (status == 200) {
                         $(modalPopupContent).html($('#remove-device-200-content').html());
-                        $("a#remove-device-200-link").click(function () {
+                        $('div[data-deviceid="' + deviceId  + '"]').remove();
+			$("a#remove-device-200-link").click(function () {
                             hidePopup();
                         });
-                    } else if (data == 400) {
+                    } else if (status == 400) {
                         $(modalPopupContent).html($('#remove-device-400-content').html());
                         $("a#remove-device-400-link").click(function () {
                             hidePopup();
                         });
-                    } else if (data == 403) {
+                    } else if (status == 403) {
                         $(modalPopupContent).html($('#remove-device-403-content').html());
                         $("a#remove-device-403-link").click(function () {
                             hidePopup();
                         });
-                    } else if (data == 409) {
+                    } else if (status == 409) {
                         $(modalPopupContent).html($('#remove-device-409-content').html());
                         $("a#remove-device-409-link").click(function () {
                             hidePopup();
@@ -308,28 +309,31 @@ function attachEvents() {
         showPopup();
 
         $("a#edit-device-yes-link").click(function () {
-            var device={"device":{"name" : $('#edit-device-name').val()}};
+            var newDeviceName = $('#edit-device-name').val();
+	    var device={"device":{"name" : newDeviceName}};
             invokerUtil.post(
                 editDeviceAPI,
                 device,
-                function (data) {
+                function (data,txtStatus,jqxhr) {
-                    if (data == 200) {
+                    var status = jqxhr.status;
-                        $("#" + username).addClass("hide");
+                    if (status == 200) {
                         $(modalPopupContent).html($('#edit-device-200-content').html());
+			console.log("asdsdasda" + newDeviceName);
+			$("div[data-deviceid='"+deviceId+"'] .ast-name").html(newDeviceName);
                         $("a#edit-device-200-link").click(function () {
                             hidePopup();
                         });
-                    } else if (data == 400) {
+                    } else if (status == 400) {
                         $(modalPopupContent).html($('#edit-device-400-content').html());
                         $("a#edit-device-400-link").click(function () {
                             hidePopup();
                         });
-                    } else if (data == 403) {
+                    } else if (status == 403) {
                         $(modalPopupContent).html($('#edit-device-403-content').html());
                         $("a#edit-device-403-link").click(function () {
                             hidePopup();
                         });
-                    } else if (data == 409) {
+                    } else if (status == 409) {
                         $(modalPopupContent).html($('#edit-device-409-content').html());
                         $("a#edit-device-409-link").click(function () {
                             hidePopup();

modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/js/device-listing.js.save

@@ -0,0 +1,353 @@
+/*
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+(function () {
+    var cache = {};
+    var permissionSet = {};
+    var validateAndReturn = function (value) {
+        return (value == undefined || value == null) ? "Unspecified" : value;
+    };
+    Handlebars.registerHelper("deviceMap", function (device) {
+        device.owner = validateAndReturn(device.owner);
+        device.ownership = validateAndReturn(device.ownership);
+        var arr = device.properties;
+        if (arr) {
+            device.properties = arr.reduce(function (total, current) {
+                total[current.name] = validateAndReturn(current.value);
+                return total;
+            }, {});
+        }
+    });
+
+    //This method is used to setup permission for device listing
+    $.setPermission = function (permission) {
+        permissionSet[permission] = true;
+    };
+
+    $.hasPermission = function (permission) {
+        return permissionSet[permission];
+    };
+})();
+
+/*
+ * Setting-up global variables.
+ */
+var deviceCheckbox = "#ast-container .ctrl-wr-asset .itm-select input[type='checkbox']";
+var assetContainer = "#ast-container";
+
+/*
+ * DOM ready functions.
+ */
+$(document).ready(function () {
+    /* Adding selected class for selected devices */
+    $(deviceCheckbox).each(function () {
+        addDeviceSelectedClass(this);
+    });
+
+    var i;
+    var permissionList = $("#permission").data("permission");
+    for (i = 0; i < permissionList.length; i++) {
+        $.setPermission(permissionList[i]);
+    }
+
+    /* for device list sorting drop down */
+    $(".ctrl-filter-type-switcher").popover({
+        html: true,
+        content: function () {
+            return $("#content-filter-types").html();
+        }
+    });
+});
+
+/*
+ * On Select All Device button click function.
+ *
+ * @param button: Select All Device button
+ */
+function selectAllDevices(button) {
+    if (!$(button).data('select')) {
+        $(deviceCheckbox).each(function (index) {
+            $(this).prop('checked', true);
+            addDeviceSelectedClass(this);
+        });
+        $(button).data('select', true);
+        $(button).html('Deselect All Devices');
+    } else {
+        $(deviceCheckbox).each(function (index) {
+            $(this).prop('checked', false);
+            addDeviceSelectedClass(this);
+        });
+        $(button).data('select', false);
+        $(button).html('Select All Devices');
+    }
+}
+
+/*
+ * On listing layout toggle buttons click function.
+ *
+ * @param view: Selected view type
+ * @param selection: Selection button
+ */
+function changeDeviceView(view, selection) {
+    $(".view-toggle").each(function () {
+        $(this).removeClass("selected");
+    });
+    $(selection).addClass("selected");
+    if (view == "list") {
+        $(assetContainer).addClass("list-view");
+    } else {
+        $(assetContainer).removeClass("list-view");
+    }
+}
+
+/*
+ * Add selected style class to the parent element function.
+ *
+ * @param checkbox: Selected checkbox
+ */
+function addDeviceSelectedClass(checkbox) {
+    if ($(checkbox).is(":checked")) {
+        $(checkbox).closest(".ctrl-wr-asset").addClass("selected device-select");
+    } else {
+        $(checkbox).closest(".ctrl-wr-asset").removeClass("selected device-select");
+    }
+}
+function loadDevices(searchType, searchParam) {
+    var deviceListing = $("#device-listing");
+    var deviceListingSrc = deviceListing.attr("src");
+    var imageResource = deviceListing.data("image-resource");
+    $.template("device-listing", deviceListingSrc, function (template) {
+        var serviceURL;
+        if ($.hasPermission("LIST_DEVICES")) {
+            serviceURL = "/iotserver/api/devices/all";
+        } else if ($.hasPermission("LIST_OWN_DEVICES")) {
+            //Get authenticated users devices
+            serviceURL = "/iotserver/api/devices/all";
+        } else {
+            $("#ast-container").html("Permission denied");
+            return;
+        }
+        if (searchParam) {
+            if (searchType == "users") {
+                serviceURL = serviceURL + "?user=" + searchParam;
+            } else if (searchType == "user-roles") {
+                serviceURL = serviceURL + "?role=" + searchParam;
+            } else {
+                serviceURL = serviceURL + "?type=" + searchParam;
+            }
+        }
+        var successCallback = function (data) {
+            data = JSON.parse(data);
+            var viewModel = {};
+            viewModel.devices = data.data;
+            viewModel.imageLocation = imageResource;
+            if(!data.data || data.data.length <= 0){
+                $("#ast-container").html($("#no-devices-div-content").html());
+            } else {
+                var content = template(viewModel);
+                $("#ast-container").html(content);
+                /*
+                 * On device checkbox select add parent selected style class
+                 */
+                $(deviceCheckbox).click(function () {
+                    addDeviceSelectedClass(this);
+                });
+                attachEvents();
+                formatDates();
+            }
+        };
+        invokerUtil.get(serviceURL,
+            successCallback, function (message) {
+                console.log(message);
+            });
+    });
+}
+$(document).ready(function () {
+    loadDevices();
+});
+
+function formatDates(){
+    $(".formatDate").each(function(){
+        var timeStamp = $(this).html();
+        $(this).html(new Date(parseInt(timeStamp)).toUTCString());
+    });
+}
+
+/**
+ * Sorting function of users
+ * listed on User Management page in WSO2 MDM Console.
+ */
+$(function () {
+    var sortableElem = '.wr-sortable';
+    $(sortableElem).sortable({
+        beforeStop: function () {
+            var sortedIDs = $(this).sortable('toArray');
+            console.log(sortedIDs);
+        }
+    });
+    $(sortableElem).disableSelection();
+});
+
+var modalPopup = ".wr-modalpopup";
+var modalPopupContainer = modalPopup + " .modalpopup-container";
+var modalPopupContent = modalPopup + " .modalpopup-content";
+var body = "body";
+
+/*
+ * set popup maximum height function.
+ */
+function setPopupMaxHeight() {
+    $(modalPopupContent).css('max-height', ($(body).height() - ($(body).height() / 100 * 30)));
+    $(modalPopupContainer).css('margin-top', (-($(modalPopupContainer).height() / 2)));
+}
+
+/*
+ * show popup function.
+ */
+function showPopup() {
+    $(modalPopup).show();
+    setPopupMaxHeight();
+}
+
+/*
+ * hide popup function.
+ */
+function hidePopup() {
+    $(modalPopupContent).html('');
+    $(modalPopup).hide();
+}
+
+
+/**
+ * Following functions should be triggered after AJAX request is made.
+ */
+function attachEvents() {
+    /**
+     * Following click function would execute
+     * when a user clicks on "Remove" link
+     * on Device Management page in WSO2 MDM Console.
+     */
+    $("a.remove-device-link").click(function () {
+        var deviceId = $(this).data("deviceid");
+        var deviceType = $(this).data("devicetype");
+        var removeDeviceAPI = "/iotserver/api/device/" + deviceType + "/" + deviceId + "/remove";
+
+        $(modalPopupContent).html($('#remove-device-modal-content').html());
+        showPopup();
+
+        $("a#remove-device-yes-link").click(function () {
+            invokerUtil.get(
+                removeDeviceAPI,
+                function (data,txtStatus,jqxhr) {
+		    var status = jqxhr.status;
+                    if (status == 200) {
+                        $(modalPopupContent).html($('#remove-device-200-content').html());
+                        $("a#remove-device-200-link").click(function () {
+                            hidePopup();
+                        });
+			$("")
+                    } else if (status == 400) {
+                        $(modalPopupContent).html($('#remove-device-400-content').html());
+                        $("a#remove-device-400-link").click(function () {
+                            hidePopup();
+                        });
+                    } else if (status == 403) {
+                        $(modalPopupContent).html($('#remove-device-403-content').html());
+                        $("a#remove-device-403-link").click(function () {
+                            hidePopup();
+                        });
+                    } else if (status == 409) {
+                        $(modalPopupContent).html($('#remove-device-409-content').html());
+                        $("a#remove-device-409-link").click(function () {
+                            hidePopup();
+                        });
+                    }
+                },
+                function () {
+                    $(modalPopupContent).html($('#remove-device-unexpected-error-content').html());
+                    $("a#remove-device-unexpected-error-link").click(function () {
+                        hidePopup();
+                    });
+                }
+            );
+        });
+
+        $("a#remove-device-cancel-link").click(function () {
+            hidePopup();
+        });
+
+    });
+
+    /**
+     * Following click function would execute
+     * when a user clicks on "Edit" link
+     * on Device Management page in WSO2 MDM Console.
+     */
+    $("a.edit-device-link").click(function () {
+        var deviceId = $(this).data("deviceid");
+        var deviceType = $(this).data("devicetype");
+        var deviceName = $(this).data("devicename");
+        var editDeviceAPI = "/iotserver/api/device/" + deviceType + "/" + deviceId + "/update";
+
+        $(modalPopupContent).html($('#edit-device-modal-content').html());
+        $('#edit-device-name').val(deviceName);
+        showPopup();
+
+        $("a#edit-device-yes-link").click(function () {
+            var device={"device":{"name" : $('#edit-device-name').val()}};
+            invokerUtil.post(
+                editDeviceAPI,
+                device,
+                function (data,txtStatus,jqxhr) {
+                    var status = jqxhr.status;
+                    if (status == 200) {
+                        $(modalPopupContent).html($('#edit-device-200-content').html());
+                        $("a#edit-device-200-link").click(function () {
+                            hidePopup();
+                        });
+                    } else if (status == 400) {
+                        $(modalPopupContent).html($('#edit-device-400-content').html());
+                        $("a#edit-device-400-link").click(function () {
+                            hidePopup();
+                        });
+                    } else if (status == 403) {
+                        $(modalPopupContent).html($('#edit-device-403-content').html());
+                        $("a#edit-device-403-link").click(function () {
+                            hidePopup();
+                        });
+                    } else if (status == 409) {
+                        $(modalPopupContent).html($('#edit-device-409-content').html());
+                        $("a#edit-device-409-link").click(function () {
+                            hidePopup();
+                        });
+                    }
+                },
+                function () {
+                    $(modalPopupContent).html($('#edit-device-unexpected-error-content').html());
+                    $("a#edit-device-unexpected-error-link").click(function () {
+                        hidePopup();
+                    });
+                }
+            );
+        });
+
+        $("a#edit-device-cancel-link").click(function () {
+            hidePopup();
+        });
+    });
+}

modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/templates/device-listing.hbs

@@ -1,6 +1,6 @@
 {{#each devices}}
 	{{deviceMap this}}
-    <div class="ctrl-wr-asset" data-deviceid="{{id}}" data-type="{{type}}">
+    <div class="ctrl-wr-asset" data-deviceid="{{deviceIdentifier}}" data-type="{{type}}">
         <div class="itm-select">
             <label class="wr-input-control checkbox">
                 <input type="checkbox"/>
@@ -12,7 +12,7 @@
                 <div class="ast-img"><img src="{{../imageLocation}}{{type}}.png"/></div>
                 <div class="ast-desc">
                     <div class="ast-title">
-                        <h3 class="ast-name">Device {{name}}</h3>
+                        <h3 class="ast-name">{{name}}</h3>
                         <span class="ast-auth">Device Type: {{type}}</span>
                         <span class="ast-auth">Date of Enrollment: <span class="formatDate">{{dateOfEnrolment}}</span></span>
                     </div>
@@ -52,4 +52,4 @@
 
 {{/each}}
 
-<br class="c-both"/>
+<br class="c-both"/>

modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android/android.js

@@ -1,4 +0,0 @@
-function onRequest(context){
-    context.sketchPath = "../api/device/sketch/download";
-    return context;
-}

modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android_sense/android_sense.js

@@ -1,4 +0,0 @@
-function onRequest(context){
-    context.sketchPath = "../api/device/sketch/download";
-    return context;
-}

modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/arduino/arduino.js

@@ -1,4 +0,0 @@
-function onRequest(context){
-    context.sketchPath = "../api/device/sketch/download";
-    return context;
-}

modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/firealarm/firealarm.hbs

@@ -1,90 +0,0 @@
-{{#zone "main"}}
-<div class="container container-bg  white-bg">
-        <div class=" margin-top-double">
-            <div class="row row padding-top-double padding-bottom-double margin-bottom-double">
-                <div class="col-lg-12  margin-top-double">
-                    <h1 class="grey ">Fire Alarm</h1>
-                    <hr>
-                    <p  class="margin-bottom-double light-grey ">Connect your Fire Alarm device
-                    to the WSO2 device cloud. </p>
-                </div>
-            </div>
-            <div class="row margin-bottom-double">
-                <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
-                <img src="{{self.publicURL}}/images/firealarm.png" class="img-responsive">
-            </div>
-                <div class="col-xs-12 col-sm-6 col-md-8 col-lg-8 padding-top">
-                    <h2 class="uppercase">Ingredients</h2>
-                    <hr>
-                    <p class="grey margin-top">Hardware Requirements </p>
-                    <br><br>
-                                <span class="fw-stack fw-lg margin-right">
-                                    <i class="fw fw-ring fw-stack-2x"> </i>
-                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
-                                </span>Arduino Uno<br><br>
-                                <span class="fw-stack fw-lg margin-right">
-                                    <i class="fw fw-ring fw-stack-2x"> </i>
-                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
-                                </span>Arduino Ethernet / WiFi Shield
-								<br /><br />
-								<form method="POST" class="float-left margin-right"
-									action="{{sketchPath}}">
-                                        <input type="hidden" name="deviceType" value="firealarm" />
-                                        <input type="hidden" name="sketchType" value="firealarm_wifi" />
-										<button class="wr-btn" type="submit">Create Sketch for
-										Wifi
-										</button>
-									</form>
-                                <form method="POST" class="form-login-box float-left"
-                                action="{{sketchPath}}">
-                                    <input type="hidden" name="deviceType" value="firealarm" />
-                                    <input type="hidden" name="sketchType" value="firealarm" />
-									<button class="wr-btn margin-right" type="submit">Create
-									Sketch
-									for Ethernet</button>
-								</form>
-                                <br/>
-
-                </div>
-                <div class ="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double grey-bg ">
-                    <h2 class="uppercase">Prepare</h2><hr>
-                    <p class="grey margin-top">Get your device ready  </p>
-                         <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
-                             <span class="circle">01  </span> <span class="padding-left"> Mount the Ethernet / Wifi shield on the Arduino Uno device.</span>
-                        </div>
-                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom">
-                        <span class="circle">02  </span> <span class="padding-left"> Mount the Ethernet / Wifi shield on the Arduino Uno device.</span>
-                    </div>
-                    <div class="margin-doubles padding-top-double margin-bottom-double light-grey  margin-left-double margin-bottom">
-                        <span class="circle">03  </span> <span class="padding-left"> Mount the Ethernet / Wifi shield on the Arduino Uno device.</span>
-                        </div>
-                </div>
-            </div>
-            <div class="row row padding-top-double padding-bottom-double margin-bottom-double  ">
-                <div class="col-lg-12  margin-top-double">
-                    <h2 class="uppercase ">Connect (Quickstart)</h2>
-                    <hr>
-                    <p  class="margin-bottom-double light-grey ">Internet of Things Foundation Quickstart connection  </p>
-                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
-                        <span class="circle">01  </span> <span class="padding-left">Use the following command to download the installer from GitHub:</span><br>
-                    </div>
-                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
-                        <span class="circle">02  </span> <span class="padding-left">Download the Sketch installer from the Arduino website http://arduino.cc/en/Main/Software</span><br>
-                    </div>
-                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
-                        <span class="circle">03  </span> <span class="padding-left"> Install the Sketch program</span><br>
-                    </div>
-                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
-                        <span class="circle">04  </span> <span class="padding-left">Use the Sketch program to open the samples code samples/quickstart/quickstart.ino</span><br>
-                    </div>
-                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
-                        <span class="circle">05  </span> <span class="padding-left">View the lower part of the Sketch pad window to check that the COM connection is shown as active</span><br>
-                    </div>
-                </div>
-            </div>
-        </div>
-{{/zone}}
-{{#zone  "topCss"}}
-    <link href="{{self.publicURL}}/css/fontwso2.css" rel="stylesheet">
-    <link href="{{self.publicURL}}/css/fontwso2-extend.css" rel="stylesheet">
-{{/zone}}

modules/distribution/src/repository/jaggeryapps/iotserver/units/firealarm/firealarm.hbs

@@ -0,0 +1,215 @@
+{{#zone "main"}}
+<div class="container container-bg  white-bg">
+        <div class=" margin-top-double">
+            <div class="row row padding-top-double padding-bottom-double margin-bottom-double">
+                <div class="col-lg-12  margin-top-double">
+                    <h1 class="grey ">Fire Alarm</h1>
+                    <hr>
+                    <p  class="margin-bottom-double light-grey ">Connect your Fire Alarm device
+                    to the WSO2 device cloud. </p>
+                </div>
+            </div>
+            <div class="row margin-bottom-double">
+                <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
+                <img src="{{self.publicURL}}/images/firealarm.png" class="img-responsive">
+            </div>
+                <div class="col-xs-12 col-sm-6 col-md-8 col-lg-8 padding-top">
+                    <h2 class="uppercase">Ingredients</h2>
+                    <hr>
+                    <p class="grey margin-top">Hardware Requirements </p>
+                    <br>
+                                <span class="fw-stack fw-lg margin-right">
+                                    <i class="fw fw-ring fw-stack-2x"> </i>
+                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                </span>Raspberry Pi (Internet Enabled) 
+				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp
+                                <span class="fw-stack fw-lg margin-right">
+                                    <i class="fw fw-ring fw-stack-2x"> </i>
+                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                </span>DHT11 Temperature Sensor<br/><br/>
+				<span class="fw-stack fw-lg margin-right">
+                                    <i class="fw fw-ring fw-stack-2x"> </i>
+                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                </span>LED
+				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp
+				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp
+				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				<span class="fw-stack fw-lg margin-right">
+                                    <i class="fw fw-ring fw-stack-2x"> </i>
+                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                </span>Buzzer(3v)<br><br>
+				<a href="#" class="download-link btn-operations" data-devicetype="firealarm" data-sketchtype="firealarm">Download</a>
+                                <!--form method="POST" class="form-login-box float-left"
+                                action="{{sketchPath}}">
+                                    <input type="hidden" name="deviceType" value="firealarm" />
+                                    <input type="hidden" name="sketchType" value="firealarm" />
+									<button class="wr-btn margin-right" type="submit">Create
+									Sketch
+									for Ethernet</button>
+								</form-->
+                                <br/>
+
+                </div>
+                <div class ="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double grey-bg ">
+                    <h2 class="uppercase">Prepare</h2><hr>
+                    <p class="grey margin-top"><b>Get your device ready</b></p>
+                         <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
+                             <span class="circle">01  </span> <span class="padding-left"><b>Set up your RaspberryPi device as shown in the schematic below and get the FireAlarm setup.</b></span>
+                        </div>
+                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom">
+                        <span class="circle">02  </span> <span class="padding-left"><b>Connect a monitor to your RaspberryPi via the HDMI cable to get a UI view of the device.</b></span>
+                    </div>
+                    <div class="margin-doubles padding-top-double margin-bottom-double light-grey  margin-left-double margin-bottom">
+                        <span class="circle">03  </span> <span class="padding-left"><b>Get the RaspberryPi to connect to the internet (via Ethernet or Wifi) and note its IP_ADDRESS</b></span>
+                        </div>
+                </div>
+		<div class ="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double grey-bg ">
+                    <h2 class="uppercase">Schematic Diagram</h2><hr>
+                    <p class="grey margin-top">Click on the image to zoom</p>
+                    <center>
+                        <a href="{{self.publicURL}}/images/schematicsGuide.png" target="_blank">
+                            <img src="{{self.publicURL}}/images/schematicsGuide.png" class="img-responsive" style="max-width: 500px; max-height: 500px" />
+                        </a>
+                    </center>
+                </div>
+            </div>
+            <div class="row row padding-top-double padding-bottom-double margin-bottom-double  ">
+                <div class="col-lg-12  margin-top-double">
+                    <h2 class="uppercase ">Connect (Quickstart)</h2>
+                    <hr>
+                    <p  class="margin-bottom-double light-grey ">Internet of Things Foundation Quickstart connection  </p>
+<div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
+    <span class="circle">01  </span> <span class="padding-left"><b>Click on the <i>"Create DEB"</i> button above to get the download link for the FireAlarm setup files</b></span><br>
+</div>
+<br>
+<div>
+    <span class="padding-left"><i>(The following commands can be issued by directly typing into the terminal of the device or by an <b>"ssh"</b> login from a remote PC)</i></span> 
+</div>
+<div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
+    <span class="circle">02  </span> <span class="padding-left"><b>Download the FireAlarm setup files using the following command: "curl -k &#60;url_link_received_from_the_above_step&#62; > Agent.zip"</b></span><br>
+	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i> This will download a zip file named &#34;Agent.zip&#34;</i>
+</div>
+                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
+
+        <span class="circle">03  </span> <span class="padding-left"><b>Run the following commands to successfuly install the package and get the service running:</b></span><br>
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>&nbsp;&nbsp;cd &#60PATH_WHERE_THE_DOWNLOADED_&#34;Agent.zip&#34;_FILE_IS&#62 </b> <br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <b>unzip Agent.zip -d Agent</b> <br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <b>cd Agent</b> <br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <b>sudo chmod 755 startservice.sh</b> <br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <b>sudo ./startservice.sh</b> <br>
+
+                    </div>
+
+
+                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
+                        <span class="circle">04  </span> <span class="padding-left">Follow the installation instructions and complete installation. Upon completion the Agent would have started automatically</span><br>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+<div id="download-device-modal-content" class="hide">
+        <div class="content">
+            <div class="row">
+                <div class="col-lg-5 col-md-6 col-centered">
+                    <h3>Please download the file from following link.</h3>
+                    <br/>
+                    <div class="buttons">
+                        <form method="POST" action="{{sketchPath}}">
+                            <input type="hidden" name="deviceType" value="firealarm" />
+                            <input type="hidden" name="sketchType" value="firealarm" />
+                            <button class="btn-operations" type="submit" style="font-size: 13px;border:none;  padding: 10px 10px;  display: inline-block;  margin-right: 2px;  text-decoration: none;">Download Now</button>
+                        &nbsp;&nbsp;
+                        <a href="#" id="download-device-download-link" class="btn-operations">
+                            &nbsp;&nbsp;&nbsp;&nbsp;Copy Link&nbsp;&nbsp;&nbsp;&nbsp;
+                        </a>
+                        &nbsp;&nbsp;
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div id="download-device-modal-content-links" class="hide">
+        <div class="content">
+            <div class="row">
+                <div class="col-lg-5 col-md-6 col-centered">
+                    <h3>Please download the file from following link(Press CTRL+C).</h3>
+                    <br/>
+                    <div>
+                        <input id="download-device-url" style="color:#3f3f3f;padding:5px" type="text" value="" placeholder="Type here" size="60">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div id="device-400-content" class="hide">
+        <div class="content">
+            <div class="row">
+                <div class="col-lg-5 col-md-6 col-centered">
+                    <h3>Exception at backend. Try Later.</h3>
+                    <div class="buttons">
+                        <a href="#" id="device-400-link" class="btn-operations">
+                            &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div id="device-403-content" class="hide">
+        <div class="content">
+            <div class="row">
+                <div class="col-lg-5 col-md-6 col-centered">
+                    <h3>Action not permitted.</h3>
+                    <div class="buttons">
+                        <a href="#" id="device-403-link" class="btn-operations">
+                            &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div id="device-409-content" class="hide">
+        <div class="content">
+            <div class="row">
+                <div class="col-lg-5 col-md-6 col-centered">
+                    <h3>Device Sketch does not exist.</h3>
+                    <div class="buttons">
+                        <a href="#" id="device-409-link" class="btn-operations">
+                            &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div id="device-unexpected-error-content" class="hide">
+        <div class="content">
+            <div class="row">
+                <div class="col-lg-5 col-md-6 col-centered">
+                    <h3>Unexpected error.</h3>
+                    <div class="buttons">
+                        <a href="#" id="device-unexpected-error-link" class="btn-operations">
+                            &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+{{/zone}}
+{{#zone  "topCss"}}
+    <link href="{{self.publicURL}}/css/fontwso2.css" rel="stylesheet">
+    <link href="{{self.publicURL}}/css/fontwso2-extend.css" rel="stylesheet">
+{{/zone}}
+{{#zone "bottomJs"}}
+        <script src="{{self.publicURL}}/js/firealarm.js"></script>
+{{/zone}}

modules/distribution/src/repository/jaggeryapps/iotserver/units/firealarm/firealarm.hbs.save

@@ -0,0 +1,213 @@
+{{#zone "main"}}
+<div class="container container-bg  white-bg">
+        <div class=" margin-top-double">
+            <div class="row row padding-top-double padding-bottom-double margin-bottom-double">
+                <div class="col-lg-12  margin-top-double">
+                    <h1 class="grey ">Fire Alarm</h1>
+                    <hr>
+                    <p  class="margin-bottom-double light-grey ">Connect your Fire Alarm device
+                    to the WSO2 device cloud. </p>
+                </div>
+            </div>
+            <div class="row margin-bottom-double">
+                <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
+                <img src="{{self.publicURL}}/images/firealarm.png" class="img-responsive">
+            </div>
+                <div class="col-xs-12 col-sm-6 col-md-8 col-lg-8 padding-top">
+                    <h2 class="uppercase">Ingredients</h2>
+                    <hr>
+                    <p class="grey margin-top">Hardware Requirements </p>
+                    <br>
+                                <span class="fw-stack fw-lg margin-right">
+                                    <i class="fw fw-ring fw-stack-2x"> </i>
+                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                </span>Raspberry Pi (Internet Enabled) 
+				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp
+                                <span class="fw-stack fw-lg margin-right">
+                                    <i class="fw fw-ring fw-stack-2x"> </i>
+                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                </span>DHT11 Temperature Sensor<br/><br/>
+				<span class="fw-stack fw-lg margin-right">
+                                    <i class="fw fw-ring fw-stack-2x"> </i>
+                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                </span>LED
+				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp
+				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp
+				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				<span class="fw-stack fw-lg margin-right">
+                                    <i class="fw fw-ring fw-stack-2x"> </i>
+                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                </span>Buzzer(3v)<br><br>
+				<a href="#" class="download-link btn-operations" data-devicetype="firealarm" data-sketchtype="firealarm">Download</a>
+                                <!--form method="POST" class="form-login-box float-left"
+                                action="{{sketchPath}}">
+                                    <input type="hidden" name="deviceType" value="firealarm" />
+                                    <input type="hidden" name="sketchType" value="firealarm" />
+									<button class="wr-btn margin-right" type="submit">Create
+									Sketch
+									for Ethernet</button>
+								</form-->
+                                <br/>
+
+                </div>
+                <div class ="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double grey-bg ">
+                    <h2 class="uppercase">Prepare</h2><hr>
+                    <p class="grey margin-top"><b>Get your device ready</b></p>
+                         <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
+                             <span class="circle">01  </span> <span class="padding-left"><b>Set up your RaspberryPi device as shown in the schematic below and get the FireAlarm setup.</b></span>
+                        </div>
+                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom">
+                        <span class="circle">02  </span> <span class="padding-left"><b>Connect a monitor to your RaspberryPi via the HDMI cable to get a UI view of the device.</b></span>
+                    </div>
+                    <div class="margin-doubles padding-top-double margin-bottom-double light-grey  margin-left-double margin-bottom">
+                        <span class="circle">03  </span> <span class="padding-left"><b>Get the RaspberryPi to connect to the internet (via Ethernet or Wifi) and note its IP_ADDRESS</b></span>
+                        </div>
+                </div>
+		<div class ="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double grey-bg ">
+                    <h2 class="uppercase">Schematic Diagram</h2><hr>
+                    <p class="grey margin-top">Click on the image to zoom</p>
+                    <center>
+                        <a href="{{self.publicURL}}/images/schematicsGuide.png" target="_blank">
+                            <img src="{{self.publicURL}}/images/schematicsGuide.png" class="img-responsive" style="max-width: 500px; max-height: 500px" />
+                        </a>
+                    </center>
+                </div>
+            </div>
+            <div class="row row padding-top-double padding-bottom-double margin-bottom-double  ">
+                <div class="col-lg-12  margin-top-double">
+                    <h2 class="uppercase ">Connect (Quickstart)</h2>
+                    <hr>
+                    <p  class="margin-bottom-double light-grey ">Internet of Things Foundation Quickstart connection  </p>
+<div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
+    <span class="circle">01  </span> <span class="padding-left"><b>Click on the <i>"Create DEB"</i> button above to get the download link for the FireAlarm setup files</b></span><br>
+</div>
+<br>
+<div>
+    <span class="padding-left"><i>(The following commands can be issued by directly typing into the terminal of the device or by an <b>"ssh"</b> login from a remote PC)</i></span> 
+</div>
+<div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
+    <span class="circle">02  </span> <span class="padding-left"><b>Download the FireAlarm setup files using the following command: "wget &#60;url_link_received_from_the_above_step&#62;"</b></span><br>
+	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i> This will download a zip file named &#34;FireAlarmAgent.zip&#34;</i>
+</div>
+                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
+                        <span class="circle">03  </span> <span class="padding-left"><b>Run the following commands to successfuly install the package and get the service running:</b></span><br>
+
+
+                    </div>
+
+
+                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
+                        <span class="circle">04  </span> <span class="padding-left">Use the Sketch program to open the samples code samples/quickstart/quickstart.ino</span><br>
+                    </div>
+                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
+                        <span class="circle">05  </span> <span class="padding-left">View the lower part of the Sketch pad window to check that the COM connection is shown as active</span><br>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+<div id="download-device-modal-content" class="hide">
+        <div class="content">
+            <div class="row">
+                <div class="col-lg-5 col-md-6 col-centered">
+                    <h3>Please download the file from following link.</h3>
+                    <br/>
+                    <div class="buttons">
+                        <form method="POST" action="{{sketchPath}}">
+                            <input type="hidden" name="deviceType" value="firealarm" />
+                            <input type="hidden" name="sketchType" value="firealarm" />
+                            <button class="btn-operations" type="submit" style="font-size: 13px;border:none;  padding: 10px 10px;  display: inline-block;  margin-right: 2px;  text-decoration: none;">Download Now</button>
+                        &nbsp;&nbsp;
+                        <a href="#" id="download-device-download-link" class="btn-operations">
+                            &nbsp;&nbsp;&nbsp;&nbsp;Copy Link&nbsp;&nbsp;&nbsp;&nbsp;
+                        </a>
+                        &nbsp;&nbsp;
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div id="download-device-modal-content-links" class="hide">
+        <div class="content">
+            <div class="row">
+                <div class="col-lg-5 col-md-6 col-centered">
+                    <h3>Please download the file from following link(Press CTRL+C).</h3>
+                    <br/>
+                    <div>
+                        <input id="download-device-url" style="color:#3f3f3f;padding:5px" type="text" value="" placeholder="Type here" size="60">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div id="device-400-content" class="hide">
+        <div class="content">
+            <div class="row">
+                <div class="col-lg-5 col-md-6 col-centered">
+                    <h3>Exception at backend. Try Later.</h3>
+                    <div class="buttons">
+                        <a href="#" id="device-400-link" class="btn-operations">
+                            &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div id="device-403-content" class="hide">
+        <div class="content">
+            <div class="row">
+                <div class="col-lg-5 col-md-6 col-centered">
+                    <h3>Action not permitted.</h3>
+                    <div class="buttons">
+                        <a href="#" id="device-403-link" class="btn-operations">
+                            &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div id="device-409-content" class="hide">
+        <div class="content">
+            <div class="row">
+                <div class="col-lg-5 col-md-6 col-centered">
+                    <h3>Device Sketch does not exist.</h3>
+                    <div class="buttons">
+                        <a href="#" id="device-409-link" class="btn-operations">
+                            &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div id="device-unexpected-error-content" class="hide">
+        <div class="content">
+            <div class="row">
+                <div class="col-lg-5 col-md-6 col-centered">
+                    <h3>Unexpected error.</h3>
+                    <div class="buttons">
+                        <a href="#" id="device-unexpected-error-link" class="btn-operations">
+                            &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+{{/zone}}
+{{#zone  "topCss"}}
+    <link href="{{self.publicURL}}/css/fontwso2.css" rel="stylesheet">
+    <link href="{{self.publicURL}}/css/fontwso2-extend.css" rel="stylesheet">
+{{/zone}}
+{{#zone "bottomJs"}}
+        <script src="{{self.publicURL}}/js/firealarm.js"></script>
+{{/zone}}

modules/distribution/src/repository/jaggeryapps/iotserver/units/firealarm/public/js/firealarm.js

@@ -0,0 +1,104 @@
+/*
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+var modalPopup = ".wr-modalpopup";
+var modalPopupContainer = modalPopup + " .modalpopup-container";
+var modalPopupContent = modalPopup + " .modalpopup-content";
+var body = "body";
+
+/*
+ * set popup maximum height function.
+ */
+function setPopupMaxHeight() {
+    $(modalPopupContent).css('max-height', ($(body).height() - ($(body).height() / 100 * 30)));
+    $(modalPopupContainer).css('margin-top', (-($(modalPopupContainer).height() / 2)));
+}
+
+/*
+ * show popup function.
+ */
+function showPopup() {
+    $(modalPopup).show();
+    setPopupMaxHeight();
+}
+
+/*
+ * hide popup function.
+ */
+function hidePopup() {
+    $(modalPopupContent).html('');
+    $(modalPopup).hide();
+}
+
+/*
+ * DOM ready functions.
+ */
+$(document).ready(function () {
+    attachEvents();
+});
+
+function attachEvents() {
+    /**
+     * Following click function would execute
+     * when a user clicks on "Download" link
+     * on Device Management page in WSO2 DC Console.
+     */
+    $("a.download-link").click(function () {
+        var sketchType = $(this).data("sketchtype");
+        var deviceType = $(this).data("devicetype");
+        var downloadDeviceAPI = "/iotserver/api/device/sketch/generate_link";
+        var payload = {"sketchType":sketchType, "deviceType":deviceType};
+        console.log(payload);
+        $(modalPopupContent).html($('#download-device-modal-content').html());
+        showPopup();
+
+        $("a#download-device-download-link").click(function () {
+            invokerUtil.post(
+                downloadDeviceAPI,
+                payload,
+                function (data, textStatus, jqxhr) {
+                    if(jqxhr.status == 200) {
+                        $(modalPopupContent).html($('#download-device-modal-content-links').html());
+                        $("#download-device-url").val(data);
+                        $("#download-device-url").focus(function () {
+                            $(this).select();
+                        });
+                        showPopup();
+                    }else{
+                        $(modalPopupContent).html($('#device-403-content').html());
+                        $("#device-403-link").click(function () {
+                            window.location.reload();
+                        });
+                        showPopup();
+                    }
+                },
+                function () {
+                    $(modalPopupContent).html($('#device-unexpected-error-content').html());
+                    $("a#device-unexpected-error-link").click(function () {
+                        hidePopup();
+                    });
+                }
+            );
+        });
+
+        $("a#download-device-cancel-link").click(function () {
+            hidePopup();
+        });
+
+    });
+}

modules/distribution/src/repository/jaggeryapps/iotserver/units/logo/logo.hbs

@@ -1,5 +1,5 @@
 {{#zone "brand"}}
-    <img src="{{self.publicURL}}/img/logo.png" /><h2 class="app-title"><span>IOT Device Manager</span></h2>
+    <img src="{{self.publicURL}}/img/logo.png" /><h2 class="app-title" style="text-transform:none !important"><span>IoT Device Manager</span></h2>
 {{/zone}}
 {{#zone "favicon"}}
     <link rel="icon" href="{{self.publicURL}}/img/favicon.png" type="image/x-icon" />