Merge pull request #1 from moritzgloeckl/various-bugfixes

Some code improvements
tapkey · Aug 27, 2019 · b413b89 · b413b89
2 parents c536994 + 89980d7
commit b413b89
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/...xchange-server-sample/src/main/java/io/tapkey/developers/SampleSecurityConfiguration.java b/...xchange-server-sample/src/main/java/io/tapkey/developers/SampleSecurityConfiguration.java
@@ -10,7 +10,7 @@
 public class SampleSecurityConfiguration {
 
     @Bean
-    public SecurityWebFilterChain configure(ServerHttpSecurity http) throws Exception {
+    public SecurityWebFilterChain configure(ServerHttpSecurity http) {
         return http
                 .csrf().disable()
                 .authorizeExchange()

diff --git a/...hange-server-sample/src/main/java/io/tapkey/developers/auth/SampleUserDetailsService.java b/...hange-server-sample/src/main/java/io/tapkey/developers/auth/SampleUserDetailsService.java
@@ -1,6 +1,5 @@
 package io.tapkey.developers.auth;
 
-import io.tapkey.developers.auth.SampleUserPrincipal;
 import io.tapkey.developers.data.User;
 import io.tapkey.developers.data.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/token-exchange-server-sample/src/main/java/io/tapkey/developers/data/User.java b/token-exchange-server-sample/src/main/java/io/tapkey/developers/data/User.java
@@ -49,7 +49,7 @@ public User(String username, String password, String firstName, String lastName,
     @Override
     public String toString() {
         return String.format(
-                "Customer[id=%d, firstName='%s', lastName='%s']",
+                "Customer[id=%s, firstName='%s', lastName='%s']",
                 getId(), getFirstName(), getLastName());
     }
 

diff --git a/...r-sample/src/main/java/io/tapkey/developers/service/SampleTapkeyTokenExchangeService.java b/...r-sample/src/main/java/io/tapkey/developers/service/SampleTapkeyTokenExchangeService.java
@@ -69,11 +69,12 @@ public class SampleTapkeyTokenExchangeService implements TapkeyTokenExchangeServ
     public String createJwtToken(String userId) {
         Calendar expiration = Calendar.getInstance();
         expiration.roll(Calendar.HOUR, 1);
+
+        HashMap<String, Object> claims = new HashMap<>();
+        claims.put("http://tapkey.net/oauth/token_exchange/client_id", oauthClientId);
 
         return Jwts.builder()
-                .addClaims(new HashMap<String, Object>() {{
-                    put("http://tapkey.net/oauth/token_exchange/client_id", oauthClientId);
-                }})
+                .addClaims(claims)
                 .setSubject(userId)
                 .setAudience(identityProviderAudience)
                 .setIssuer(identityProviderIssuer)