[SPA] Updates the angular and react dependencies (#19103)

* Update react dependencies

* Update angular dependencies

* Update react-redux dependencies

* Update more react dependencies

* Fix angular issues

* Fix authorize route
This commit is contained in:
Javier Calvarro Nelson 2020-02-18 18:09:02 -08:00 committed by GitHub
parent c6257f42ba
commit 7ee3aeb9e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10899 additions and 7464 deletions

View File

@ -32,7 +32,7 @@
"zone.js": "0.9.1" "zone.js": "0.9.1"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "^0.803.14", "@angular-devkit/build-angular": "^0.803.24",
"@angular/cli": "8.3.14", "@angular/cli": "8.3.14",
"@angular/compiler-cli": "8.2.12", "@angular/compiler-cli": "8.2.12",
"@angular/language-service": "8.2.12", "@angular/language-service": "8.2.12",

View File

@ -30,7 +30,7 @@ export enum AuthenticationResultStatus {
} }
export interface IUser { export interface IUser {
name: string; name?: string;
} }
@Injectable({ @Injectable({
@ -144,9 +144,9 @@ export class AuthorizeService {
public async completeSignOut(url: string): Promise<IAuthenticationResult> { public async completeSignOut(url: string): Promise<IAuthenticationResult> {
await this.ensureUserManagerInitialized(); await this.ensureUserManagerInitialized();
try { try {
const state = await this.userManager.signoutCallback(url); const response = await this.userManager.signoutCallback(url);
this.userSubject.next(null); this.userSubject.next(null);
return this.success(state && state.data); return this.success(response && response.state);
} catch (error) { } catch (error) {
console.log(`There was an error trying to log out '${error}'.`); console.log(`There was an error trying to log out '${error}'.`);
return this.error(error); return this.error(error);

View File

@ -3,29 +3,28 @@
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"dependencies": { "dependencies": {
"babel-eslint": "10.0.1",
"bootstrap": "^4.1.3", "bootstrap": "^4.1.3",
"jquery": "^3.4.1", "jquery": "^3.4.1",
"merge": "^1.2.1", "merge": "^1.2.1",
"oidc-client": "^1.9.0", "oidc-client": "^1.9.0",
"react": "^16.0.0", "react": "^16.0.0",
"react-dom": "^16.0.0", "react-dom": "^16.0.0",
"react-router-bootstrap": "^0.24.4", "react-router-bootstrap": "^0.25.0",
"react-router-dom": "^4.2.2", "react-router-dom": "^5.1.2",
"react-scripts": "^3.0.1", "react-scripts": "^3.4.0",
"reactstrap": "^6.3.0", "reactstrap": "^8.4.1",
"rimraf": "^2.6.2" "rimraf": "^2.6.2"
}, },
"devDependencies": { "devDependencies": {
"ajv": "^6.9.1", "ajv": "^6.9.1",
"cross-env": "^5.2.0", "cross-env": "^5.2.0",
"eslint": "^5.12.0", "typescript": "^3.7.5",
"eslint-config-react-app": "^4.0.1", "eslint": "^6.8.0",
"eslint-plugin-flowtype": "^2.0.0", "eslint-config-react-app": "^5.2.0",
"eslint-plugin-import": "^2.14.0", "eslint-plugin-flowtype": "^4.6.0",
"eslint-plugin-jsx-a11y": "^6.2.1", "eslint-plugin-import": "^2.20.1",
"eslint-plugin-react": "^7.11.1", "eslint-plugin-jsx-a11y": "^6.2.3",
"typescript": "^3.5.2" "eslint-plugin-react": "^7.18.3"
}, },
"eslintConfig": { "eslintConfig": {
"extends": "react-app" "extends": "react-app"
@ -36,5 +35,17 @@
"test": "cross-env CI=true react-scripts test --env=jsdom", "test": "cross-env CI=true react-scripts test --env=jsdom",
"eject": "react-scripts eject", "eject": "react-scripts eject",
"lint": "eslint ./src/" "lint": "eslint ./src/"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
} }
} }

View File

@ -25,7 +25,10 @@ export default class AuthorizeRoute extends Component {
render() { render() {
const { ready, authenticated } = this.state; const { ready, authenticated } = this.state;
const redirectUrl = `${ApplicationPaths.Login}?${QueryParameterNames.ReturnUrl}=${encodeURI(window.location.href)}` var link = document.createElement("a");
link.href = this.props.path;
const returnUrl = `${link.protocol}//${link.host}${link.pathname}${link.search}${link.hash}`;
const redirectUrl = `${ApplicationPaths.Login}?${QueryParameterNames.ReturnUrl}=${encodeURI(returnUrl)}`
if (!ready) { if (!ready) {
return <div></div>; return <div></div>;
} else { } else {