eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-22 21:55:39 +00:00
Code Activity

Merge branch 'permission-vertical' into bug4709_pv

Browse Source
This commit is contained in:
Thomas Wiese
2018-11-15 13:17:13 +01:00
parent 76b70ffed8 87d556e371
commit 49ccd56500
2 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
+29 -17
View File
@@ -142,6 +142,7 @@ import com.sap.sailing.server.testsupport.RacingEventServiceImplMock;
import com.sap.sse.common.Color;
import com.sap.sse.common.TimePoint;
import com.sap.sse.common.Timed;
import com.sap.sse.common.TypeBasedServiceFinderFactory;
import com.sap.sse.common.Util;
import com.sap.sse.common.impl.DegreeBearingImpl;
import com.sap.sse.common.impl.MillisecondsDurationImpl;
@@ -405,7 +406,7 @@ public class MasterDataImportTest {
List<String> groupNamesToExport = new ArrayList<String>();
groupNamesToExport.add(group.getName());
RacingEventServiceImplMock destService;
RacingEventService destService;
DomainFactory domainFactory;
DummyMasterDataRessource spyResource = spyResource(new DummyMasterDataRessource(), sourceService);
Mockito.doReturn(securityService).when(spyResource).getSecurityService();
@@ -420,10 +421,7 @@ public class MasterDataImportTest {
// Delete all data above from the database, to allow recreating all of it on target server
deleteAllDataFromDatabase();
// Import in new service
destService = Mockito.spy(
new RacingEventServiceImplMock(new DataImportProgressImpl(randomUUID), serviceFinderFactory) {
});
Mockito.doReturn(securityService).when(destService).getSecurityService();
destService = getDestService(randomUUID, serviceFinderFactory);
domainFactory = destService.getBaseDomainFactory();
DB db = destService.getMongoObjectFactory().getDatabase();
@@ -748,10 +746,28 @@ public class MasterDataImportTest {
}
private RacingEventService getDestService(UUID randomUUID) {
RacingEventServiceImplMock destService = Mockito
.spy(new RacingEventServiceImplMock(new DataImportProgressImpl(randomUUID)) {
});
Mockito.doReturn(securityService).when(destService).getSecurityService();
RacingEventServiceImplMock destService = new RacingEventServiceImplMock(
new DataImportProgressImpl(randomUUID)) {
@Override
public SecurityService getSecurityService() {
return MasterDataImportTest.this.securityService;
}
};
return destService;
}
private RacingEventService getDestService(UUID randomUUID, TypeBasedServiceFinderFactory serviceFinderFactory) {
RacingEventServiceImplMock destService = new RacingEventServiceImplMock(new DataImportProgressImpl(randomUUID),
serviceFinderFactory) {
@Override
public SecurityService getSecurityService() {
return MasterDataImportTest.this.securityService;
}
};
return destService;
}
@@ -827,7 +843,7 @@ public class MasterDataImportTest {
List<String> groupNamesToExport = new ArrayList<String>();
groupNamesToExport.add(group.getName());
RacingEventServiceImplMock destService;
RacingEventService destService;
DomainFactory domainFactory;
DummyMasterDataRessource spyResource = spyResource(new DummyMasterDataRessource(), sourceService);
Mockito.doReturn(securityService).when(spyResource).getSecurityService();
@@ -842,9 +858,7 @@ public class MasterDataImportTest {
// Delete all data above from the database, to allow recreating all of it on target server
deleteAllDataFromDatabase();
// Import in new service
destService = Mockito.spy(new RacingEventServiceImplMock(new DataImportProgressImpl(randomUUID)) {
});
Mockito.doReturn(securityService).when(destService).getSecurityService();
destService = getDestService(randomUUID);
domainFactory = destService.getBaseDomainFactory();
inputStream = new ByteArrayInputStream(os.toByteArray());
@@ -1891,7 +1905,7 @@ public class MasterDataImportTest {
// Serialize
List<String> groupNamesToExport = Collections.singletonList(leaderboardGroup.getName());
RacingEventServiceImplMock destService;
RacingEventService destService;
DomainFactory domainFactory;
DummyMasterDataRessource spyResource = spyResource(new DummyMasterDataRessource(), sourceService);
Mockito.doReturn(securityService).when(spyResource).getSecurityService();
@@ -1906,9 +1920,7 @@ public class MasterDataImportTest {
// Delete all data above from the database, to allow recreating all of it on target server
deleteAllDataFromDatabase();
// Import in new service
destService = Mockito.spy(new RacingEventServiceImplMock(new DataImportProgressImpl(randomUUID)) {
});
Mockito.doReturn(securityService).when(destService).getSecurityService();
destService = getDestService(randomUUID);
domainFactory = destService.getBaseDomainFactory();
inputStream = new ByteArrayInputStream(os.toByteArray());
java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
+8 -3
View File
@@ -1147,11 +1147,16 @@ public class SecurityServiceImpl implements ReplicableSecurityService, ClearStat
if (subject == null || !subject.isAuthenticated()) {
result = null;
} else {
String username = subject.getPrincipal().toString();
if (username == null || username.length() <= 0) {
Object principal = subject.getPrincipal();
if (principal == null) {
result = null;
} else {
result = userStore.getUserByName(username);
String username = principal.toString();
if (username == null || username.length() <= 0) {
result = null;
} else {
result = userStore.getUserByName(username);
}
}
}
return result;