community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Redirect logged-out user within the loading screen in APPM UI

Browse Source
This commit is contained in:
Jayasanka 2019-10-07 18:05:56 +05:30
parent f1f7a3d9e3
commit 8b4c2f0e79
4 changed files with 65 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js vendored
View File

@ -24,7 +24,7 @@ import {
Redirect, Switch,
} from 'react-router-dom';
import axios from "axios";
import {Layout, Spin, Result} from "antd";
import {Layout, Spin, Result, notification} from "antd";
import ConfigContext from "./context/ConfigContext";
const {Content} = Layout;
@ -68,9 +68,7 @@ class App extends React.Component {
window.location.origin + "/publisher/public/conf/config.json",
).then(res => {
const config = res.data;
this.getAndroidEnterpriseToken(config);
this.checkUserLoggedIn(config);
}).catch((error) => {
this.setState({
loading: false,
@ -99,6 +97,31 @@ class App extends React.Component {
});
};
checkUserLoggedIn = (config) => {
axios.get(
window.location.origin + config.serverConfig.invoker.uri +
config.serverConfig.invoker.publisher + "/applications/categories"
).then(res => {
this.getAndroidEnterpriseToken(config);
}).catch((error) => {
if (error.hasOwnProperty("response") && error.response.status === 401) {
const redirectUrl = encodeURI(window.location.href);
const pageURL = window.location.pathname;
const lastURLSegment = pageURL.substr(pageURL.lastIndexOf('/') + 1);
if(lastURLSegment!=="login"){
window.location.href = window.location.origin + `/publisher/login?redirect=${redirectUrl}`;
}else{
this.getAndroidEnterpriseToken(config);
}
} else {
this.setState({
loading: false,
error: true
})
}
});
};
render() {
const {loading, error} = this.state;

7
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-release/AddReleaseForm.js vendored
View File

@ -106,8 +106,6 @@ class AddNewReleaseFormComponent extends React.Component {
loading: true
});
const {price, isSharedWithAllTenants, icon, screenshots, releaseDescription, releaseType, binaryFile} = values;
const data = new FormData();
//add release data
@ -115,7 +113,7 @@ class AddNewReleaseFormComponent extends React.Component {
description: releaseDescription,
price: (price === undefined) ? 0 : parseInt(price),
isSharedWithAllTenants,
metaData: "string",
metaData: "[]",
releaseType: releaseType,
supportedOsVersions: `${this.lowerOsVersion}-${this.upperOsVersion}`
};
@ -132,7 +130,8 @@ class AddNewReleaseFormComponent extends React.Component {
data.append("applicationRelease", blob);
const url = window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/" + deviceType + "/ent-app/" + appId;
const url = window.location.origin + config.serverConfig.invoker.uri +
config.serverConfig.invoker.publisher + "/applications/" + deviceType + "/ent-app/" + appId;
axios.post(
url,

38
components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/App.js vendored
View File

@ -67,11 +67,8 @@ class App extends React.Component {
axios.get(
window.location.origin + "/store/public/conf/config.json",
).then(res => {
console.log(res);
this.setState({
loading: false,
config: res.data
})
const config = res.data;
this.checkUserLoggedIn(config);
}).catch((error) => {
this.setState({
loading: false,
@ -80,6 +77,37 @@ class App extends React.Component {
});
}
checkUserLoggedIn = (config) => {
axios.get(
window.location.origin + config.serverConfig.invoker.uri +
config.serverConfig.invoker.publisher + "/applications/categories"
).then(res => {
this.setState({
loading: false,
config: config
})
}).catch((error) => {
if (error.hasOwnProperty("response") && error.response.status === 401) {
const redirectUrl = encodeURI(window.location.href);
const pageURL = window.location.pathname;
const lastURLSegment = pageURL.substr(pageURL.lastIndexOf('/') + 1);
if(lastURLSegment!=="login"){
window.location.href = window.location.origin + `/store/login?redirect=${redirectUrl}`;
}else{
this.setState({
loading: false,
config: config
})
}
} else {
this.setState({
loading: false,
error: true
})
}
});
}
render() {
const {loading, error} = this.state;

3
components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/js/Utils.js vendored
View File

@ -21,7 +21,8 @@ import {notification} from "antd";
export const handleApiError = (error, message) => {
console.log(error);
if (error.hasOwnProperty("response") && error.response.status === 401) {
window.location.href = window.location.origin + '/store/login';
const redirectUrl = encodeURI(window.location.href);
window.location.href = window.location.origin + `/store/login?redirect=${redirectUrl}`;
} else {
notification["error"]({
message: "There was a problem",