diff --git a/client/src/UserList.scss b/client/src/UserList.scss index 8d87b47..db47e5a 100644 --- a/client/src/UserList.scss +++ b/client/src/UserList.scss @@ -6,6 +6,7 @@ flex-wrap: wrap; .profileCard { + flex-grow: 0; margin: 0.2rem; } } \ No newline at end of file diff --git a/server/src/main/java/com/usatiuk/tjv/y/server/service/TokenServiceImpl.java b/server/src/main/java/com/usatiuk/tjv/y/server/service/TokenServiceImpl.java index a67f23c..c8e73d6 100644 --- a/server/src/main/java/com/usatiuk/tjv/y/server/service/TokenServiceImpl.java +++ b/server/src/main/java/com/usatiuk/tjv/y/server/service/TokenServiceImpl.java @@ -23,7 +23,7 @@ public class TokenServiceImpl implements TokenService { public TokenServiceImpl(@Value("${jwt.secret}") String secret) { // FIXME: - this.key = Keys.hmacShaKeyFor(Decoders.BASE64.decode(Encoders.BASE64.encode(secret.getBytes()))); + this.key = Keys.hmacShaKeyFor(secret.getBytes()); } @Override diff --git a/server/src/test/java/com/usatiuk/tjv/y/server/controller/PostControllerTest.java b/server/src/test/java/com/usatiuk/tjv/y/server/controller/PostControllerTest.java index 80a9edc..0badf67 100644 --- a/server/src/test/java/com/usatiuk/tjv/y/server/controller/PostControllerTest.java +++ b/server/src/test/java/com/usatiuk/tjv/y/server/controller/PostControllerTest.java @@ -75,7 +75,7 @@ public class PostControllerTest extends DemoDataDbTest { @Test void shouldGetPostsByFollowees() { - var response = restTemplate.exchange(addr + "/post/following", + var response = restTemplate.exchange(addr + "/post/by-following", HttpMethod.GET, new HttpEntity<>(createAuthHeaders(person3Auth)), PostTo[].class); Assertions.assertEquals(HttpStatus.OK, response.getStatusCode());