Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/token.jag

@@ -16,7 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-var apiWrapperUtil = require("/app/modules/api-wrapper-util.js").apiWrapperUtil;
-var tokenCookie = apiWrapperUtil.refreshToken();
-print(tokenCookie);
+
+/*
+ @Deprecated - new
+ */
+
+// var apiWrapperUtil = require("/app/modules/api-wrapper-util.js").apiWrapperUtil;
+// var tokenCookie = apiWrapperUtil.refreshToken();
+// print(tokenCookie);
 %>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf

@@ -19,10 +19,6 @@
       "url": "/api/user/*",
       "path": "/api/user-api.jag"
     },
-    {
-      "url": "/token",
-      "path": "/api/token-api.jag"
-    },
     {
       "url": "/api/invoker/*",
       "path": "/api/invoker-api.jag"