/*
 * Copyright 2006-2011 the original author or authors.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
 * the License. You may obtain a copy of the License at
 * 
 * http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
 * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 * specific language governing permissions and limitations under the License.
 */
package org.springframework.security.oauth2.provider.client;

import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.security.oauth2.provider.ClientDetails;
import org.springframework.security.oauth2.provider.ClientDetailsService;

/**
 * @author Dave Syer
 * 
 */
public class ClientDetailsUserDetailsService implements UserDetailsService {

	private final ClientDetailsService clientDetailsService;

	public ClientDetailsUserDetailsService(ClientDetailsService clientDetailsService) {
		this.clientDetailsService = clientDetailsService;
	}

	public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
		ClientDetails clientDetails = clientDetailsService.loadClientByClientId(username);
		String clientSecret = clientDetails.getClientSecret() == null ? "" : clientDetails.getClientSecret();
		return new User(username, clientSecret, clientDetails.getAuthorities());
	}

}

@@ -943,16 +943,85 @@
 eption;%0A
+import org.springframework.security.crypto.password.PasswordEncoder;%0A
 import o
@@ -1071,32 +1071,32 @@
 .ClientDetails;%0A
-
 import org.sprin
@@ -1323,17 +1323,54 @@
 ervice;%0A
+%09private String emptyPassword = %22%22;%0A%09
 %0A
-
 %09public 
@@ -1500,16 +1500,204 @@
 vice;%0A%09%7D
+%0A%09%0A%09/**%0A%09 * @param passwordEncoder the password encoder to set%0A%09 */%0A%09public void setPasswordEncoder(PasswordEncoder passwordEncoder) %7B%0A%09%09this.emptyPassword = passwordEncoder.encode(%22%22);%0A%09%7D
 %0A%0A%09publi
@@ -1925,17 +1925,36 @@
 et()
- 
+;%0A%09%09if (clientSecret
 == null 
 ? %22%22
@@ -1953,47 +1953,82 @@
 ull 
-? %22%22 :
+%7C%7C
  client
-Details.getClientSecret();
+Secret.trim().length()==0) %7B%0A%09%09%09clientSecret = emptyPassword;%0A%09%09%7D
 %0A%09%09r

add password encoder to ClientDetailsUserDetailsService