spring-security-oauth2(二十) 重构短信登陆

 app中无cookie概念，我们用设备id(deviceld)来代替session机制，其实就是存储机制不一样，我们可以将app的验证码存放在redis中

在core项目中定义一个存储接口 CaptchaRepository

package com.rui.tiger.auth.core.captcha;

import org.springframework.web.context.request.ServletWebRequest;

/**
 * 验证码存储接口
 * (适配浏览器和app)
 * @author CaiRui
 * @Date 2019-04-21 12:06
 */
public interface CaptchaRepository {
    /**
     * 保存验证码
     * @param request
     * @param code
     * @param captchaType
     */
    void save(ServletWebRequest request, CaptchaVo code, CaptchaTypeEnum captchaType);

    /**
     * 获取验证码
     * @param request
     * @param captchaType
     * @return
     */
    CaptchaVo get(ServletWebRequest request,  CaptchaTypeEnum captchaType);

    /**
     * 移除验证码
     * @param request
     * @param captchaType
     */
    void remove(ServletWebRequest request,  CaptchaTypeEnum captchaType);

}

app实现  RedisCaptchaRepository

package com.rui.tiger.auth.app.captcha;

import com.rui.tiger.auth.core.captcha.*;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.ServletWebRequest;

import java.util.concurrent.TimeUnit;

/**
 * redis存储验证码
 * @author CaiRui
 * @Date 2019-04-21 12:12
 */
@Component
public class RedisCaptchaRepository implements CaptchaRepository {
    /**
     * @see RedisAutoConfiguration#redisTemplate(org.springframework.data.redis.connection.RedisConnectionFactory)
     */
    @Autowired
    private RedisTemplate<Object,Object> redisTemplate;
    /** 验证码放入redis规则模式：CODE_{TYPE}_{DEVICEId} */
    private final static String CODE_KEY_PATTERN = "CODE_%s_%s";


    @Override
    public void save(ServletWebRequest request, CaptchaVo code, CaptchaTypeEnum captchaType) {
        redisTemplate.opsForValue().set(buildKey(request, captchaType), code, 180, TimeUnit.MINUTES);
    }

    @Override
    public CaptchaVo get(ServletWebRequest request, CaptchaTypeEnum captchaType) {
        String key = buildKey(request, captchaType);
        // 拿到创建 create() 存储到session的code验证码对象
        return (CaptchaVo) redisTemplate.opsForValue().get(key);

    }

    @Override
    public void remove(ServletWebRequest request, CaptchaTypeEnum captchaType) {
        String key = buildKey(request, captchaType);
        redisTemplate.delete(key);
    }

    /**
     * 构建验证码放入redis时的key; 在保存的时候也使用该key
     * {@link AbstractCaptchaProcessor#save(org.springframework.web.context.request.ServletWebRequest, com.rui.tiger.auth.core.captcha.CaptchaVo)
     * @param validateCodeType
     * @return
     */
    private String buildKey(ServletWebRequest request, CaptchaTypeEnum validateCodeType) {
        String deviceId = request.getHeader("deviceId");
        if (StringUtils.isBlank(deviceId)) {
            throw new CaptchaException("请在请求头中携带deviceId参数");
        }
        return String.format(CODE_KEY_PATTERN, validateCodeType, deviceId);
    }

}

浏览器实现  SessionCaptchaRepository

package com.rui.tiger.auth.browser.captcha;

import com.rui.tiger.auth.core.captcha.CaptchaRepository;
import com.rui.tiger.auth.core.captcha.CaptchaTypeEnum;
import com.rui.tiger.auth.core.captcha.CaptchaVo;
import org.springframework.social.connect.web.HttpSessionSessionStrategy;
import org.springframework.social.connect.web.SessionStrategy;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.ServletWebRequest;

/**
 * session存储实现
 * @author CaiRui
 * @date 2019-04-22 08:48
 */
@Component
public class SessionCaptchaRepository implements CaptchaRepository {

	/** 操作session的工具类 */
	private SessionStrategy sessionStrategy = new HttpSessionSessionStrategy();
	/** 验证码放入session的时候前缀 */
	public final static String SESSION_KEY_PREFIX = "SESSION_KEY_FOR_CODE";

	/**
	 * 保存验证码
	 *
	 * @param request
	 * @param code
	 * @param captchaType
	 */
	@Override
	public void save(ServletWebRequest request, CaptchaVo code, CaptchaTypeEnum captchaType) {
		sessionStrategy.setAttribute(request, getSessionKey(captchaType), code);
	}

	/**
	 * 获取验证码
	 *
	 * @param request
	 * @param captchaType
	 * @return
	 */
	@Override
	public CaptchaVo get(ServletWebRequest request, CaptchaTypeEnum captchaType) {
		String sessionKey = getSessionKey(captchaType);
		// 拿到创建 create() 存储到session的code验证码对象
		return (CaptchaVo) sessionStrategy.getAttribute(request, sessionKey);

	}

	/**
	 * 移除验证码
	 *
	 * @param request
	 * @param captchaType
	 */
	@Override
	public void remove(ServletWebRequest request, CaptchaTypeEnum captchaType) {
		sessionStrategy.removeAttribute(request, getSessionKey(captchaType));
	}

	/**
	 * 构建验证码放入session时的key; 在保存的时候也使用该key
	 * @param validateCodeType
	 * @return
	 */
	private String getSessionKey(CaptchaTypeEnum validateCodeType) {
		return SESSION_KEY_PREFIX + validateCodeType.toString().toUpperCase();
	}

}

之前 AbstractCaptchaProcessor的验证码保存逻辑进行调整

com.rui.tiger.auth.core.captcha.AbstractCaptchaProcessor#save

验证逻辑也调整

com.rui.tiger.auth.core.captcha.AbstractCaptchaProcessor#validate

开启前面的验证码配置 com.rui.tiger.auth.app.TigerResourceServerConfig#configure

ok 我们用postman来开启测试

获取短信验证码，要注意请求头要添加设备ID

后台返回成功日志 

我们再去redis中看看是否正确保存，可以修改redis的key默认存储策略，这样key值是以字符存储

package com.rui.tiger.auth.core.config;

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.serializer.RedisSerializer;

/**
 * redis配置
 * @author CaiRui
 * @date 2019-04-22 12:15
 */
@Configuration
public class RedisConfig {

	@Bean
	public RedisTemplate<Object,Object> redisTemplate(RedisConnectionFactory connectionFactory){
		RedisTemplate<Object,Object> redisTemplate=new RedisTemplate<>();
		RedisSerializer stringRedisSerializer=redisTemplate.getStringSerializer();
		redisTemplate.setKeySerializer(stringRedisSerializer);
		redisTemplate.setConnectionFactory(connectionFactory);
		return redisTemplate;
	}


}

 394115 用这个模拟验证码发送短信登录请求

 

 

可以看到后台成功返回token

下篇我们来重构社交登录。