diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/controller/UserApplicationController.java b/backend/src/main/java/ru/micord/ervu/account_applications/controller/UserApplicationController.java index f160cd21..a533865e 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/controller/UserApplicationController.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/controller/UserApplicationController.java @@ -30,7 +30,7 @@ public class UserApplicationController { @PutMapping(value = "/status", consumes = MediaType.APPLICATION_JSON_VALUE) public Long updateStatus(@RequestBody ProcessResponseDto data) { - Long appNumber = Long.parseLong(data.appNumber()); + Long appNumber = data.body().applicationNumber(); switch (data.className()) { case UPDATE -> { diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/websocket/dto/ProcessResponseBody.java b/backend/src/main/java/ru/micord/ervu/account_applications/websocket/dto/ProcessResponseBody.java index 4523e130..cbda2a0d 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/websocket/dto/ProcessResponseBody.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/websocket/dto/ProcessResponseBody.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @author gulnaz */ @JsonIgnoreProperties(ignoreUnknown = true) -public record ProcessResponseBody(String type, String userName, @JsonProperty("value") String tempPass, +public record ProcessResponseBody(String type, Long applicationNumber, String userName, + @JsonProperty("value") String tempPass, String secretLink, ProcessErrorMsg msg) { } diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/websocket/dto/ProcessResponseDto.java b/backend/src/main/java/ru/micord/ervu/account_applications/websocket/dto/ProcessResponseDto.java index 585d5245..c801403e 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/websocket/dto/ProcessResponseDto.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/websocket/dto/ProcessResponseDto.java @@ -7,6 +7,5 @@ import ru.micord.ervu.account_applications.websocket.enums.ClassName; * @author gulnaz */ @JsonIgnoreProperties(ignoreUnknown = true) -public record ProcessResponseDto(String appNumber, String forUser, ClassName className, - ProcessResponseBody body) { +public record ProcessResponseDto(String forUser, ClassName className, ProcessResponseBody body) { } diff --git a/frontend/src/ts/account_applications/component/button/UserManagementService.ts b/frontend/src/ts/account_applications/component/button/UserManagementService.ts index 438ef204..64a2df0d 100644 --- a/frontend/src/ts/account_applications/component/button/UserManagementService.ts +++ b/frontend/src/ts/account_applications/component/button/UserManagementService.ts @@ -36,8 +36,6 @@ import {UnblockingData} from "./dto/blocking/UnblockingData"; export class UserManagementService extends Behavior { private static PROCESS_START_PATH = '/service/wf/service/start'; - private static ACCOUNT_BLOCK_PATH = "/service/idm/accounts/blocked/v1"; - private static PERSON_BLOCK_PATH = "/service/idm/persons/blocked/v1"; @NotNull() @ObjectRef() @@ -205,13 +203,7 @@ export class UserManagementService extends Behavior { .then((response: ProcessResponse) => { let code = response.code; - if (code === '200') { - localStorage.setItem(response.traceId, appNumber.toString()); - setTimeout(() => { - localStorage.removeItem(response.traceId); - }, 30 * 60 * 1000); - } - else { + if (code !== '200') { this.saveError(appNumber, response.msg); } }) diff --git a/frontend/src/ts/modules/app/service/authorization.service.ts b/frontend/src/ts/modules/app/service/authorization.service.ts index 0f9b428c..ca9086d8 100644 --- a/frontend/src/ts/modules/app/service/authorization.service.ts +++ b/frontend/src/ts/modules/app/service/authorization.service.ts @@ -16,8 +16,6 @@ export interface UserSession { @Injectable({providedIn: 'root'}) export class AuthorizationService implements OnDestroy { - private static READ_LS_ATTEMPTS: number = 50; - private session: UserSession; public onSessionUpdate: Subject = new Subject(); @@ -37,9 +35,9 @@ export class AuthorizationService implements OnDestroy { this.websocketService.subscribe(({data}) => { let parsedObj = JSON.parse(data); - if (parsedObj && parsedObj.traceId) { + if (parsedObj && parsedObj.body && parsedObj.body.applicationNumber) { if (parsedObj.className === 'update' || parsedObj.className === 'processError') { - this.updateStatus(parsedObj, 0); + this.statusUpdateService.update(parsedObj); } } }); @@ -48,22 +46,6 @@ export class AuthorizationService implements OnDestroy { }) } - private updateStatus(parsedObj: any, count: number): void { - if (count === AuthorizationService.READ_LS_ATTEMPTS) { - return; - } - let appNumber = localStorage.getItem(parsedObj.traceId); - - if (appNumber) { - parsedObj.appNumber = appNumber; - localStorage.removeItem(parsedObj.traceId); - this.statusUpdateService.update(parsedObj); - } - else { - setTimeout(() => this.updateStatus(parsedObj, count++), 100); - } - } - isAuthorized(): boolean { return !!this.session; }