diff --git a/src/WebClient/brecal-app/package.json b/src/WebClient/brecal-app/package.json
index 5ef5063..3dfe26f 100644
--- a/src/WebClient/brecal-app/package.json
+++ b/src/WebClient/brecal-app/package.json
@@ -13,6 +13,7 @@
"react-router-dom": "^6.22.3",
"react-scripts": "^5.0.1",
"react-validation": "^3.0.7",
+ "html-react-parser": "^5.1.9",
"validator": "^13.11.0",
"web-vitals": "^2.1.4"
},
diff --git a/src/WebClient/brecal-app/src/App.js b/src/WebClient/brecal-app/src/App.js
index e1f7e1d..aebed1b 100644
--- a/src/WebClient/brecal-app/src/App.js
+++ b/src/WebClient/brecal-app/src/App.js
@@ -97,7 +97,7 @@ class App extends Component {
- {currentUser.username}
+ {currentUser.user_name}
diff --git a/src/WebClient/brecal-app/src/components/home.component.js b/src/WebClient/brecal-app/src/components/home.component.js
index 4c5bb20..932b76e 100644
--- a/src/WebClient/brecal-app/src/components/home.component.js
+++ b/src/WebClient/brecal-app/src/components/home.component.js
@@ -1,21 +1,24 @@
import React, { Component } from 'react';
import UserService from '../services/user.service';
+import parse from 'html-react-parser';
export default class Home extends Component {
constructor(props) {
super(props);
this.state = {
- content: ""
+ content: "",
};
}
componentDidMount() {
UserService.getPublicContent().then(
response => {
+ var bodyHtml = /([\s\S]*)<\/body>/.exec(response.data)[1];
this.setState({
- content: response.data
+ content: bodyHtml
});
+
},
error => {
this.setState({
@@ -32,8 +35,10 @@ export default class Home extends Component {
return (
);
diff --git a/src/WebClient/brecal-app/src/components/login.component.js b/src/WebClient/brecal-app/src/components/login.component.js
index 08dcf8b..12eff47 100644
--- a/src/WebClient/brecal-app/src/components/login.component.js
+++ b/src/WebClient/brecal-app/src/components/login.component.js
@@ -59,7 +59,7 @@ class Login extends Component {
if (this.checkBtn.context._errors.length === 0) {
AuthService.login(this.state.username, this.state.password).then(
() => {
- this.props.navigate('/profile');
+ this.props.router.navigate('/profile');
window.location.reload();
},
error => {
diff --git a/src/WebClient/brecal-app/src/components/profile.component.js b/src/WebClient/brecal-app/src/components/profile.component.js
index 527a485..150daad 100644
--- a/src/WebClient/brecal-app/src/components/profile.component.js
+++ b/src/WebClient/brecal-app/src/components/profile.component.js
@@ -9,7 +9,7 @@ export default class Profile extends Component {
this.state = {
redirect: null,
userReady: false,
- currentUser: {username: ""}
+ currentUser: {username: "", token: "", id: "", email: ""}
};
}
@@ -31,7 +31,6 @@ export default class Profile extends Component {
const { currentUser } = this.state;
return (
-
@@ -39,7 +38,7 @@ export default class Profile extends Component {
- Token:{ currentUser.accessToken.substring(0, 20) } { currentUser.accessToken.substr(currentUser.accessToken.length - 20) }
+ Token: { currentUser.token }
Id:{ currentUser.id }
@@ -47,12 +46,8 @@ export default class Profile extends Component {
Email:{ currentUser.email }
-
Authorities:
-
- {currentUser.roles && currentUser.roles.map((role, index) => - {role}
)}
-
+
-
);
}
diff --git a/src/WebClient/brecal-app/src/services/user.service.js b/src/WebClient/brecal-app/src/services/user.service.js
index 86ce2d1..032d2ed 100644
--- a/src/WebClient/brecal-app/src/services/user.service.js
+++ b/src/WebClient/brecal-app/src/services/user.service.js
@@ -28,4 +28,5 @@ class UserService {
}
-export default new UserService();
+const userService = new UserService();
+export default userService;