import { navigateToRootProject, navigateToLinkAccount } from "~/store/navigation/navigation-action";
import { Config } from "~/common/config";
import { getAccountLinkData } from "~/store/link-account-panel/link-account-panel-actions";
+import { replace } from "react-router-redux";
interface ApiTokenProps {
authService: AuthService;
const apiToken = getUrlParameter(search, 'api_token');
const loadMainApp = this.props.loadMainApp;
this.props.dispatch<any>(saveApiToken(apiToken)).finally(() => {
- if (loadMainApp) {
- if (this.props.dispatch(getAccountLinkData())) {
- this.props.dispatch(navigateToLinkAccount);
- }
- else {
- this.props.dispatch(navigateToRootProject);
+ const redirectURL = this.props.authService.getTargetURL();
+
+ setTimeout(() => {
+ if (loadMainApp) {
+ if (redirectURL) {
+ this.props.authService.removeTargetURL();
+ this.props.dispatch(replace(redirectURL));
+ }
+ else if (this.props.dispatch(getAccountLinkData())) {
+ this.props.dispatch(navigateToLinkAccount);
+ }
+ else {
+ this.props.dispatch(navigateToRootProject);
+ }
}
- }
+ }, 0);
});
}
render() {