Skip to content

Commit

Permalink
Merge 9e5d19a into 92c3f51
Browse files Browse the repository at this point in the history
  • Loading branch information
@IDragonfire
IDragonfire committed May 3, 2017
2 parents 92c3f51 + 9e5d19a commit 6c8017c
Show file tree
Hide file tree
Showing 6 changed files with 212 additions and 198 deletions.
9 changes: 0 additions & 9 deletions src/main/java/com/faforever/api/data/domain/Login.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.faforever.api.data.checks.IsLoginOwner;
import com.yahoo.elide.annotation.ReadPermission;
import lombok.Setter;
import org.hibernate.annotations.Formula;

import javax.persistence.Column;
import javax.persistence.FetchType;
Expand All @@ -25,7 +24,6 @@ public abstract class Login {
private String steamId;
private String userAgent;
private BanInfo banInfo;
private String lowerCaseLogin;

@Id
@GeneratedValue
Expand All @@ -38,13 +36,6 @@ public String getLogin() {
return login;
}

// TODO review this, I think it's not needed since elide should (with a never version?) filter case insensitive
// Needed for filter, e.g. at the clan app
@Formula("LOWER(login)")
public String getLowerCaseLogin() {
return lowerCaseLogin;
}

@Column(name = "email")
@ReadPermission(expression = IsLoginOwner.EXPRESSION)
public String getEmail() {
Expand Down
115 changes: 33 additions & 82 deletions src/test/java/com/faforever/api/clan/ClanControllerIntegrationTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,23 @@
package com.faforever.api.clan;

import com.faforever.api.client.ClientType;
import com.faforever.api.client.OAuthClient;
import com.faforever.api.client.OAuthClientRepository;
import com.faforever.api.data.domain.Clan;
import com.faforever.api.data.domain.ClanMembership;
import com.faforever.api.data.domain.Player;
import com.faforever.api.data.domain.User;
import com.faforever.api.player.PlayerRepository;
import com.faforever.api.user.UserRepository;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
import com.faforever.integration.factories.PlayerFactory;
import com.faforever.integration.factories.SessionFactory;
import com.faforever.integration.factories.SessionFactory.Session;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.security.authentication.encoding.ShaPasswordEncoder;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.util.Base64Utils;
import org.springframework.web.context.WebApplicationContext;

import javax.inject.Inject;
Expand All @@ -37,11 +32,7 @@

@RunWith(SpringRunner.class)
@SpringBootTest
@Ignore("This needs to be cleaned up big time.")
public class ClanControllerIntegrationTest {
private static final String OAUTH_CLIENT_ID = "1234";
private static final String OAUTH_SECRET = "secret";
private final ShaPasswordEncoder shaPasswordEncoder;
private MockMvc mvc;
private WebApplicationContext context;
private Filter springSecurityFilterChain;
Expand All @@ -50,13 +41,6 @@ public class ClanControllerIntegrationTest {
private ClanMembershipRepository clanMembershipRepository;
private PlayerRepository playerRepository;
private OAuthClientRepository oAuthClientRepository;
private ObjectMapper objectMapper;
private Player me;

public ClanControllerIntegrationTest() {
shaPasswordEncoder = new ShaPasswordEncoder(256);
objectMapper = new ObjectMapper();
}

@Inject
public void init(WebApplicationContext context,
Expand All @@ -83,6 +67,7 @@ public void setUp() {
.build();
}

// Dragonfire: This duplicated code cannot be avoided, each test must cleanup all the used repositories
@After
public void tearDown() {
clanMembershipRepository.deleteAll();
Expand All @@ -95,74 +80,36 @@ public void tearDown() {
assertEquals(0, oAuthClientRepository.count());
}

public String createUserAndGetAccessToken(String login, String password) throws Exception {
OAuthClient client = new OAuthClient()
.setId(OAUTH_CLIENT_ID)
.setName("test")
.setClientSecret(OAUTH_SECRET)
.setRedirectUris("test")
.setDefaultRedirectUri("test")
.setDefaultScope("test")
.setClientType(ClientType.PUBLIC);
oAuthClientRepository.save(client);

User user = (User) new User()
.setPassword(shaPasswordEncoder.encodePassword(password, null))
.setLogin(login)
.setEmail(login + "@faforever.com");
userRepository.save(user);
me = playerRepository.findOne(user.getId());

String authorization = "Basic "
+ new String(Base64Utils.encode((OAUTH_CLIENT_ID + ":" + OAUTH_SECRET).getBytes()));
ResultActions auth = mvc
.perform(
post("/oauth/token")
.header("Authorization", authorization)
.param("username", login)
.param("password", password)
.param("grant_type", "password"));
auth.andExpect(status().isOk());
JsonNode node = objectMapper.readTree(auth.andReturn().getResponse().getContentAsString());
return "Bearer " + node.get("access_token").asText();
}

private Player createPlayer(String login) throws Exception {
User user = (User) new User()
.setPassword("foo")
.setLogin(login)
.setEmail(login + "@faforever.com");
userRepository.save(user);
return playerRepository.findOne(user.getId());
}


@Test
public void meDataWithoutClan() throws Exception {
String accessToken = createUserAndGetAccessToken("Dragonfire", "foo");
Session session = SessionFactory.createUserAndGetAccessToken(
oAuthClientRepository, userRepository, playerRepository, mvc);

String expected = String.format("{\"player\":{\"id\":%s,\"login\":\"%s\"},\"clan\":null}",
me.getId(),
me.getLogin());
session.getPlayer().getId(),
session.getPlayer().getLogin());

assertEquals(1, playerRepository.count());
this.mvc.perform(get("/clans/me/")
.header("Authorization", accessToken))
.header("Authorization", session.getToken()))
.andExpect(content().string(expected))
.andExpect(status().isOk());
}

@Test
public void meDataWithClan() throws Exception {
String accessToken = createUserAndGetAccessToken("Dragonfire", "foo");
Session session = SessionFactory.createUserAndGetAccessToken(
oAuthClientRepository, userRepository, playerRepository, mvc);

Clan clan = new Clan().setLeader(me).setTag("123").setName("abcClanName");
ClanMembership myMembership = new ClanMembership().setPlayer(me).setClan(clan);
Clan clan = new Clan().setLeader(session.getPlayer()).setTag("123").setName("abcClanName");
ClanMembership myMembership = new ClanMembership().setPlayer(session.getPlayer()).setClan(clan);
clan.setMemberships(Collections.singletonList(myMembership));
clanRepository.save(clan);

String expected = String.format("{\"player\":{\"id\":%s,\"login\":\"%s\"},\"clan\":{\"id\":%s,\"tag\":\"%s\",\"name\":\"%s\"}}",
me.getId(),
me.getLogin(),
session.getPlayer().getId(),
session.getPlayer().getLogin(),
clan.getId(),
clan.getTag(),
clan.getName());
Expand All @@ -171,14 +118,15 @@ public void meDataWithClan() throws Exception {
assertEquals(1, clanRepository.count());
assertEquals(1, clanMembershipRepository.count());
this.mvc.perform(get("/clans/me/")
.header("Authorization", accessToken))
.header("Authorization", session.getToken()))
.andExpect(content().string(expected))
.andExpect(status().isOk());
}

@Test
public void createClan() throws Exception {
String accessToken = createUserAndGetAccessToken("Dragonfire", "foo");
Session session = SessionFactory.createUserAndGetAccessToken(
oAuthClientRepository, userRepository, playerRepository, mvc);
String clanName = "My Cool ClanName";
String tag = "123";
String description = "spaces Must Be Encoded";
Expand All @@ -189,7 +137,7 @@ public void createClan() throws Exception {
ResultActions action = this.mvc.perform(post(
String.format("/clans/create?tag=%s&name=%s&description=%s",
tag, clanName, description))
.header("Authorization", accessToken));
.header("Authorization", session.getToken()));

int id = clanRepository.findAll().get(0).getId();

Expand All @@ -202,13 +150,14 @@ public void createClan() throws Exception {

@Test
public void createSecondClan() throws Exception {
String accessToken = createUserAndGetAccessToken("Dragonfire", "foo");
Session session = SessionFactory.createUserAndGetAccessToken(
oAuthClientRepository, userRepository, playerRepository, mvc);
String clanName = "My Cool ClanName";
String tag = "123";
String description = "spaces Must Be Encoded";

Clan clan = new Clan().setLeader(me).setTag("tag").setName("abcClan");
ClanMembership membership = new ClanMembership().setPlayer(me).setClan(clan);
Clan clan = new Clan().setLeader(session.getPlayer()).setTag("tag").setName("abcClan");
ClanMembership membership = new ClanMembership().setPlayer(session.getPlayer()).setClan(clan);
clan.setMemberships(Collections.singletonList(membership));
clanRepository.save(clan);

Expand All @@ -218,7 +167,7 @@ public void createSecondClan() throws Exception {
ResultActions action = this.mvc.perform(post(
String.format("/clans/create?tag=%s&name=%s&description=%s",
tag, clanName, description))
.header("Authorization", accessToken));
.header("Authorization", session.getToken()));

action.andExpect(content().string("{\"errors\":[{\"title\":\"You are already in a clan\",\"detail\":\"Clan creator is already member of a clan\"}]}"))
.andExpect(status().is(422));
Expand All @@ -229,8 +178,9 @@ public void createSecondClan() throws Exception {

@Test
public void createClanWithSameName() throws Exception {
Player otherLeader = createPlayer("Downloard");
String accessToken = createUserAndGetAccessToken("Dragonfire", "foo");
Player otherLeader = PlayerFactory.createPlayer("Downloard", userRepository, playerRepository);
Session session = SessionFactory.createUserAndGetAccessToken(
oAuthClientRepository, userRepository, playerRepository, mvc);
String clanName = "My Cool ClanName";
String tag = "123";
String description = "spaces Must Be Encoded";
Expand All @@ -246,7 +196,7 @@ public void createClanWithSameName() throws Exception {
ResultActions action = this.mvc.perform(post(
String.format("/clans/create?tag=%s&name=%s&description=%s",
tag, clanName, description))
.header("Authorization", accessToken));
.header("Authorization", session.getToken()));

action.andExpect(content().string("{\"errors\":[{\"title\":\"Clan Name already in use\",\"detail\":\"The clan name 'My Cool ClanName' is already in use. Please choose a different clan name.\"}]}"))
.andExpect(status().is(422));
Expand All @@ -257,8 +207,9 @@ public void createClanWithSameName() throws Exception {

@Test
public void createClanWithSameTag() throws Exception {
Player otherLeader = createPlayer("Downlord");
String accessToken = createUserAndGetAccessToken("Dragonfire", "foo");
Player otherLeader = PlayerFactory.createPlayer("Downloard", userRepository, playerRepository);
Session session = SessionFactory.createUserAndGetAccessToken(
oAuthClientRepository, userRepository, playerRepository, mvc);
String clanName = "My Cool ClanName";
String tag = "123";
String description = "spaces Must Be Encoded";
Expand All @@ -274,7 +225,7 @@ public void createClanWithSameTag() throws Exception {
ResultActions action = this.mvc.perform(post(
String.format("/clans/create?tag=%s&name=%s&description=%s",
tag, clanName, description))
.header("Authorization", accessToken));
.header("Authorization", session.getToken()));

action.andExpect(content().string("{\"errors\":[{\"title\":\"Clan Tag already in use\",\"detail\":\"The clan tag 'My Cool ClanName' is already in use. Please choose a different clan tag.\"}]}"))
.andExpect(status().is(422));
Expand Down
Loading

0 comments on commit 6c8017c

Please sign in to comment.