Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
佳 邓
Gitlab4j Api
Commits
4ce3487e
Commit
4ce3487e
authored
Apr 22, 2019
by
Greg Messner
Browse files
Added support for user_failed_login system hook event (#334).
parent
63587b47
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/systemhooks/SystemHookEvent.java
View file @
4ce3487e
...
...
@@ -16,6 +16,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
@JsonSubTypes
.
Type
(
value
=
RemoveTeamMemberSystemHookEvent
.
class
,
name
=
TeamMemberSystemHookEvent
.
TEAM_MEMBER_REMOVED_EVENT
),
@JsonSubTypes
.
Type
(
value
=
CreateUserSystemHookEvent
.
class
,
name
=
UserSystemHookEvent
.
USER_CREATE_EVENT
),
@JsonSubTypes
.
Type
(
value
=
DestroyUserSystemHookEvent
.
class
,
name
=
UserSystemHookEvent
.
USER_DESTROY_EVENT
),
@JsonSubTypes
.
Type
(
value
=
UserFailedLoginSystemHookEvent
.
class
,
name
=
UserSystemHookEvent
.
USER_FAILED_LOGIN_EVENT
),
@JsonSubTypes
.
Type
(
value
=
RenameUserSystemHookEvent
.
class
,
name
=
UserSystemHookEvent
.
USER_RENAME_EVENT
),
@JsonSubTypes
.
Type
(
value
=
CreateKeySystemHookEvent
.
class
,
name
=
KeySystemHookEvent
.
KEY_CREATE_EVENT
),
@JsonSubTypes
.
Type
(
value
=
DestroyKeySystemHookEvent
.
class
,
name
=
KeySystemHookEvent
.
KEY_DESTROY_EVENT
),
...
...
@@ -54,6 +55,7 @@ class RemoveTeamMemberSystemHookEvent extends TeamMemberSystemHookEvent {}
class
CreateUserSystemHookEvent
extends
UserSystemHookEvent
{}
class
DestroyUserSystemHookEvent
extends
UserSystemHookEvent
{}
class
RenameUserSystemHookEvent
extends
UserSystemHookEvent
{}
class
UserFailedLoginSystemHookEvent
extends
UserSystemHookEvent
{}
class
CreateKeySystemHookEvent
extends
KeySystemHookEvent
{}
class
DestroyKeySystemHookEvent
extends
KeySystemHookEvent
{}
...
...
src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java
View file @
4ce3487e
...
...
@@ -9,6 +9,7 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent {
public
static
final
String
USER_CREATE_EVENT
=
"user_create"
;
public
static
final
String
USER_DESTROY_EVENT
=
"user_destroy"
;
public
static
final
String
USER_RENAME_EVENT
=
"user_rename"
;
public
static
final
String
USER_FAILED_LOGIN_EVENT
=
"user_failed_login"
;
private
String
eventName
;
private
Date
createdAt
;
...
...
@@ -18,6 +19,7 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent {
private
String
username
;
private
Integer
userId
;
private
String
oldUsername
;
private
String
state
;
public
String
getEventName
()
{
return
this
.
eventName
;
...
...
@@ -83,6 +85,14 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent {
this
.
oldUsername
=
oldUsername
;
}
public
String
getState
()
{
return
state
;
}
public
void
setState
(
String
state
)
{
this
.
state
=
state
;
}
@Override
public
String
toString
()
{
return
(
JacksonJson
.
toJsonString
(
this
));
...
...
src/test/java/org/gitlab4j/api/TestGitLabApiEvents.java
View file @
4ce3487e
...
...
@@ -175,7 +175,6 @@ public class TestGitLabApiEvents {
assertTrue
(
compareJson
(
event
,
"wiki-page-event.json"
));
}
@Test
public
void
testProjectSystemHookEvent
()
throws
Exception
{
ProjectSystemHookEvent
event
=
unmarshalResource
(
ProjectSystemHookEvent
.
class
,
...
...
@@ -202,6 +201,13 @@ public class TestGitLabApiEvents {
assertTrue
(
compareJson
(
event
,
"user-system-hook-event.json"
));
}
@Test
public
void
testUserFailedLoginSystemHookEvent
()
throws
Exception
{
SystemHookEvent
event
=
unmarshalResource
(
SystemHookEvent
.
class
,
"user-failed-login-system-hook-event.json"
);
assertTrue
(
compareJson
(
event
,
"user-failed-login-system-hook-event.json"
));
}
@Test
public
void
testGroupSystemHookEvent
()
throws
Exception
{
SystemHookEvent
event
=
unmarshalResource
(
SystemHookEvent
.
class
,
"group-system-hook-event.json"
);
...
...
@@ -250,6 +256,9 @@ public class TestGitLabApiEvents {
event
=
unmarshalResource
(
SystemHookEvent
.
class
,
"user-system-hook-event.json"
);
assertTrue
(
compareJson
(
event
,
"user-system-hook-event.json"
));
event
=
unmarshalResource
(
SystemHookEvent
.
class
,
"user-failed-login-system-hook-event.json"
);
assertTrue
(
compareJson
(
event
,
"user-failed-login-system-hook-event.json"
));
event
=
unmarshalResource
(
SystemHookEvent
.
class
,
"group-system-hook-event.json"
);
assertTrue
(
compareJson
(
event
,
"group-system-hook-event.json"
));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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