Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove uppercasing of service plan property when building OAuth2ServiceConfiguration from service bindings #1427

Merged
merged 3 commits into from
Jan 12, 2024
Merged

Remove uppercasing of service plan property when building OAuth2ServiceConfiguration from service bindings #1427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d59b16
remove toUpperCase() for service plan property in ServiceBindingMapper
finkmanAtSap Jan 11, 2024
75fc213
remove line break
finkmanAtSap Jan 11, 2024
72defbc
fix weird white space
finkmanAtSap Jan 11, 2024
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
3 changes: 1 addition & 2 deletions env/src/main/java/com/sap/cloud/security/config/ServiceBindingMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ public static OAuth2ServiceConfigurationBuilder mapToOAuth2ServiceConfigurationB
OAuth2ServiceConfigurationBuilder builder = OAuth2ServiceConfigurationBuilder.forService(service)
.withProperties(credentials.getEntries(String.class))
.withProperty(NAME, b.getName().orElse(""))
.withProperty(SERVICE_PLAN,
b.getServicePlan().orElse(ServiceConstants.Plan.APPLICATION.name()).toUpperCase());
.withProperty(SERVICE_PLAN, b.getServicePlan().orElse(ServiceConstants.Plan.APPLICATION.name()));

if (IAS.equals(service)) {
parseDomains(builder, credentials);
Expand Down
4 changes: 2 additions & 2 deletions ...p/cloud/security/spring/config/IdentityServicesPropertySourceFactoryBrokerNoHoleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ void testInjectedPropertyValues() {
assertEquals("xsuaadomain", configuration.xsuaaDomain0);
assertEquals("xsappname2", configuration.xsuaaAppName0);
assertEquals("xsuaaInstance0", configuration.xsuaaName0);
assertEquals("application", configuration.xsuaaPlan0.toLowerCase());
assertEquals("application", configuration.xsuaaPlan0);
assertEquals("", configuration.unknown0);

/* Index 1 */
assertEquals("client-id", configuration.xsuaaClientId1);
assertEquals("client-secret", configuration.xsuaaClientSecret1);
assertEquals("xsappname", configuration.xsuaaAppName1);
assertEquals("xsuaaInstance1", configuration.xsuaaName1);
assertEquals("application", configuration.xsuaaPlan1.toLowerCase());
assertEquals("application", configuration.xsuaaPlan1);

/* Index 2 */
assertEquals("none", configuration.xsuaaClientId2);
Expand Down
11 changes: 5 additions & 6 deletions ...loud/security/spring/config/IdentityServicesPropertySourceFactoryFourXsuaaOneIasTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/
package com.sap.cloud.security.spring.config;

import com.sap.cloud.security.config.ServiceConstants;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
Expand Down Expand Up @@ -44,27 +43,27 @@ void testInjectedPropertyValues() {
assertEquals("xsuaadomain", configuration.xsuaaDomain0);
assertEquals("xsappname2", configuration.xsuaaAppName0);
assertEquals("xsuaaInstance2", configuration.xsuaaName0);
assertEquals("application", configuration.xsuaaPlan0.toLowerCase());
assertEquals("application", configuration.xsuaaPlan0);
assertEquals("", configuration.unknown0);

/* Index 1 */
assertEquals("client-id-broker", configuration.xsuaaClientId1);
assertEquals("client-secret-broker", configuration.xsuaaClientSecret1);
assertEquals("xsuaaInstance0", configuration.xsuaaName1);
assertEquals("broker", configuration.xsuaaPlan1.toLowerCase());
assertEquals("broker", configuration.xsuaaPlan1);

/* Index 2 */
assertEquals("client-id-broker2", configuration.xsuaaClientId2);
assertEquals("client-secret-broker2", configuration.xsuaaClientSecret2);
assertEquals("xsuaaInstance1", configuration.xsuaaName2);
assertEquals("broker", configuration.xsuaaPlan2.toLowerCase());
assertEquals("broker", configuration.xsuaaPlan2);

/* Index 3 */
assertEquals("client-id", configuration.xsuaaClientId3);
assertEquals("client-secret", configuration.xsuaaClientSecret3);
assertEquals("xsappname", configuration.xsuaaAppName3);
assertEquals("xsuaaInstance3", configuration.xsuaaName3);
assertEquals("application", configuration.xsuaaPlan3.toLowerCase());
assertEquals("application", configuration.xsuaaPlan3);

/* IAS */
assertEquals("client-id-ias", configuration.identityClientId);
Expand All @@ -73,7 +72,7 @@ void testInjectedPropertyValues() {
assertTrue(configuration.identityDomains.contains("iasdomain.com"));
assertEquals(2, configuration.identityDomains.size());
assertEquals("identityInstance0", configuration.identityName0);
assertEquals(ServiceConstants.Plan.BROKER, ServiceConstants.Plan.from(configuration.identityPlan));
assertEquals("broker", configuration.identityPlan);
}
}

Expand Down
4 changes: 2 additions & 2 deletions .../java/com/sap/cloud/security/spring/config/IdentityServicesPropertySourceFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ void testInjectedPropertyValues() {
assertEquals("xsuaadomain", configuration.xsuaaDomain);
assertEquals("xsappname", configuration.xsuaaAppName);
assertEquals("xsuaaInstance0", configuration.xsuaaName);
assertEquals("application", configuration.xsuaaPlan.toLowerCase());
assertEquals("application", configuration.xsuaaPlan);

assertEquals("", configuration.unknown);

assertEquals("client-id-ias", configuration.identityClientId);
assertEquals("client-secret-ias", configuration.identityClientSecret);
assertEquals("iasdomain", configuration.identityDomains.get(0));
assertEquals("identityInstance0", configuration.identityName);
assertEquals("broker", configuration.identityPlan.toLowerCase());
assertEquals("broker", configuration.identityPlan);
}
}

Expand Down
Loading