- const loadMainApp = this.props.loadMainApp;
- this.props.dispatch(saveApiToken(apiToken));
- this.props.dispatch<any>(getUserDetails()).then((user: User) => {
- this.props.dispatch(initSessions(this.props.authService, this.props.config, user));
- }).finally(() => {
- if (loadMainApp) {
+ this.props.dispatch<any>(saveApiToken(apiToken));
+ }
+
+ componentDidUpdate() {
+ const redirectURL = this.props.authService.getTargetURL();
+
+ if (this.props.loadMainApp && this.props.user) {
+ if (redirectURL) {
+ this.props.authService.removeTargetURL();
+ this.props.dispatch(replace(redirectURL));
+ }
+ else if (this.props.dispatch(getAccountLinkData())) {
+ this.props.dispatch(navigateToLinkAccount);
+ }
+ else {