Projects >> pac4j >>f5947b564c54e53557a63f9128b86eb25787c885

Chunk
Conflicting content
        final long t0 = System.currentTimeMillis();
        final ProxyOAuthRequest request = createProxyRequest(dataUrl);
        this.service.signRequest(accessToken, request);
<<<<<<< HEAD
        // Let the client to decide if the token should be in header
=======
        // FIX: It's now up to the client to decide if the token should be in header
>>>>>>> ede3bb2abc9d93ff26aefb8349cd50200cefb8b7
        if (this.isTokenAsHeader()) {
            request.addHeader("Authorization", "Bearer " + accessToken.getToken());
        }
Solution content
        final long t0 = System.currentTimeMillis();
        final ProxyOAuthRequest request = createProxyRequest(dataUrl);
        this.service.signRequest(accessToken, request);
        // Let the client to decide if the token should be in header
        if (this.isTokenAsHeader()) {
            request.addHeader("Authorization", "Bearer " + accessToken.getToken());
        }
File
BaseOAuthClient.java
Developer's decision
Version 1
Kind of conflict
Comment