Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-07-04 16:08:34 +02:00
Code Issues Packages Projects Releases Activity

Merge pull request #1065 from scm-manager/feature/use_buildin_eventsource

Browse Source 
Feature use built-in eventsource
This commit is contained in:
René Pfeuffer
2020-03-23 09:59:13 +01:00
committed by GitHub
parent c86efe1a24 ca2f9d151a
commit 8e983265a6
15 changed files with 174 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-webapp/src/test/java/sonia/scm/security/BearerRealmTest.java
View File

@@ -31,7 +31,6 @@
package sonia.scm.security;
import com.google.common.collect.ImmutableSet;
import org.apache.shiro.authc.AuthenticationInfo;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.junit.jupiter.api.BeforeEach;
@@ -42,7 +41,6 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import java.util.HashMap;
import java.util.Set;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -84,7 +82,7 @@ class BearerRealmTest {
@Test
void shouldDoGetAuthentication() {
BearerToken bearerToken = BearerToken.create("__session__", "__bearer__");
BearerToken bearerToken = BearerToken.create(SessionId.valueOf("__session__"), "__bearer__");
AccessToken accessToken = mock(AccessToken.class);
when(accessToken.getSubject()).thenReturn("trillian");

15
scm-webapp/src/test/java/sonia/scm/web/BearerWebTokenGeneratorTest.java
View File

@@ -31,20 +31,19 @@
package sonia.scm.web;
import javax.servlet.http.HttpServletRequest;
import org.apache.shiro.authc.AuthenticationToken;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.*;
import org.mockito.junit.jupiter.MockitoExtension;
import sonia.scm.security.BearerToken;
import sonia.scm.security.SessionId;
import sonia.scm.util.HttpUtil;
import javax.servlet.http.HttpServletRequest;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when;
/**
*
@@ -90,7 +89,7 @@ class BearerWebTokenGeneratorTest {
@Test
void shouldCreateTokenWithSessionId(){
doReturn("Bearer asd").when(request).getHeader("Authorization");
doReturn("bcd123").when(request).getHeader(HttpUtil.HEADER_SCM_SESSION);
doReturn("bcd123").when(request).getHeader(SessionId.PARAMETER);
AuthenticationToken token = tokenGenerator.createToken(request);
assertThat(token)

2
scm-webapp/src/test/java/sonia/scm/web/CookieBearerWebTokenGeneratorTest.java
View File

@@ -76,7 +76,7 @@ class CookieBearerWebTokenGeneratorTest {
@Test
void shouldCreateTokenWithSessionId() {
when(request.getHeader(HttpUtil.HEADER_SCM_SESSION)).thenReturn("abc123");
when(request.getHeader(SessionId.PARAMETER)).thenReturn("abc123");
assignBearerCookie("authc");