Commit 4ce3487e authored by Greg Messner's avatar Greg Messner
Browse files

Added support for user_failed_login system hook event (#334).

parent 63587b47
...@@ -16,6 +16,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; ...@@ -16,6 +16,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
@JsonSubTypes.Type(value = RemoveTeamMemberSystemHookEvent.class, name = TeamMemberSystemHookEvent.TEAM_MEMBER_REMOVED_EVENT), @JsonSubTypes.Type(value = RemoveTeamMemberSystemHookEvent.class, name = TeamMemberSystemHookEvent.TEAM_MEMBER_REMOVED_EVENT),
@JsonSubTypes.Type(value = CreateUserSystemHookEvent.class, name = UserSystemHookEvent.USER_CREATE_EVENT), @JsonSubTypes.Type(value = CreateUserSystemHookEvent.class, name = UserSystemHookEvent.USER_CREATE_EVENT),
@JsonSubTypes.Type(value = DestroyUserSystemHookEvent.class, name = UserSystemHookEvent.USER_DESTROY_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 = RenameUserSystemHookEvent.class, name = UserSystemHookEvent.USER_RENAME_EVENT),
@JsonSubTypes.Type(value = CreateKeySystemHookEvent.class, name = KeySystemHookEvent.KEY_CREATE_EVENT), @JsonSubTypes.Type(value = CreateKeySystemHookEvent.class, name = KeySystemHookEvent.KEY_CREATE_EVENT),
@JsonSubTypes.Type(value = DestroyKeySystemHookEvent.class, name = KeySystemHookEvent.KEY_DESTROY_EVENT), @JsonSubTypes.Type(value = DestroyKeySystemHookEvent.class, name = KeySystemHookEvent.KEY_DESTROY_EVENT),
...@@ -54,6 +55,7 @@ class RemoveTeamMemberSystemHookEvent extends TeamMemberSystemHookEvent {} ...@@ -54,6 +55,7 @@ class RemoveTeamMemberSystemHookEvent extends TeamMemberSystemHookEvent {}
class CreateUserSystemHookEvent extends UserSystemHookEvent {} class CreateUserSystemHookEvent extends UserSystemHookEvent {}
class DestroyUserSystemHookEvent extends UserSystemHookEvent {} class DestroyUserSystemHookEvent extends UserSystemHookEvent {}
class RenameUserSystemHookEvent extends UserSystemHookEvent {} class RenameUserSystemHookEvent extends UserSystemHookEvent {}
class UserFailedLoginSystemHookEvent extends UserSystemHookEvent {}
class CreateKeySystemHookEvent extends KeySystemHookEvent {} class CreateKeySystemHookEvent extends KeySystemHookEvent {}
class DestroyKeySystemHookEvent extends KeySystemHookEvent {} class DestroyKeySystemHookEvent extends KeySystemHookEvent {}
......
...@@ -9,6 +9,7 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent { ...@@ -9,6 +9,7 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent {
public static final String USER_CREATE_EVENT = "user_create"; public static final String USER_CREATE_EVENT = "user_create";
public static final String USER_DESTROY_EVENT = "user_destroy"; public static final String USER_DESTROY_EVENT = "user_destroy";
public static final String USER_RENAME_EVENT = "user_rename"; public static final String USER_RENAME_EVENT = "user_rename";
public static final String USER_FAILED_LOGIN_EVENT = "user_failed_login";
private String eventName; private String eventName;
private Date createdAt; private Date createdAt;
...@@ -18,6 +19,7 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent { ...@@ -18,6 +19,7 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent {
private String username; private String username;
private Integer userId; private Integer userId;
private String oldUsername; private String oldUsername;
private String state;
public String getEventName() { public String getEventName() {
return this.eventName; return this.eventName;
...@@ -83,6 +85,14 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent { ...@@ -83,6 +85,14 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent {
this.oldUsername = oldUsername; this.oldUsername = oldUsername;
} }
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
}
@Override @Override
public String toString() { public String toString() {
return (JacksonJson.toJsonString(this)); return (JacksonJson.toJsonString(this));
......
...@@ -175,7 +175,6 @@ public class TestGitLabApiEvents { ...@@ -175,7 +175,6 @@ public class TestGitLabApiEvents {
assertTrue(compareJson(event, "wiki-page-event.json")); assertTrue(compareJson(event, "wiki-page-event.json"));
} }
@Test @Test
public void testProjectSystemHookEvent() throws Exception { public void testProjectSystemHookEvent() throws Exception {
ProjectSystemHookEvent event = unmarshalResource(ProjectSystemHookEvent.class, ProjectSystemHookEvent event = unmarshalResource(ProjectSystemHookEvent.class,
...@@ -202,6 +201,13 @@ public class TestGitLabApiEvents { ...@@ -202,6 +201,13 @@ public class TestGitLabApiEvents {
assertTrue(compareJson(event, "user-system-hook-event.json")); 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 @Test
public void testGroupSystemHookEvent() throws Exception { public void testGroupSystemHookEvent() throws Exception {
SystemHookEvent event = unmarshalResource(SystemHookEvent.class, "group-system-hook-event.json"); SystemHookEvent event = unmarshalResource(SystemHookEvent.class, "group-system-hook-event.json");
...@@ -250,6 +256,9 @@ public class TestGitLabApiEvents { ...@@ -250,6 +256,9 @@ public class TestGitLabApiEvents {
event = unmarshalResource(SystemHookEvent.class, "user-system-hook-event.json"); event = unmarshalResource(SystemHookEvent.class, "user-system-hook-event.json");
assertTrue(compareJson(event, "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"); event = unmarshalResource(SystemHookEvent.class, "group-system-hook-event.json");
assertTrue(compareJson(event, "group-system-hook-event.json")); assertTrue(compareJson(event, "group-system-hook-event.json"));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment