micord/ervu-lkrp-ul
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPPORT-8427: Fix

Browse source
This commit is contained in:
Eduard Tihomirov 2024-09-06 14:22:10 +03:00
parent 1b7cf9bab8
commit 6b6ee68faf
4 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
View file

@ -192,12 +192,17 @@ public class EsiaAuthService {
EsiaAccessToken esiaAccessToken = ulDataService.readToken(accessToken);
Token token = jwtTokenService.createAccessToken(esiaAccessToken.getSbj_id(), tokenResponse.getExpires_in());
Cookie isAuthToken = new Cookie("auth_token", token.getValue());
isAuthToken.setPath("/");
response.addCookie(isAuthToken);
Cookie authToken = new Cookie("auth_token", token.getValue());
authToken.setPath("/");
authToken.setHttpOnly(true);
response.addCookie(authToken);
SecurityContextHolder.getContext()
.setAuthentication(
new UsernamePasswordAuthenticationToken(esiaAccessToken.getSbj_id(), null));
Cookie isAuth = new Cookie("is_auth", "true");
isAuth.setPath("/");
response.addCookie(isAuth);
return true;
}
catch (Exception e) {
@ -276,12 +281,17 @@ public class EsiaAuthService {
response.addCookie(cookieRefresh);
EsiaAccessToken esiaAccessToken = ulDataService.readToken(accessToken);
Token token = jwtTokenService.createAccessToken(esiaAccessToken.getSbj_id(), tokenResponse.getExpires_in());
Cookie isAuthToken = new Cookie("auth_token", token.getValue());
isAuthToken.setPath("/");
response.addCookie(isAuthToken);
Cookie authToken = new Cookie("auth_token", token.getValue());
authToken.setPath("/");
authToken.setHttpOnly(true);
response.addCookie(authToken);
SecurityContextHolder.getContext()
.setAuthentication(
new UsernamePasswordAuthenticationToken(esiaAccessToken.getSbj_id(), null));
Cookie isAuth = new Cookie("is_auth", "true");
isAuth.setPath("/");
response.addCookie(isAuth);
}
catch (Exception e) {
throw new RuntimeException(e);
@ -326,7 +336,7 @@ public class EsiaAuthService {
if (cookies != null)
for (Cookie cookie : cookies) {
if (cookie.getName().equals("auth_token") || cookie.getName().equals("refresh_token")
|| cookie.getName().equals("access_token")) {
|| cookie.getName().equals("access_token") || cookie.getName().equals("is_auth")) {
cookie.setValue("");
cookie.setPath("/");
cookie.setMaxAge(0);

2
frontend/src/ts/esia/OrgDataRoot.ts
View file

@ -15,7 +15,7 @@ export class OrgDataRoot extends Behavior{
let orgScripts: OrgData[] = this.container.getScriptsInThisAndChildren(OrgData);
let httpClient = this.injector.get(HttpClient);
let cookieService = this.injector.get(CookieService);
if (cookieService.get("auth_token")) {
if (cookieService.get("is_auth")) {
httpClient.get<OrgInfoModel>("esia/org")
.toPromise()
.then(orgInfoModel => {

2
frontend/src/ts/modules/app/component/logout.component.ts
View file

@ -43,7 +43,7 @@ export class LogOutComponent implements OnInit{
}
public getIsAuth(): boolean {
return this.cookieService.get("auth_token") != null;
return this.cookieService.get("is_auth") != null;
}
public getOrgUnitName(): string {

2
frontend/src/ts/modules/security/guard/auth.guard.ts
View file

@ -56,6 +56,6 @@ export abstract class AuthGuard implements CanActivate {
};
public getIsAuth(): string {
return this.cookieService.get('auth_token');
return this.cookieService.get('is_auth');
}
}