Skip to content

Commit e82fe98

Browse files
committed
renamed classes
1 parent 980ccf3 commit e82fe98

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

src/main/java/cz/metacentrum/fake_oidc/FakeOidcApplication.java renamed to src/main/java/cz/metacentrum/fake_oidc/FakeOidcServer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
55

66
@SpringBootApplication
7-
public class FakeOidcApplication {
7+
public class FakeOidcServer {
88

99
public static void main(String[] args) {
10-
SpringApplication.run(FakeOidcApplication.class, args);
10+
SpringApplication.run(FakeOidcServer.class, args);
1111
}
1212

1313
}

src/main/java/cz/metacentrum/fake_oidc/FakeOidcProperties.java renamed to src/main/java/cz/metacentrum/fake_oidc/FakeOidcServerProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
@Component
77
@ConfigurationProperties(prefix="oidc")
8-
public class FakeOidcProperties {
8+
public class FakeOidcServerProperties {
99

1010
private User user;
1111
private long tokenExpirationSeconds;

src/main/java/cz/metacentrum/fake_oidc/OidcController.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import java.util.Date;
4141
import java.util.HashMap;
4242
import java.util.LinkedHashMap;
43-
import java.util.List;
4443
import java.util.Map;
4544
import java.util.UUID;
4645

@@ -68,7 +67,7 @@ public class OidcController {
6867
private Map<String, AccessTokenInfo> accessTokens = new HashMap<>();
6968

7069
@Autowired
71-
private FakeOidcProperties fakeOidcProperties;
70+
private FakeOidcServerProperties serverProperties;
7271

7372
@PostConstruct
7473
public void init() throws IOException, ParseException, JOSEException {
@@ -78,7 +77,7 @@ public void init() throws IOException, ParseException, JOSEException {
7877
signer = new RSASSASigner((RSAKey) key);
7978
publicJWKSet = jwkSet.toPublicJWKSet();
8079
jwsHeader = new JWSHeader.Builder(JWSAlgorithm.RS256).keyID(key.getKeyID()).build();
81-
log.info("config {}", fakeOidcProperties);
80+
log.info("config {}", serverProperties);
8281
}
8382

8483
@RequestMapping(value = METADATA_ENDPOINT, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -175,7 +174,7 @@ public ResponseEntity<?> authorize(@RequestParam String client_id,
175174
String[] creds = new String(Base64.getDecoder().decode(auth.split(" ")[1])).split(":", 2);
176175
String logname = creds[0];
177176
String password = creds[1];
178-
User user = fakeOidcProperties.getUser();
177+
User user = serverProperties.getUser();
179178
if (user.getLogname().equals(logname) && user.getPassword().equals(password)) {
180179
log.info("password for user {} is correct", logname);
181180
String iss = uriBuilder.replacePath("/").build().encode().toUriString();
@@ -197,7 +196,7 @@ public ResponseEntity<?> authorize(@RequestParam String client_id,
197196

198197
private String createAccessToken(String iss, User user, String client_id, String scope) throws JOSEException {
199198
// create JWT claims
200-
Date expiration = new Date(System.currentTimeMillis() + fakeOidcProperties.getTokenExpirationSeconds() * 1000L);
199+
Date expiration = new Date(System.currentTimeMillis() + serverProperties.getTokenExpirationSeconds() * 1000L);
201200
JWTClaimsSet jwtClaimsSet = new JWTClaimsSet.Builder()
202201
.subject(user.getSub())
203202
.issuer(iss)
@@ -230,7 +229,7 @@ private String createIdToken(String iss, User user, String client_id, String non
230229
.issuer(iss)
231230
.audience(client_id)
232231
.issueTime(new Date())
233-
.expirationTime(new Date(System.currentTimeMillis() + fakeOidcProperties.getTokenExpirationSeconds() * 1000L))
232+
.expirationTime(new Date(System.currentTimeMillis() + serverProperties.getTokenExpirationSeconds() * 1000L))
234233
.jwtID(UUID.randomUUID().toString())
235234
.claim("nonce", nonce)
236235
.claim("at_hash", encodedHash)

src/test/java/cz/metacentrum/fake_oidc/FakeOidcApplicationTests.java renamed to src/test/java/cz/metacentrum/fake_oidc/FakeOidcServerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.springframework.boot.test.context.SpringBootTest;
55

66
@SpringBootTest
7-
class FakeOidcApplicationTests {
7+
class FakeOidcServerTests {
88

99
@Test
1010
void contextLoads() {

0 commit comments

Comments
 (0)