Change invoker uri and remove headers

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/public/conf/config.json

@@ -8,7 +8,7 @@
     "hostname": "localhost",
     "httpsPort": "9443",
     "invoker": {
-      "uri": "/ui-request-handler/invoke",
+      "uri": "/publisher-ui-request-handler/invoke",
       "publisher": "/application-mgt-publisher/v1.0",
       "store": "/application-mgt-store/v1.0",
       "admin" : ""

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/detailed-rating/DetailedRating.js

@@ -30,13 +30,9 @@ class DetailedRating extends React.Component{
     }
 
     getData = (type, uuid)=>{
-        console.log();
-
         return axios.get(
-            config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.store+"/reviews/"+uuid+"/"+type+"-rating",
+            config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.publisher+"/admin/reviews/"+uuid+"/"+type+"-rating",
-            {
+            ).then(res => {
-                headers: { 'X-Platform': config.serverConfig.platform }
-            }).then(res => {
             if (res.status === 200) {
                 let detailedRating = res.data.data;
                 this.setState({

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppsTable.js

@@ -108,9 +108,7 @@ class AppsTable extends React.Component {
        axios.post(
             config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.publisher+"/applications",
             data,
-            {
+
-                headers: { 'X-Platform': config.serverConfig.platform }
-            }
         ).then(res => {
             if (res.status === 200) {
                 let apps = [];

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/Reviews.js

@@ -31,7 +31,7 @@ class Reviews extends React.Component {
         const {uuid, type} = this.props;
 
         axios.get(
-            config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.store+"/reviews/"+type+"/"+uuid,
+            config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.publisher+"/admin/reviews/"+type+"/"+uuid,
             {
                 headers: {'X-Platform': config.serverConfig.platform}
             }).then(res => {

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageCategories.js

@@ -22,9 +22,7 @@ class ManageCategories extends React.Component {
     componentDidMount() {
         axios.get(
             config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.publisher+"/applications/categories",
-            {
+            ).then(res => {
-                headers: { 'X-Platform': config.serverConfig.platform }
-            }).then(res => {
             if (res.status === 200) {
                 let categories = JSON.parse(res.data.data);
                 this.setState({
@@ -59,9 +57,7 @@ class ManageCategories extends React.Component {
         });
         axios.delete(
             config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.publisher+"/admin/applications/categories/"+id,
-            {
+
-                headers: { 'X-Platform': config.serverConfig.platform }
-            }
         ).then(res => {
             if (res.status === 200) {
                 notification["success"]({
@@ -202,9 +198,7 @@ class ManageCategories extends React.Component {
         axios.post(
         config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.publisher+"/admin/applications/categories",
             data,
-            {
+
-                headers: { 'X-Platform': config.serverConfig.platform }
-            }
         ).then(res => {
             if (res.status === 200) {
                 notification["success"]({
@@ -267,9 +261,7 @@ class ManageCategories extends React.Component {
         axios.put(
             config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.publisher+"/admin/applications/categories/rename?from="+currentlyEditingId+"&to="+editingValue,
             {},
-            {
+
-                headers: { 'X-Platform': config.serverConfig.platform }
-            }
         ).then(res => {
             if (res.status === 200) {
                 notification["success"]({

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageTags.js

@@ -22,9 +22,7 @@ class ManageTags extends React.Component {
     componentDidMount() {
         axios.get(
             config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.publisher+"/applications/tags",
-            {
+            ).then(res => {
-                headers: { 'X-Platform': config.serverConfig.platform }
-            }).then(res => {
             if (res.status === 200) {
                 let tags = JSON.parse(res.data.data);
                 this.setState({
@@ -202,9 +200,7 @@ class ManageTags extends React.Component {
 
         axios.post(config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.publisher+"/applications/tags",
             data,
-            {
+            ).then(res => {
-                headers: { 'X-Platform': config.serverConfig.platform }
-            }).then(res => {
             if (res.status === 200) {
                 notification["success"]({
                     message: "Done!",
@@ -266,9 +262,7 @@ class ManageTags extends React.Component {
         axios.put(
             config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.publisher+"/applications/tags/rename?from="+currentlyEditingId+"&to="+editingValue,
             {},
-            {
+
-                headers: { 'X-Platform': config.serverConfig.platform }
-            }
         ).then(res => {
             if (res.status === 200) {
                 notification["success"]({

components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/public/conf/config.json

@@ -9,13 +9,13 @@
     "httpsPort": "9443",
     "invokerUri": "/ui-request-handler/invoke/application-mgt-store/v1.0",
     "invoker": {
-      "uri": "/ui-request-handler/invoke",
+      "uri": "/store-ui-request-handler/invoke",
       "publisher": "/application-mgt-publisher/v1.0",
       "store": "/application-mgt-store/v1.0",
       "admin" : "",
       "deviceMgt" : "/device-mgt/v1.0"
     },
-    "loginUri": "/ui-request-handler/login",
+    "loginUri": "/store-ui-request-handler/login",
     "platform": "store"
   },
   "defaultPlatformIcons": {

components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js

@@ -43,9 +43,7 @@ class AppList extends React.Component {
         axios.post(
             config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.store+"/applications/",
             payload,
-            {
+
-                headers: { 'X-Platform': config.serverConfig.platform }
-            }
         ).then(res => {
             if (res.status === 200) {
                 //todo remove this property check after backend improvement

components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/DetailedRating.js

@@ -33,9 +33,7 @@ class DetailedRating extends React.Component{
 
         return axios.get(
             config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.store+"/reviews/"+uuid+"/"+type+"-rating",
-            {
+            ).then(res => {
-                headers: { 'X-Platform': config.serverConfig.platform }
-            }).then(res => {
             if (res.status === 200) {
                 let detailedRating = res.data.data;
                 this.setState({

components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceInstall.js

@@ -140,9 +140,7 @@ class DeviceInstall extends React.Component {
         //send request to the invoker
         axios.get(
             config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.deviceMgt+"devices?" + encodedExtraParams,
-            {
+
-                headers: { 'X-Platform': config.serverConfig.platform }
-            }
         ).then(res => {
             if (res.status === 200) {
                 const pagination = {...this.state.pagination};

components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupInstall.js

@@ -29,9 +29,7 @@ class GroupInstall extends React.Component {
 
         axios.post(
             config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.deviceMgt+"/groups?name=" + value,
-            {
+
-                headers: { 'X-Platform': config.serverConfig.platform }
-            }
         ).then(res => {
             if (res.status === 200) {
                 if (fetchId !== this.lastFetchId) {

components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleInstall.js

@@ -29,9 +29,7 @@ class RoleInstall extends React.Component {
 
         axios.get(
             config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.deviceMgt+"/roles?filter=" + value,
-            {
+
-                headers: { 'X-Platform': config.serverConfig.platform }
-            }
         ).then(res => {
             if (res.status === 200) {
                 if (fetchId !== this.lastFetchId) {

components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserInstall.js

@@ -31,9 +31,7 @@ class UserInstall extends React.Component {
         //send request to the invoker
         axios.get(
             config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.deviceMgt+"/users/search?username=" + value,
-            {
+
-                headers: { 'X-Platform': config.serverConfig.platform }
-            }
         ).then(res => {
             if (res.status === 200) {
                 if (fetchId !== this.lastFetchId) {

components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/AddReview.js

@@ -57,9 +57,7 @@ class AddReview extends React.Component {
         axios.post(
             config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.store+"/reviews/"+uuid,
             payload,
-            {
+            ).then(res => {
-                headers: { 'X-Platform': config.serverConfig.platform }
-            }).then(res => {
             if (res.status === 201) {
                 this.setState({
                     loading: false,

components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/apps/release/Release.js

@@ -39,9 +39,7 @@ class Release extends React.Component {
         //send request to the invoker
         axios.get(
             config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.store+"/applications/"+uuid,
-            {
+
-                headers: { 'X-Platform': config.serverConfig.platform }
-            }
         ).then(res => {
             if (res.status === 200) {
                 let app = res.data.data;