Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo-1
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo-1
Commits
e54bd6fd
Commit
e54bd6fd
authored
Aug 14, 2017
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🎨
Clean code
@nanolikeyou Thanks for your PR
👍
parent
bbdded3a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
22 deletions
+17
-22
src/main/java/org/b3log/solo/service/UserMgmtService.java
src/main/java/org/b3log/solo/service/UserMgmtService.java
+2
-1
src/test/java/org/b3log/solo/service/UserMgmtServiceTestCase.java
.../java/org/b3log/solo/service/UserMgmtServiceTestCase.java
+13
-20
src/test/java/org/b3log/solo/service/UserQueryServiceTestCase.java
...java/org/b3log/solo/service/UserQueryServiceTestCase.java
+2
-1
No files found.
src/main/java/org/b3log/solo/service/UserMgmtService.java
View file @
e54bd6fd
...
@@ -49,7 +49,7 @@ import javax.servlet.http.HttpServletResponse;
...
@@ -49,7 +49,7 @@ import javax.servlet.http.HttpServletResponse;
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="mailto:385321165@qq.com">DASHU</a>
* @author <a href="mailto:385321165@qq.com">DASHU</a>
* @author <a href="https://github.com/nanolikeyou">nanolikeyou</a>
* @author <a href="https://github.com/nanolikeyou">nanolikeyou</a>
* @version 1.1.0.1
0, Aug 13
, 2017
* @version 1.1.0.1
1, Aug 14
, 2017
* @since 0.4.0
* @since 0.4.0
*/
*/
@Service
@Service
...
@@ -278,6 +278,7 @@ public class UserMgmtService {
...
@@ -278,6 +278,7 @@ public class UserMgmtService {
if
(!
Strings
.
isEmail
(
userEmail
))
{
if
(!
Strings
.
isEmail
(
userEmail
))
{
throw
new
ServiceException
(
langPropsService
.
get
(
"mailInvalidLabel"
));
throw
new
ServiceException
(
langPropsService
.
get
(
"mailInvalidLabel"
));
}
}
final
JSONObject
duplicatedUser
=
userRepository
.
getByEmail
(
userEmail
);
final
JSONObject
duplicatedUser
=
userRepository
.
getByEmail
(
userEmail
);
if
(
null
!=
duplicatedUser
)
{
if
(
null
!=
duplicatedUser
)
{
...
...
src/test/java/org/b3log/solo/service/UserMgmtServiceTestCase.java
View file @
e54bd6fd
...
@@ -30,14 +30,14 @@ import org.testng.annotations.Test;
...
@@ -30,14 +30,14 @@ import org.testng.annotations.Test;
*
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="https://github.com/nanolikeyou">nanolikeyou</a>
* @author <a href="https://github.com/nanolikeyou">nanolikeyou</a>
* @version 1.0.0.
3, May 25
, 2017
* @version 1.0.0.
4, Aug 14
, 2017
*/
*/
@Test
(
suiteName
=
"service"
)
@Test
(
suiteName
=
"service"
)
public
class
UserMgmtServiceTestCase
extends
AbstractTestCase
{
public
class
UserMgmtServiceTestCase
extends
AbstractTestCase
{
/**
/**
* Add User.
* Add User.
*
*
* @throws Exception exception
* @throws Exception exception
*/
*/
@Test
@Test
...
@@ -56,7 +56,7 @@ public class UserMgmtServiceTestCase extends AbstractTestCase {
...
@@ -56,7 +56,7 @@ public class UserMgmtServiceTestCase extends AbstractTestCase {
/**
/**
* Update User.
* Update User.
*
*
* @throws Exception exception
* @throws Exception exception
*/
*/
@Test
(
dependsOnMethods
=
"addUser"
)
@Test
(
dependsOnMethods
=
"addUser"
)
...
@@ -64,7 +64,6 @@ public class UserMgmtServiceTestCase extends AbstractTestCase {
...
@@ -64,7 +64,6 @@ public class UserMgmtServiceTestCase extends AbstractTestCase {
final
UserMgmtService
userMgmtService
=
getUserMgmtService
();
final
UserMgmtService
userMgmtService
=
getUserMgmtService
();
JSONObject
requestJSONObject
=
new
JSONObject
();
JSONObject
requestJSONObject
=
new
JSONObject
();
requestJSONObject
.
put
(
User
.
USER_NAME
,
"user2name"
);
requestJSONObject
.
put
(
User
.
USER_NAME
,
"user2name"
);
requestJSONObject
.
put
(
User
.
USER_EMAIL
,
"test2@gmail.com"
);
requestJSONObject
.
put
(
User
.
USER_EMAIL
,
"test2@gmail.com"
);
requestJSONObject
.
put
(
User
.
USER_PASSWORD
,
"pass2"
);
requestJSONObject
.
put
(
User
.
USER_PASSWORD
,
"pass2"
);
...
@@ -92,42 +91,38 @@ public class UserMgmtServiceTestCase extends AbstractTestCase {
...
@@ -92,42 +91,38 @@ public class UserMgmtServiceTestCase extends AbstractTestCase {
Assert
.
assertEquals
(
getUserQueryService
().
getUser
(
id
).
getJSONObject
(
Assert
.
assertEquals
(
getUserQueryService
().
getUser
(
id
).
getJSONObject
(
User
.
USER
).
getString
(
User
.
USER_PASSWORD
),
MD5
.
hash
(
"pass2"
));
User
.
USER
).
getString
(
User
.
USER_PASSWORD
),
MD5
.
hash
(
"pass2"
));
}
}
/**
/**
* Valid User.
* Valid User.
*
*
*@throws Exception exception
*
@throws Exception exception
*/
*/
@Test
@Test
public
void
V
alidUser
()
throws
Exception
{
public
void
v
alidUser
()
throws
Exception
{
final
UserMgmtService
userMgmtService
=
getUserMgmtService
();
final
UserMgmtService
userMgmtService
=
getUserMgmtService
();
final
JSONObject
requestJSONObject
=
new
JSONObject
();
final
JSONObject
requestJSONObject
=
new
JSONObject
();
requestJSONObject
.
put
(
User
.
USER_NAME
,
"user1 name"
);
requestJSONObject
.
put
(
User
.
USER_NAME
,
"user1 name"
);
requestJSONObject
.
put
(
User
.
USER_EMAIL
,
"test1@gmail.com"
);
requestJSONObject
.
put
(
User
.
USER_EMAIL
,
"test1@gmail.com"
);
requestJSONObject
.
put
(
User
.
USER_PASSWORD
,
"pass1"
);
requestJSONObject
.
put
(
User
.
USER_PASSWORD
,
"pass1"
);
try
{
try
{
final
String
id
=
userMgmtService
.
addUser
(
requestJSONObject
);
final
String
id
=
userMgmtService
.
addUser
(
requestJSONObject
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
// TODO Auto-generated catch block
Assert
.
assertTrue
(
e
instanceof
ServiceException
);
Assert
.
assertTrue
(
e
instanceof
ServiceException
);
}
}
}
}
/**
/**
* Val
l
id XSS username.
* Valid XSS username.
*
*
*@throws Exception exception
*
@throws Exception exception
*/
*/
@Test
(
expectedExceptions
=
ServiceException
.
class
)
@Test
(
expectedExceptions
=
ServiceException
.
class
)
public
void
XSSUser
()
throws
Exception
{
public
void
XSSUser
()
throws
Exception
{
final
UserMgmtService
userMgmtService
=
getUserMgmtService
();
final
UserMgmtService
userMgmtService
=
getUserMgmtService
();
final
JSONObject
requestJSONObject
=
new
JSONObject
();
final
JSONObject
requestJSONObject
=
new
JSONObject
();
requestJSONObject
.
put
(
User
.
USER_NAME
,
"username"
);
requestJSONObject
.
put
(
User
.
USER_NAME
,
"username"
);
requestJSONObject
.
put
(
User
.
USER_EMAIL
,
"<script></script>"
);
requestJSONObject
.
put
(
User
.
USER_EMAIL
,
"<script></script>"
);
...
@@ -136,20 +131,18 @@ public class UserMgmtServiceTestCase extends AbstractTestCase {
...
@@ -136,20 +131,18 @@ public class UserMgmtServiceTestCase extends AbstractTestCase {
/**
/**
* Remove User.
* Remove User.
*
*
* @throws Exception exception
* @throws Exception exception
*/
*/
@Test
(
dependsOnMethods
=
"addUser"
)
@Test
(
dependsOnMethods
=
"addUser"
)
public
void
removeUser
()
throws
Exception
{
public
void
removeUser
()
throws
Exception
{
final
UserMgmtService
userMgmtService
=
getUserMgmtService
();
final
UserMgmtService
userMgmtService
=
getUserMgmtService
();
final
JSONObject
user
=
final
JSONObject
user
=
getUserQueryService
().
getUserByEmail
(
"test1@gmail.com"
);
getUserQueryService
().
getUserByEmail
(
"test1@gmail.com"
);
Assert
.
assertNotNull
(
user
);
Assert
.
assertNotNull
(
user
);
userMgmtService
.
removeUser
(
user
.
getString
(
Keys
.
OBJECT_ID
));
userMgmtService
.
removeUser
(
user
.
getString
(
Keys
.
OBJECT_ID
));
Assert
.
assertNull
(
Assert
.
assertNull
(
getUserQueryService
().
getUserByEmail
(
"test1@gmail.com"
));
getUserQueryService
().
getUserByEmail
(
"test1@gmail.com"
));
}
}
}
}
src/test/java/org/b3log/solo/service/UserQueryServiceTestCase.java
View file @
e54bd6fd
...
@@ -27,7 +27,8 @@ import org.testng.annotations.Test;
...
@@ -27,7 +27,8 @@ import org.testng.annotations.Test;
* {@link UserQueryService} test case.
* {@link UserQueryService} test case.
*
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.0.1, May 16, 2012
* @author <a href="https://github.com/nanolikeyou">nanolikeyou</a>
* @version 1.0.0.2, Aug 14, 2017
*/
*/
@Test
(
suiteName
=
"service"
)
@Test
(
suiteName
=
"service"
)
public
class
UserQueryServiceTestCase
extends
AbstractTestCase
{
public
class
UserQueryServiceTestCase
extends
AbstractTestCase
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment