From f6d93ccf5bf3bb0946797e10f8a157f1b5fa0af8 Mon Sep 17 00:00:00 2001 From: "adel.kalimullin" Date: Wed, 26 Feb 2025 17:27:40 +0300 Subject: [PATCH] SUPPORT-8956: use domain_id from token --- .../RecruitmentAutoCompleteService.java | 6 +- .../service/RecruitmentComboBoxService.java | 9 +- .../service/RecruitmentGridService.java | 4 +- config.md | 2 +- .../template/app/component/admin_menu.html | 29 ----- .../template/app/component/app_header.html | 6 +- .../app/component/confirm-user-email.html | 27 ---- .../template/app/component/log_out.html | 9 -- .../template/app/component/login.html | 49 ------- .../template/app/component/new_password.html | 103 --------------- .../template/app/component/register.html | 121 ------------------ .../app/component/reset_password.html | 45 ------- .../resources/template/webbpm/jwt-form.html | 2 +- .../webbpm/component/token-form.component.ts | 4 +- .../webbpm/user-management-routing.module.ts | 88 ------------- .../src/ts/modules/webbpm/webbpm.module.ts | 3 - 16 files changed, 14 insertions(+), 493 deletions(-) delete mode 100644 frontend/src/resources/template/app/component/admin_menu.html delete mode 100644 frontend/src/resources/template/app/component/confirm-user-email.html delete mode 100644 frontend/src/resources/template/app/component/log_out.html delete mode 100644 frontend/src/resources/template/app/component/login.html delete mode 100644 frontend/src/resources/template/app/component/new_password.html delete mode 100644 frontend/src/resources/template/app/component/register.html delete mode 100644 frontend/src/resources/template/app/component/reset_password.html delete mode 100644 frontend/src/ts/modules/webbpm/user-management-routing.module.ts diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/component/service/RecruitmentAutoCompleteService.java b/backend/src/main/java/ru/micord/ervu/account_applications/component/service/RecruitmentAutoCompleteService.java index 7115b180..f2a18bc0 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/component/service/RecruitmentAutoCompleteService.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/component/service/RecruitmentAutoCompleteService.java @@ -19,7 +19,7 @@ import ru.cg.webbpm.modules.database.api.dao.option.SortOrder; import ru.cg.webbpm.modules.database.bean.filter.EntityFilter; import ru.cg.webbpm.modules.database.bean.filter.EntityFilterGroup; import ru.cg.webbpm.modules.database.bean.filter.FilterOperation; -import ru.cg.webbpm.modules.security.api.runtime.SecurityContext; +import ru.micord.ervu.account_applications.security.context.SecurityContext; /** * @author Adel Kalimullin @@ -90,8 +90,8 @@ public class RecruitmentAutoCompleteService extends AbstractAutocompleteService< } private List getRecruitmentIdsForCurrentUser() { - String currentOrgUnitCode = securityContext.getCurrentOrgUnitCode(); - return recruitmentDao.getRecruitmentIdsWithParentByOrgCode(currentOrgUnitCode); + String recruitmentId = securityContext.getRecruitmentId(); + return recruitmentDao.getRecruitmentIdsWithParentByOrgCode(recruitmentId); } private EntityFilter getEntityFilterForRecruitmentIds(List ids) { diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/component/service/RecruitmentComboBoxService.java b/backend/src/main/java/ru/micord/ervu/account_applications/component/service/RecruitmentComboBoxService.java index d15e8d8c..bf1b2f21 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/component/service/RecruitmentComboBoxService.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/component/service/RecruitmentComboBoxService.java @@ -9,6 +9,7 @@ import org.springframework.stereotype.Service; import property.enums.DisplayType; import property.grid.ColumnSort; import ru.micord.ervu.account_applications.component.dao.RecruitmentDao; +import ru.micord.ervu.account_applications.security.context.SecurityContext; import service.field.ComboBoxServiceImpl; import ru.cg.webbpm.modules.database.api.bean.TableRow; @@ -16,7 +17,6 @@ import ru.cg.webbpm.modules.database.api.dao.option.LoadOptions; import ru.cg.webbpm.modules.database.api.dao.option.SortOrder; import ru.cg.webbpm.modules.database.bean.filter.EntityFilter; import ru.cg.webbpm.modules.database.bean.filter.FilterOperation; -import ru.cg.webbpm.modules.security.api.runtime.SecurityContext; /** @@ -26,13 +26,12 @@ import ru.cg.webbpm.modules.security.api.runtime.SecurityContext; public class RecruitmentComboBoxService extends ComboBoxServiceImpl { private final RecruitmentDao recruitmentDao; private final SecurityContext securityContext; - - public RecruitmentComboBoxService(RecruitmentDao recruitmentDao, - SecurityContext securityContext) { + public RecruitmentComboBoxService(RecruitmentDao recruitmentDao, SecurityContext securityContext) { this.recruitmentDao = recruitmentDao; this.securityContext = securityContext; } + @Override public List loadData() { return load(new LoadOptions()); @@ -102,7 +101,7 @@ public class RecruitmentComboBoxService extends ComboBoxServiceImpl { } private List getRecruitmentIdsForCurrentUser() { - String currentOrgUnitCode = securityContext.getCurrentOrgUnitCode(); + String currentOrgUnitCode = securityContext.getRecruitmentId(); return recruitmentDao.getRecruitmentIdsWithParentByOrgCode(currentOrgUnitCode); } diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/component/service/RecruitmentGridService.java b/backend/src/main/java/ru/micord/ervu/account_applications/component/service/RecruitmentGridService.java index 26548cc6..3a017259 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/component/service/RecruitmentGridService.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/component/service/RecruitmentGridService.java @@ -18,7 +18,7 @@ import ru.cg.webbpm.modules.database.bean.annotation.LocalGraphSource; import ru.cg.webbpm.modules.database.bean.entity_graph.EntityColumn; import ru.cg.webbpm.modules.database.bean.filter.EntityFilter; import ru.cg.webbpm.modules.database.bean.filter.FilterOperation; -import ru.cg.webbpm.modules.security.api.runtime.SecurityContext; +import ru.micord.ervu.account_applications.security.context.SecurityContext; import ru.cg.webbpm.modules.standard_annotations.editor.ObjectRef; import ru.cg.webbpm.modules.standard_annotations.validation.NotNull; @@ -70,7 +70,7 @@ public class RecruitmentGridService extends GridV2ServiceImpl { } private List getRecruitmentIdsForCurrentUser() { - String currentOrgUnitCode = securityContext.getCurrentOrgUnitCode(); + String currentOrgUnitCode = securityContext.getRecruitmentId(); return recruitmentDao.getRecruitmentIdsWithParentByOrgCode(currentOrgUnitCode); } diff --git a/config.md b/config.md index de7c93e2..40918f73 100644 --- a/config.md +++ b/config.md @@ -67,7 +67,7 @@ Собранный образ фронтенда имеет возможность работать как полноценное standalone приложение, так и как удалённый модуль MFe. Для настройки Mfe следует указать следующие переменные: -* MFE_BASE_URL - указывается frontend/.env, либо в переменных среды сборки приложения. При изменении переменной приложение надо пересобирать. По умолчанию /mfe/business-metrics +* MFE_BASE_URL - указывается frontend/.env, либо в переменных среды сборки приложения. При изменении переменной приложение надо пересобирать. По умолчанию /mfe/account-applications * backend.url - если необходимо настроить url бэкенда, его можно указать в frontend/src/resources/app.config.json diff --git a/frontend/src/resources/template/app/component/admin_menu.html b/frontend/src/resources/template/app/component/admin_menu.html deleted file mode 100644 index 21be41a2..00000000 --- a/frontend/src/resources/template/app/component/admin_menu.html +++ /dev/null @@ -1,29 +0,0 @@ -
- -
- - - - - -
-
diff --git a/frontend/src/resources/template/app/component/app_header.html b/frontend/src/resources/template/app/component/app_header.html index a8233b57..122ebf2a 100644 --- a/frontend/src/resources/template/app/component/app_header.html +++ b/frontend/src/resources/template/app/component/app_header.html @@ -1,11 +1,7 @@ -