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

фикс ролей

Browse source
This commit is contained in:
adel.ka 2025-08-27 20:51:29 +03:00
parent 0639e1ccbb
commit 116dfd95e8
10 changed files with 77 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

25
backend/src/main/java/ru/micord/ervu/account_applications/security/service/ErvuJwtTokenService.java
View file

@ -45,15 +45,16 @@ public class ErvuJwtTokenService implements JwtTokenService {
try {
token = token.substring(0, token.lastIndexOf(".") + 1);
JwtParser parser = Jwts.parser();
Claims claims = parser
.parseClaimsJwt(token).getBody();
Claims claims = parser.parseClaimsJwt(token).getBody();
List<String> lowerCaseRoles = getLowerCaseRoles(claims);
return UserSession.builder()
.withUserId(claims.getSubject())
.withName(claims.get("name", String.class))
.withRealm(claims.get("realm", String.class))
.withDomainId(claims.get("domain_id", String.class))
.withRoles(getRoles((List<String>) claims.get("roles", ArrayList.class)))
.withRoles(getRoles(lowerCaseRoles))
.build();
}
catch (JwtException e) {
@ -61,8 +62,6 @@ public class ErvuJwtTokenService implements JwtTokenService {
}
}
protected UserSession parseToken(String token) {
JwtParser parser = Jwts.parser();
try {
@ -75,19 +74,29 @@ public class ErvuJwtTokenService implements JwtTokenService {
}
Claims claims = parser.parseClaimsJws(token).getBody();
List<String> lowerCaseRoles = getLowerCaseRoles(claims);
return UserSession.builder()
.withUserId(claims.getSubject())
.withName(claims.get("name", String.class))
.withRealm(claims.get("realm", String.class))
.withDomainId(claims.get("domain_id", String.class))
.withRoles((getRoles((List<String>) claims.get("roles", ArrayList.class))))
.withRoles(getRoles(lowerCaseRoles))
.build();
}
catch (JwtException e){
catch (JwtException e) {
throw new JwtProcessingException(e.getMessage());
}
}
}
private List<String> getLowerCaseRoles(Claims claims) {
List<String> roleList = claims.get("roles", ArrayList.class);
return roleList != null ?
roleList.stream()
.map(String::toLowerCase)
.collect(Collectors.toList()) :
new ArrayList<>();
}
protected Set<ErvuRoleAuthority> getRoles(List<String> roles) {
return roles

13
resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page
View file

@ -15,7 +15,6 @@
<componentRootId>e776df9b-b752-4023-84f7-b9c47874f664</componentRootId>
<name>Hbox</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
@ -1405,7 +1404,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_information_security"</simple>
<simple>"responsible_for_information_security"</simple>
</value>
</entry>
</complex>
@ -1594,7 +1593,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_internal_control"</simple>
<simple>"responsible_for_internal_control"</simple>
</value>
</entry>
</complex>
@ -4948,7 +4947,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_information_security"</simple>
<simple>"responsible_for_information_security"</simple>
</value>
</entry>
</complex>
@ -5247,7 +5246,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_internal_control"</simple>
<simple>"responsible_for_internal_control"</simple>
</value>
</entry>
</complex>
@ -5442,7 +5441,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_internal_control"</simple>
<simple>"responsible_for_internal_control"</simple>
</value>
</entry>
</complex>
@ -6441,7 +6440,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_information_security"</simple>
<simple>"responsible_for_information_security"</simple>
</value>
</entry>
</complex>

22
resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на изменение пользователя.page
View file

@ -26,7 +26,6 @@
<componentRootId>bfe23489-f84c-4a83-ac19-7f6a7ff72a19</componentRootId>
<name>Vbox_85%</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -159,7 +158,6 @@
<componentRootId>a68c745b-dad9-4eb3-99fb-34c1554f21c3</componentRootId>
<name>Vbox_15%</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -343,7 +341,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_information_security"</simple>
<simple>"responsible_for_information_security"</simple>
</value>
</entry>
</complex>
@ -532,7 +530,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_internal_control"</simple>
<simple>"responsible_for_internal_control"</simple>
</value>
</entry>
</complex>
@ -4092,7 +4090,6 @@
<componentRootId>17309155-1a83-4e58-b5f6-3fc377316819</componentRootId>
<name>Vbox_AC_role</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -4225,7 +4222,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_information_security"</simple>
<simple>"responsible_for_information_security"</simple>
</value>
</entry>
</complex>
@ -4524,7 +4521,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_internal_control"</simple>
<simple>"responsible_for_internal_control"</simple>
</value>
</entry>
</complex>
@ -4719,7 +4716,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_internal_control"</simple>
<simple>"responsible_for_internal_control"</simple>
</value>
</entry>
</complex>
@ -5718,7 +5715,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_information_security"</simple>
<simple>"responsible_for_information_security"</simple>
</value>
</entry>
</complex>
@ -8255,13 +8252,6 @@
</properties>
</scripts>
</children>
<children id="db7dcf3f-cb8f-4323-a369-ad9182f9309e">
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
<componentRootId>db7dcf3f-cb8f-4323-a369-ad9182f9309e</componentRootId>
<name>AC_отклонить_примечание</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="52611e59-43a1-4cae-b364-a285099a79c3">
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
<componentRootId>52611e59-43a1-4cae-b364-a285099a79c3</componentRootId>

6
resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page
View file

@ -15,7 +15,6 @@
<componentRootId>9b14a80f-1bc6-4a71-a58c-2d1408223c3a</componentRootId>
<name>Hbox</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
@ -218,6 +217,7 @@
<componentRootId>d4bb4c8f-6378-45c2-b397-4e18bbbff280</componentRootId>
<name>AC_creator</name>
<container>false</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
@ -291,7 +291,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_information_security"</simple>
<simple>"responsible_for_information_security"</simple>
</value>
</entry>
</complex>
@ -480,7 +480,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_internal_control"</simple>
<simple>"responsible_for_internal_control"</simple>
</value>
</entry>
</complex>

14
resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на активацию.page
View file

@ -201,6 +201,13 @@
<className>CheckUserRole</className>
<packageName>modules.user-management.component</packageName>
</classRef>
<expanded>true</expanded>
</scripts>
<scripts id="5e447b4c-2648-463c-8404-b859a6bdb8c2">
<classRef type="TS">
<className>ErvuCheckUserRole</className>
<packageName>account_applications</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
</scripts>
@ -210,6 +217,7 @@
<componentRootId>d4bb4c8f-6378-45c2-b397-4e18bbbff280</componentRootId>
<name>AC_creator</name>
<container>false</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
@ -283,7 +291,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Ответственный за ЗИ"</simple>
<simple>"responsible_for_information_security"</simple>
</value>
</entry>
</complex>
@ -472,7 +480,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Ответственный за ЗИ СВК"</simple>
<simple>"responsible_for_internal_control"</simple>
</value>
</entry>
</complex>
@ -661,7 +669,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Администратор ПОИБ"</simple>
<simple>"security_administrator"</simple>
</value>
</entry>
</complex>

14
resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на деактивацию.page
View file

@ -15,7 +15,6 @@
<componentRootId>9b14a80f-1bc6-4a71-a58c-2d1408223c3a</componentRootId>
<name>Hbox</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
@ -202,6 +201,13 @@
<className>CheckUserRole</className>
<packageName>modules.user-management.component</packageName>
</classRef>
<expanded>true</expanded>
</scripts>
<scripts id="fb52922a-4a4e-442f-ae60-174eb7e298b0">
<classRef type="TS">
<className>ErvuCheckUserRole</className>
<packageName>account_applications</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
</scripts>
@ -284,7 +290,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Ответственный за ЗИ"</simple>
<simple>"responsible_for_information_security"</simple>
</value>
</entry>
</complex>
@ -473,7 +479,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Ответственный за ЗИ СВК"</simple>
<simple>"responsible_for_internal_control"</simple>
</value>
</entry>
</complex>
@ -662,7 +668,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Администратор ПОИБ"</simple>
<simple>"security_administrator"</simple>
</value>
</entry>
</complex>

9
resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page
View file

@ -15,7 +15,6 @@
<componentRootId>9b14a80f-1bc6-4a71-a58c-2d1408223c3a</componentRootId>
<name>Hbox</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
@ -196,6 +195,7 @@
<componentRootId>fd41e974-6a38-4c4f-8458-c4100249853b</componentRootId>
<name>user_role</name>
<container>false</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="26133e8f-65d7-44ca-a0a4-68db3f5b62a3"/>
<scripts id="86e89129-ae47-46eb-80bf-cc2f085b417d"/>
@ -218,6 +218,7 @@
<componentRootId>d4bb4c8f-6378-45c2-b397-4e18bbbff280</componentRootId>
<name>AC_creator</name>
<container>false</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
@ -291,7 +292,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_information_security"</simple>
<simple>"responsible_for_information_security"</simple>
</value>
</entry>
</complex>
@ -407,6 +408,7 @@
<componentRootId>6d5d7b1f-43ab-4651-b5a1-9ee3fca90aac</componentRootId>
<name>AC_agreeer</name>
<container>false</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
@ -480,7 +482,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_internal_control"</simple>
<simple>"responsible_for_internal_control"</simple>
</value>
</entry>
</complex>
@ -596,6 +598,7 @@
<componentRootId>20a8ea69-2a83-440b-8ae3-88c55093e3fc</componentRootId>
<name>AC_processor</name>
<container>false</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>

21
resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на сброс пароля.page
View file

@ -15,7 +15,6 @@
<componentRootId>9b14a80f-1bc6-4a71-a58c-2d1408223c3a</componentRootId>
<name>Hbox</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
@ -202,9 +201,15 @@
<className>CheckUserRole</className>
<packageName>modules.user-management.component</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
</scripts>
<scripts id="dd66e052-6716-4c25-aa15-89323be73ccd">
<classRef type="TS">
<className>ErvuCheckUserRole</className>
<packageName>account_applications</packageName>
</classRef>
<enabled>true</enabled>
</scripts>
</children>
<children id="d4bb4c8f-6378-45c2-b397-4e18bbbff280">
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
@ -284,7 +289,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Ответственный за ЗИ"</simple>
<simple>"responsible_for_information_security"</simple>
</value>
</entry>
</complex>
@ -293,7 +298,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"fd41e974-6a38-4c4f-8458-c4100249853b","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"}</simple>
<simple>{"objectId":"fd41e974-6a38-4c4f-8458-c4100249853b","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -473,7 +478,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Ответственный за ЗИ СВК"</simple>
<simple>"responsible_for_internal_control"</simple>
</value>
</entry>
</complex>
@ -482,7 +487,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"fd41e974-6a38-4c4f-8458-c4100249853b","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"}</simple>
<simple>{"objectId":"fd41e974-6a38-4c4f-8458-c4100249853b","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -662,7 +667,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Администратор ПОИБ"</simple>
<simple>"security_administrator"</simple>
</value>
</entry>
</complex>
@ -671,7 +676,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"fd41e974-6a38-4c4f-8458-c4100249853b","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"}</simple>
<simple>{"objectId":"fd41e974-6a38-4c4f-8458-c4100249853b","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"}</simple>
</value>
</entry>
<entry>

7
resources/src/main/resources/business-model/Список заявок на пользователя/Список заявок.page
View file

@ -15,7 +15,6 @@
<componentRootId>6412ed6b-4afa-417d-9ee0-0a6c90a4e332</componentRootId>
<name>Hbox</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
@ -263,7 +262,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_information_security"</simple>
<simple>"responsible_for_information_security"</simple>
</value>
</entry>
</complex>
@ -488,7 +487,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_internal_control"</simple>
<simple>"responsible_for_internal_control"</simple>
</value>
</entry>
</complex>
@ -3683,7 +3682,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Responsible_for_information_security"</simple>
<simple>"responsible_for_information_security"</simple>
</value>
</entry>
</complex>

4
resources/src/main/resources/config/roles.xml
View file

@ -5,11 +5,11 @@
<description>Администратор ПОИБ</description>
</role>
<role>
<name>Responsible_for_internal_control</name>
<name>responsible_for_internal_control</name>
<description>Ответственный за ЗИ СВК</description>
</role>
<role>
<name>Responsible_for_information_security</name>
<name>responsible_for_information_security</name>
<description>Ответственный за ЗИ</description>
</role>
</ns2:roles>