Skip to content

Commit 2fb6b5e

Browse files
renczesstefanrenczesstefan
committed
[NAE-2092] User and Auth endpoints refactor
- renamed registrationservice
1 parent c3d7d91 commit 2fb6b5e

File tree

15 files changed

+41
-42
lines changed

15 files changed

+41
-42
lines changed

‎application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import com.netgrif.application.engine.adapter.spring.petrinet.service.ProcessRol
55
import com.netgrif.application.engine.adapter.spring.workflow.domain.QCase
66
import com.netgrif.application.engine.adapter.spring.workflow.domain.QTask
77
import com.netgrif.application.engine.auth.service.GroupService
8-
import com.netgrif.application.engine.auth.service.RegistrationService
98
import com.netgrif.application.engine.auth.service.UserDetailsServiceImpl
9+
import com.netgrif.application.engine.auth.service.UserRegistrationService
1010
import com.netgrif.application.engine.auth.service.UserService
1111
import com.netgrif.application.engine.auth.web.requestbodies.NewUserRequest
1212
import com.netgrif.application.engine.configuration.ApplicationContextProvider
@@ -134,7 +134,7 @@ class ActionDelegate {
134134
ProcessRoleService processRoleService
135135

136136
@Autowired
137-
RegistrationService registrationService
137+
UserRegistrationService registrationService
138138

139139
@Autowired
140140
IMailAttemptService mailAttemptService

‎application-engine/src/main/java/com/netgrif/application/engine/mail/MailService.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.netgrif.application.engine.mail;
22

33
import com.netgrif.application.engine.objects.auth.domain.RegisteredUser;
4-
import com.netgrif.application.engine.auth.service.RegistrationService;
4+
import com.netgrif.application.engine.auth.service.UserRegistrationService;
55
import com.netgrif.application.engine.configuration.properties.ServerAuthProperties;
66
import com.netgrif.application.engine.mail.domain.MailDraft;
77
import com.netgrif.application.engine.mail.interfaces.IMailService;
@@ -62,7 +62,7 @@ public class MailService implements IMailService {
6262
protected Configuration configuration;
6363

6464
@Autowired
65-
private RegistrationService registrationService;
65+
private UserRegistrationService userRegistrationService;
6666

6767
@Autowired
6868
private ServerAuthProperties serverAuthProperties;
@@ -73,10 +73,10 @@ public void sendRegistrationEmail(RegisteredUser user) throws IOException, Templ
7373
Map<String, Object> model = new HashMap<>();
7474

7575
recipients.add(user.getEmail());
76-
model.put(TOKEN, registrationService.encodeToken(user.getEmail(), user.getToken()));
76+
model.put(TOKEN, userRegistrationService.encodeToken(user.getEmail(), user.getToken()));
7777
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy");
7878
model.put(VALIDITY, "" + serverAuthProperties.getTokenValidityPeriod());
79-
model.put(EXPIRATION, registrationService.generateExpirationDate().format(formatter));
79+
model.put(EXPIRATION, userRegistrationService.generateExpirationDate().format(formatter));
8080
model.put(SERVER, getServerURL());
8181

8282
MailDraft mailDraft = MailDraft.builder(mailFrom, recipients).subject(EmailType.REGISTRATION.getSubject())
@@ -92,9 +92,9 @@ public void sendPasswordResetEmail(RegisteredUser user) throws IOException, Temp
9292
Map<String, Object> model = new HashMap<>();
9393

9494
model.put(NAME, user.getFirstName());
95-
model.put(TOKEN, registrationService.encodeToken(user.getEmail(), user.getToken()));
95+
model.put(TOKEN, userRegistrationService.encodeToken(user.getEmail(), user.getToken()));
9696
model.put(VALIDITY, "" + serverAuthProperties.getTokenValidityPeriod());
97-
model.put(EXPIRATION, registrationService.generateExpirationDate().format(DateTimeFormatter.ofPattern("dd.MM.yyyy")));
97+
model.put(EXPIRATION, userRegistrationService.generateExpirationDate().format(DateTimeFormatter.ofPattern("dd.MM.yyyy")));
9898
model.put(SERVER, getServerURL());
9999

100100
MailDraft mailDraft = MailDraft.builder(mailFrom, Collections.singletonList(user.getEmail())).subject(EmailType.PASSWORD_RESET.getSubject())

‎application-engine/src/test/java/com/netgrif/application/engine/auth/service/TokenServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class TokenServiceTest {
2222

2323
private final ByteArrayOutputStream outContent = new ByteArrayOutputStream();
2424
@Autowired
25-
RegistrationService service;
25+
UserRegistrationService service;
2626
@Autowired
2727
UserService userService;
2828

‎application-engine/src/test/java/com/netgrif/application/engine/auth/service/RegistrationServiceTest.java renamed to ‎application-engine/src/test/java/com/netgrif/application/engine/auth/service/UserRegistrationServiceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
@ExtendWith(SpringExtension.class)
2424
@ActiveProfiles({"test"})
2525
@SpringBootTest
26-
public class RegistrationServiceTest {
26+
public class UserRegistrationServiceTest {
2727

2828
@Autowired
29-
RegistrationService service;
29+
UserRegistrationService service;
3030

3131
@Autowired
3232
UserService userService;

‎docs/javadoc/com/netgrif/application/engine/auth/service/RegistrationService.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ <h2 title="Class RegistrationService" class="title">Class RegistrationService</h
125125
<li>java.lang.Object</li>
126126
<li>
127127
<ul class="inheritance">
128-
<li>com.netgrif.application.engine.auth.service.RegistrationService</li>
128+
<li>com.netgrif.application.engine.auth.service.UserRegistrationService</li>
129129
</ul>
130130
</li>
131131
</ul>

‎docs/javadoc/com/netgrif/application/engine/auth/service/UserService.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ <h3>Field Summary</h3>
190190
</tr>
191191
<tr class="altColor">
192192
<td class="colFirst"><code>protected <a href="interfaces/IRegistrationService.html" title="interface in com.netgrif.application.engine.auth.service.interfaces">IRegistrationService</a></code></td>
193-
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#registrationService">registrationService</a></span></code></th>
193+
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#userRegistrationService">userRegistrationService</a></span></code></th>
194194
<td class="colLast">&nbsp;</td>
195195
</tr>
196196
<tr class="rowColor">
@@ -485,14 +485,14 @@ <h4>groupService</h4>
485485
protected&nbsp;<a href="../../orgstructure/groups/interfaces/INextGroupService.html" title="interface in com.netgrif.application.engine.orgstructure.groups.interfaces">INextGroupService</a> groupService</pre>
486486
</li>
487487
</ul>
488-
<a id="registrationService">
488+
<a id="userRegistrationService">
489489
<!-- -->
490490
</a>
491491
<ul class="blockListLast">
492492
<li class="blockList">
493-
<h4>registrationService</h4>
493+
<h4>userRegistrationService</h4>
494494
<pre>@Autowired
495-
protected&nbsp;<a href="interfaces/IRegistrationService.html" title="interface in com.netgrif.application.engine.auth.service.interfaces">IRegistrationService</a> registrationService</pre>
495+
protected&nbsp;<a href="interfaces/IRegistrationService.html" title="interface in com.netgrif.application.engine.auth.service.interfaces">IRegistrationService</a> userRegistrationService</pre>
496496
</li>
497497
</ul>
498498
</li>

‎docs/javadoc/com/netgrif/application/engine/auth/service/class-use/RegistrationService.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- Generated by javadoc (11.0.25) on Tue Dec 24 16:53:04 UTC 2024 -->
6-
<title>Uses of Class com.netgrif.application.engine.auth.service.RegistrationService (NETGRIF Application Engine 6.4.0 API)</title>
6+
<title>Uses of Class com.netgrif.application.engine.auth.service.UserRegistrationService (NETGRIF Application Engine 6.4.0 API)</title>
77
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
88
<meta name="dc.created" content="2024-12-24">
99
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
@@ -22,7 +22,7 @@
2222
<script type="text/javascript"><!--
2323
try {
2424
if (location.href.indexOf('is-external=true') == -1) {
25-
parent.document.title="Uses of Class com.netgrif.application.engine.auth.service.RegistrationService (NETGRIF Application Engine 6.4.0 API)";
25+
parent.document.title="Uses of Class com.netgrif.application.engine.auth.service.UserRegistrationService (NETGRIF Application Engine 6.4.0 API)";
2626
}
2727
}
2828
catch(err) {
@@ -95,9 +95,9 @@
9595
</header>
9696
<main role="main">
9797
<div class="header">
98-
<h2 title="Uses of Class com.netgrif.application.engine.auth.service.RegistrationService" class="title">Uses of Class<br>com.netgrif.application.engine.auth.service.RegistrationService</h2>
98+
<h2 title="Uses of Class com.netgrif.application.engine.auth.service.UserRegistrationService" class="title">Uses of Class<br>com.netgrif.application.engine.auth.service.UserRegistrationService</h2>
9999
</div>
100-
<div class="classUseContainer">No usage of com.netgrif.application.engine.auth.service.RegistrationService</div>
100+
<div class="classUseContainer">No usage of com.netgrif.application.engine.auth.service.UserRegistrationService</div>
101101
</main>
102102
<footer role="contentinfo">
103103
<nav role="navigation">

‎docs/javadoc/com/netgrif/application/engine/auth/service/interfaces/class-use/IRegistrationService.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ <h3>Uses of <a href="../IRegistrationService.html" title="interface in com.netgr
158158
<tbody>
159159
<tr class="altColor">
160160
<td class="colFirst"><code>protected <a href="../IRegistrationService.html" title="interface in com.netgrif.application.engine.auth.service.interfaces">IRegistrationService</a></code></td>
161-
<th class="colSecond" scope="row"><span class="typeNameLabel">UserService.</span><code><span class="memberNameLink"><a href="../../UserService.html#registrationService">registrationService</a></span></code></th>
161+
<th class="colSecond" scope="row"><span class="typeNameLabel">UserService.</span><code><span class="memberNameLink"><a href="../../UserService.html#userRegistrationService">userRegistrationService</a></span></code></th>
162162
<td class="colLast">&nbsp;</td>
163163
</tr>
164164
</tbody>
@@ -180,7 +180,7 @@ <h3>Uses of <a href="../IRegistrationService.html" title="interface in com.netgr
180180
<tbody>
181181
<tr class="altColor">
182182
<td class="colFirst"><code><a href="../IRegistrationService.html" title="interface in com.netgrif.application.engine.auth.service.interfaces">IRegistrationService</a></code></td>
183-
<th class="colSecond" scope="row"><span class="typeNameLabel">UserServiceConfiguration.</span><code><span class="memberNameLink"><a href="../../../../configuration/UserServiceConfiguration.html#registrationService()">registrationService</a></span>()</code></th>
183+
<th class="colSecond" scope="row"><span class="typeNameLabel">UserServiceConfiguration.</span><code><span class="memberNameLink"><a href="../../../../configuration/UserServiceConfiguration.html#userRegistrationService()">userRegistrationService</a></span>()</code></th>
184184
<td class="colLast">&nbsp;</td>
185185
</tr>
186186
</tbody>
@@ -202,7 +202,7 @@ <h3>Uses of <a href="../IRegistrationService.html" title="interface in com.netgr
202202
<tbody>
203203
<tr class="altColor">
204204
<td class="colFirst"><code>protected <a href="../IRegistrationService.html" title="interface in com.netgrif.application.engine.auth.service.interfaces">IRegistrationService</a></code></td>
205-
<th class="colSecond" scope="row"><span class="typeNameLabel">NextGroupService.</span><code><span class="memberNameLink"><a href="../../../../orgstructure/groups/NextGroupService.html#registrationService">registrationService</a></span></code></th>
205+
<th class="colSecond" scope="row"><span class="typeNameLabel">NextGroupService.</span><code><span class="memberNameLink"><a href="../../../../orgstructure/groups/NextGroupService.html#userRegistrationService">userRegistrationService</a></span></code></th>
206206
<td class="colLast">&nbsp;</td>
207207
</tr>
208208
</tbody>

‎docs/javadoc/com/netgrif/application/engine/configuration/UserServiceConfiguration.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ <h3>Method Summary</h3>
179179
</tr>
180180
<tr id="i0" class="altColor">
181181
<td class="colFirst"><code><a href="../auth/service/interfaces/IRegistrationService.html" title="interface in com.netgrif.application.engine.auth.service.interfaces">IRegistrationService</a></code></td>
182-
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#registrationService()">registrationService</a></span>()</code></th>
182+
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#userRegistrationService()">userRegistrationService</a></span>()</code></th>
183183
<td class="colLast">&nbsp;</td>
184184
</tr>
185185
<tr id="i1" class="rowColor">
@@ -251,15 +251,15 @@ <h4>userService</h4>
251251
public&nbsp;<a href="../auth/service/interfaces/IUserService.html" title="interface in com.netgrif.application.engine.auth.service.interfaces">IUserService</a>&nbsp;userService()</pre>
252252
</li>
253253
</ul>
254-
<a id="registrationService()">
254+
<a id="userRegistrationService()">
255255
<!-- -->
256256
</a>
257257
<ul class="blockList">
258258
<li class="blockList">
259-
<h4>registrationService</h4>
259+
<h4>userRegistrationService</h4>
260260
<pre class="methodSignature">@Bean
261261
@ConditionalOnMissingBean
262-
public&nbsp;<a href="../auth/service/interfaces/IRegistrationService.html" title="interface in com.netgrif.application.engine.auth.service.interfaces">IRegistrationService</a>&nbsp;registrationService()</pre>
262+
public&nbsp;<a href="../auth/service/interfaces/IRegistrationService.html" title="interface in com.netgrif.application.engine.auth.service.interfaces">IRegistrationService</a>&nbsp;userRegistrationService()</pre>
263263
</li>
264264
</ul>
265265
<a id="userFactory()">

‎docs/javadoc/com/netgrif/application/engine/ldap/service/LdapUserService.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ <h3>Field Summary</h3>
170170
<!-- -->
171171
</a>
172172
<h3>Fields inherited from class&nbsp;com.netgrif.application.engine.auth.service.<a href="../../auth/service/UserService.html" title="class in com.netgrif.application.engine.auth.service">UserService</a></h3>
173-
<code><a href="../../auth/service/UserService.html#authorityRepository">authorityRepository</a>, <a href="../../auth/service/UserService.html#groupService">groupService</a>, <a href="../../auth/service/UserService.html#processRoleService">processRoleService</a>, <a href="../../auth/service/UserService.html#publisher">publisher</a>, <a href="../../auth/service/UserService.html#registrationService">registrationService</a>, <a href="../../auth/service/UserService.html#userRepository">userRepository</a></code></li>
173+
<code><a href="../../auth/service/UserService.html#authorityRepository">authorityRepository</a>, <a href="../../auth/service/UserService.html#groupService">groupService</a>, <a href="../../auth/service/UserService.html#processRoleService">processRoleService</a>, <a href="../../auth/service/UserService.html#publisher">publisher</a>, <a href="../../auth/service/UserService.html#userRegistrationService">userRegistrationService</a>, <a href="../../auth/service/UserService.html#userRepository">userRepository</a></code></li>
174174
</ul>
175175
<ul class="blockList">
176176
<li class="blockList"><a id="fields.inherited.from.class.com.netgrif.application.engine.auth.service.AbstractUserService">

‎docs/javadoc/com/netgrif/application/engine/orgstructure/groups/NextGroupService.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ <h3>Field Summary</h3>
218218
</tr>
219219
<tr class="rowColor">
220220
<td class="colFirst"><code>protected <a href="../../auth/service/interfaces/IRegistrationService.html" title="interface in com.netgrif.application.engine.auth.service.interfaces">IRegistrationService</a></code></td>
221-
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#registrationService">registrationService</a></span></code></th>
221+
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#userRegistrationService">userRegistrationService</a></span></code></th>
222222
<td class="colLast">&nbsp;</td>
223223
</tr>
224224
<tr class="altColor">
@@ -520,14 +520,14 @@ <h4>dataService</h4>
520520
protected&nbsp;<a href="../../workflow/service/interfaces/IDataService.html" title="interface in com.netgrif.application.engine.workflow.service.interfaces">IDataService</a> dataService</pre>
521521
</li>
522522
</ul>
523-
<a id="registrationService">
523+
<a id="userRegistrationService">
524524
<!-- -->
525525
</a>
526526
<ul class="blockList">
527527
<li class="blockList">
528-
<h4>registrationService</h4>
528+
<h4>userRegistrationService</h4>
529529
<pre>@Autowired
530-
protected&nbsp;<a href="../../auth/service/interfaces/IRegistrationService.html" title="interface in com.netgrif.application.engine.auth.service.interfaces">IRegistrationService</a> registrationService</pre>
530+
protected&nbsp;<a href="../../auth/service/interfaces/IRegistrationService.html" title="interface in com.netgrif.application.engine.auth.service.interfaces">IRegistrationService</a> userRegistrationService</pre>
531531
</li>
532532
</ul>
533533
<a id="petriNetService">

‎nae-user-ce/src/main/java/com/netgrif/application/engine/auth/config/AuthBeansConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ public PreferencesService preferencesService() {
4343
}
4444

4545
@Bean
46-
@ConditionalOnMissingBean(RegistrationService.class)
47-
public RegistrationService registrationService() {
48-
return new RegistrationServiceImpl();
46+
@ConditionalOnMissingBean(UserRegistrationService.class)
47+
public UserRegistrationService registrationService() {
48+
return new UserRegistrationServiceImpl();
4949
}
5050

5151
@Bean

‎nae-user-ce/src/main/java/com/netgrif/application/engine/auth/service/RegistrationServiceImpl.java renamed to ‎nae-user-ce/src/main/java/com/netgrif/application/engine/auth/service/UserRegistrationServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.util.stream.Collectors;
2727

2828
@Slf4j
29-
public class RegistrationServiceImpl implements RegistrationService {
29+
public class UserRegistrationServiceImpl implements UserRegistrationService {
3030

3131
@Autowired
3232
protected BCryptPasswordEncoder bCryptPasswordEncoder;

‎nae-user-ce/src/main/java/com/netgrif/application/engine/auth/web/AuthController.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.netgrif.application.engine.auth.web;
22

3-
import com.netgrif.application.engine.auth.service.RegistrationService;
3+
import com.netgrif.application.engine.auth.service.UserRegistrationService;
44
import com.netgrif.application.engine.auth.service.UserFactory;
55
import com.netgrif.application.engine.auth.service.UserService;
66
import com.netgrif.application.engine.auth.throwable.InvalidUserTokenException;
@@ -24,7 +24,6 @@
2424
import jakarta.mail.MessagingException;
2525
import lombok.RequiredArgsConstructor;
2626
import lombok.extern.slf4j.Slf4j;
27-
import org.springdoc.core.SecurityService;
2827
import org.springframework.beans.factory.annotation.Autowired;
2928
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3029
import org.springframework.hateoas.MediaTypes;
@@ -54,7 +53,7 @@
5453
)
5554
public class AuthController {
5655

57-
private RegistrationService registrationService;
56+
private UserRegistrationService registrationService;
5857
private ServerAuthProperties serverAuthProperties;
5958
private MailAttemptService mailAttemptService;
6059
private MailService mailService;
@@ -63,8 +62,8 @@ public class AuthController {
6362
private ISecurityContextService securityContextService;
6463

6564
@Autowired
66-
public void setRegistrationService(RegistrationService registrationService) {
67-
this.registrationService = registrationService;
65+
public void setRegistrationService(UserRegistrationService userRegistrationService) {
66+
this.registrationService = userRegistrationService;
6867
}
6968

7069
@Autowired

‎nae-user-common/src/main/java/com/netgrif/application/engine/auth/service/RegistrationService.java renamed to ‎nae-user-common/src/main/java/com/netgrif/application/engine/auth/service/UserRegistrationService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import java.time.LocalDateTime;
99

10-
public interface RegistrationService {
10+
public interface UserRegistrationService {
1111

1212
void removeExpiredUsers();
1313

0 commit comments

Comments
 (0)