Skip to content
This repository was archived by the owner on Dec 20, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ public class SpinnakerUserInfoTokenServices implements ResourceServerTokenServic
@Autowired private ResourceServerProperties sso;
@Autowired private UserInfoTokenServices userInfoTokenServices;
@Autowired private CredentialsService credentialsService;
@Autowired protected OAuth2SsoConfig.UserInfoMapping userInfoMapping;
@Autowired protected OAuth2SsoConfig.UserInfoRequirements userInfoRequirements;
@Autowired protected PermissionService permissionService;
@Autowired protected Front50Service front50Service;
@Autowired private OAuth2SsoConfig.UserInfoMapping userInfoMapping;
@Autowired private OAuth2SsoConfig.UserInfoRequirements userInfoRequirements;
@Autowired private PermissionService permissionService;
@Autowired private Front50Service front50Service;

@Autowired(required = false)
private SpinnakerProviderTokenServices providerTokenServices;
Expand All @@ -86,6 +86,32 @@ public class SpinnakerUserInfoTokenServices implements ResourceServerTokenServic

private RetrySupport retrySupport = new RetrySupport();

// Unit Tests
public SpinnakerUserInfoTokenServices(
ResourceServerProperties sso,
UserInfoTokenServices userInfoTokenServices,
CredentialsService credentialsService,
OAuth2SsoConfig.UserInfoMapping userInfoMapping,
OAuth2SsoConfig.UserInfoRequirements userInfoRequirements,
PermissionService permissionService,
Front50Service front50Service,
AllowedAccountsSupport allowedAccountsSupport,
FiatClientConfigurationProperties fiatClientConfigurationProperties,
Registry registry) {
this.sso = sso;
this.userInfoTokenServices = userInfoTokenServices;
this.credentialsService = credentialsService;
this.userInfoMapping = userInfoMapping;
this.userInfoRequirements = userInfoRequirements;
this.permissionService = permissionService;
this.front50Service = front50Service;
this.allowedAccountsSupport = allowedAccountsSupport;
this.fiatClientConfigurationProperties = fiatClientConfigurationProperties;
this.registry = registry;
}

public SpinnakerUserInfoTokenServices() {}

@Override
public OAuth2Authentication loadAuthentication(final String accessToken)
throws AuthenticationException, InvalidTokenException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@ public class SpinnakerUserInfoTokenServicesTest {

@BeforeEach
public void setUp() {
tokenServices = new SpinnakerUserInfoTokenServices();
userInfoRequirements = new OAuth2SsoConfig.UserInfoRequirements();
tokenServices.userInfoRequirements = userInfoRequirements;
tokenServices =
new SpinnakerUserInfoTokenServices(
null, null, null, null, userInfoRequirements, null, null, null, null, null);
}

@Test
Expand Down Expand Up @@ -116,10 +117,18 @@ public void verifyIsServiceAccount() {
serviceAccount = serviceAccount.setName("ex@foo.com");
when(front50Service.getServiceAccounts()).thenReturn(Calls.response(List.of(serviceAccount)));

SpinnakerUserInfoTokenServices tokenServices = new SpinnakerUserInfoTokenServices();
tokenServices.userInfoMapping = new OAuth2SsoConfig.UserInfoMapping();
tokenServices.permissionService = permissionService;
tokenServices.front50Service = front50Service;
SpinnakerUserInfoTokenServices tokenServices =
new SpinnakerUserInfoTokenServices(
null,
null,
null,
new OAuth2SsoConfig.UserInfoMapping(),
null,
permissionService,
front50Service,
null,
null,
null);

Map<String, Object> details = Map.of("client_email", "ex@foo.com");
boolean isServiceAccount = tokenServices.isServiceAccount(details);
Expand All @@ -130,9 +139,12 @@ public void verifyIsServiceAccount() {
@ParameterizedTest
@MethodSource("provideRoleData")
public void shouldExtractRolesFromDetails(Object rolesValue, List<String> expectedRoles) {
SpinnakerUserInfoTokenServices tokenServices = new SpinnakerUserInfoTokenServices();
tokenServices.userInfoMapping = new OAuth2SsoConfig.UserInfoMapping();
tokenServices.userInfoMapping.setRoles("roles");
OAuth2SsoConfig.UserInfoMapping userInfoMapping = new OAuth2SsoConfig.UserInfoMapping();
userInfoMapping.setRoles("roles");
SpinnakerUserInfoTokenServices tokenServices =
new SpinnakerUserInfoTokenServices(
null, null, null, userInfoMapping, null, null, null, null, null, null);

Map<String, Object> details = new HashMap<>();
details.put("roles", rolesValue);
assertThat(tokenServices.getRoles(details)).isEqualTo(expectedRoles);
Expand Down