/*
 * Copyright (C) 2016 the original author or authors.
 *
 * This file is part of jBB Application Project.
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  You may obtain a copy of the License at
 *        http://www.apache.org/licenses/LICENSE-2.0
 */

package org.jbb.security.impl.userdetails.logic;

import org.apache.commons.lang3.StringUtils;
import org.jbb.lib.core.vo.Username;
import org.jbb.members.api.data.Member;
import org.jbb.members.api.service.MemberService;
import org.jbb.security.impl.password.dao.PasswordRepository;
import org.jbb.security.impl.password.model.PasswordEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Optional;

import lombok.extern.slf4j.Slf4j;

@Slf4j
@Service
public class UserDetailsServiceImpl implements UserDetailsService {

    private final MemberService memberService;
    private final PasswordRepository passwordRepository;
    private final SecurityContentUserFactory securityContentUserFactory;

    @Autowired
    public UserDetailsServiceImpl(MemberService memberService, PasswordRepository repository,
                                  SecurityContentUserFactory securityContentUserFactory) {
        this.memberService = memberService;
        this.passwordRepository = repository;
        this.securityContentUserFactory = securityContentUserFactory;
    }

    private static UserDetails throwUserNotFoundException(String reason) {
        throw new UsernameNotFoundException(reason);
    }

    @Override
    @Transactional(readOnly = true)
    public UserDetails loadUserByUsername(String usernameString) {
        if (StringUtils.isEmpty(usernameString)) {
            throwUserNotFoundException("Username cannot be blank");
        }

        Username username = Username.builder().value(usernameString).build();
        Optional<Member> memberData = memberService.getMemberWithUsername(username);
        if (memberData.isPresent()) {
            return getUserDetails(username, memberData.get());
        } else {
            log.error("Some inconsistency of data detected! Password data exist for username '{}' but member data not", username.getValue());
            return throwUserNotFoundException(String.format("Member with username '%s' not found", username.getValue()));
        }
    }

    private UserDetails getUserDetails(Username username, Member member) {
        Optional<PasswordEntity> passwordEntity = passwordRepository.findTheNewestByMemberId(member.getId());
        if (!passwordEntity.isPresent()) {
            return throwUserNotFoundException(String.format("Member with username '%s' not found", username));
        }

        return securityContentUserFactory.create(passwordEntity.get(), member);
    }
}

@@ -20,9 +20,9 @@
  201
-6
+7
  the
@@ -2374,150 +2374,8 @@
 e %7B%0A
-            log.error(%22Some inconsistency of data detected! Password data exist for username '%7B%7D' but member data not%22, username.getValue());%0A
     

remove incorrect log message