diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/config/AuthMxkDefaultSource.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/config/AuthMxkDefaultSource.java new file mode 100644 index 000000000..19e611531 --- /dev/null +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/config/AuthMxkDefaultSource.java @@ -0,0 +1,34 @@ +package me.zhyd.oauth.config; + +import me.zhyd.oauth.request.AuthDefaultRequest; +import me.zhyd.oauth.request.AuthFeishu2Request; + +public enum AuthMxkDefaultSource implements AuthSource { + FEISHU2 { + @Override + public String authorize() { + return "https://passport.feishu.cn/suite/passport/oauth/authorize"; + } + + @Override + public String accessToken() { + return "https://passport.feishu.cn/suite/passport/oauth/token"; + } + + @Override + public String userInfo() { + return "https://passport.feishu.cn/suite/passport/oauth/userinfo"; + } + + @Override + public String refresh() { + return "https://passport.feishu.cn/suite/passport/oauth/token"; + } + + @Override + public Class getTargetClass() { + return AuthFeishu2Request.class; + } + } + +} diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthFeishu2Request.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthFeishu2Request.java new file mode 100644 index 000000000..55aca6db0 --- /dev/null +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthFeishu2Request.java @@ -0,0 +1,155 @@ +package me.zhyd.oauth.request; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.xkcoding.http.support.HttpHeader; +import me.zhyd.oauth.cache.AuthStateCache; +import me.zhyd.oauth.config.AuthConfig; +import me.zhyd.oauth.config.AuthMxkDefaultSource; +import me.zhyd.oauth.enums.AuthResponseStatus; +import me.zhyd.oauth.enums.AuthUserGender; +import me.zhyd.oauth.exception.AuthException; +import me.zhyd.oauth.model.AuthCallback; +import me.zhyd.oauth.model.AuthResponse; +import me.zhyd.oauth.model.AuthToken; +import me.zhyd.oauth.model.AuthUser; +import me.zhyd.oauth.utils.GlobalAuthUtils; +import me.zhyd.oauth.utils.HttpUtils; +import me.zhyd.oauth.utils.StringUtils; +import me.zhyd.oauth.utils.UrlBuilder; + +/** + * 飞书平台，企业自建应用授权登录， + * https://open.feishu.cn/document/common-capabilities/sso/web-application-sso/web-app-overview + *

+ * 所以，最终修改该平台的实际发布版本为 支持扫码登录 + * + * @author beacon + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) 重构业务逻辑 20210101 + * @author maxkey 重构业务逻辑 20220216 + * @since 1.15.9 + */ +public class AuthFeishu2Request extends AuthDefaultRequest { + + public AuthFeishu2Request(AuthConfig config) { + super(config, AuthMxkDefaultSource.FEISHU2); + } + + public AuthFeishu2Request(AuthConfig config, AuthStateCache authStateCache) { + super(config, AuthMxkDefaultSource.FEISHU2, authStateCache); + } + + /** + * 获取 app_access_token（企业自建应用） + *

+ * Token 有效期为 2 小时，在此期间调用该接口 token 不会改变。当 token 有效期小于 30 分的时候，再次请求获取 token 的时候， + * 会生成一个新的 token，与此同时老的 token 依然有效。 + * + * @return appAccessToken + */ + private String getAppAccessToken() { + String cacheKey = this.source.getName().concat(":app_access_token:").concat(config.getClientId()); + String cacheAppAccessToken = this.authStateCache.get(cacheKey); + if (StringUtils.isNotEmpty(cacheAppAccessToken)) { + return cacheAppAccessToken; + } + String url = "https://open.feishu.cn/open-apis/auth/v3/app_access_token/internal/"; + JSONObject requestObject = new JSONObject(); + requestObject.put("app_id", config.getClientId()); + requestObject.put("app_secret", config.getClientSecret()); + String response = new HttpUtils(config.getHttpConfig()).post(url, requestObject.toJSONString(), new HttpHeader() + .add("Content-Type", "application/json")).getBody(); + JSONObject jsonObject = JSON.parseObject(response); + this.checkResponse(jsonObject); + String appAccessToken = jsonObject.getString("app_access_token"); + // 缓存 app access token + this.authStateCache.cache(cacheKey, appAccessToken, jsonObject.getLongValue("expire") * 1000); + return appAccessToken; + } + + @Override + protected AuthToken getAccessToken(AuthCallback authCallback) { + JSONObject requestObject = new JSONObject(); + requestObject.put("app_access_token", this.getAppAccessToken()); + requestObject.put("grant_type", "authorization_code"); + requestObject.put("client_id", config.getClientId()); + requestObject.put("client_secret", config.getClientSecret()); + requestObject.put("redirect_uri", config.getRedirectUri()); + requestObject.put("code", authCallback.getCode()); + return getToken(requestObject, this.source.accessToken()); + + } + + @Override + protected AuthUser getUserInfo(AuthToken authToken) { + String accessToken = authToken.getAccessToken(); + String response = new HttpUtils(config.getHttpConfig()).get(source.userInfo(), null, new HttpHeader() + .add("Content-Type", "application/json") + .add("Authorization", "Bearer " + accessToken), false).getBody(); + JSONObject object = JSON.parseObject(response); + this.checkResponse(object); + JSONObject data = object;//.getJSONObject("data"); + return AuthUser.builder() + .rawUserInfo(object) + .uuid(data.getString("union_id")) + .username(data.getString("name")) + .nickname(data.getString("name")) + .avatar(data.getString("avatar_url")) + .email(data.getString("email")) + .gender(AuthUserGender.UNKNOWN) + .token(authToken) + .source(source.toString()) + .build(); + } + + @Override + public AuthResponse refresh(AuthToken authToken) { + JSONObject requestObject = new JSONObject(); + requestObject.put("app_access_token", this.getAppAccessToken()); + requestObject.put("grant_type", "refresh_token"); + requestObject.put("refresh_token", authToken.getRefreshToken()); + return AuthResponse.builder() + .code(AuthResponseStatus.SUCCESS.getCode()) + .data(getToken(requestObject, this.source.refresh())) + .build(); + + } + + private AuthToken getToken(JSONObject param, String url) { + String response = new HttpUtils(config.getHttpConfig()).post(url, param.toJSONString(), new HttpHeader() + .add("Content-Type", "application/json")).getBody(); + JSONObject jsonObject = JSON.parseObject(response); + this.checkResponse(jsonObject); + JSONObject data = jsonObject;//.getJSONObject("data"); + return AuthToken.builder() + .accessToken(data.getString("access_token")) + .refreshToken(data.getString("refresh_token")) + .expireIn(data.getIntValue("expires_in")) + .tokenType(data.getString("token_type")) + .openId(data.getString("open_id")) + .build(); + } + + @Override + public String authorize(String state) { + return UrlBuilder.fromBaseUrl(source.authorize()) + .queryParam("client_id", config.getClientId()) + .queryParam("redirect_uri", GlobalAuthUtils.urlEncode(config.getRedirectUri())) + .queryParam("response_type", "code") + .queryParam("state", getRealState(state)) + .build(); + } + + + /** + * 校验响应内容是否正确 + * + * @param jsonObject 响应内容 + */ + private void checkResponse(JSONObject jsonObject) { + if (jsonObject.getIntValue("code") != 0) { + throw new AuthException(jsonObject.getString("message")); + } + } + +} \ No newline at end of file diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java index 9119586c5..baab7e703 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java @@ -100,7 +100,8 @@ public class SocialSignOnProviderService{ }else if(provider.equalsIgnoreCase("Eleme")) { authRequest = new AuthElemeRequest(authConfig); }else if(provider.equalsIgnoreCase("Feishu")) { - authRequest = new AuthFeishuRequest(authConfig); + //authRequest = new AuthFeishuRequest(authConfig); + authRequest = new AuthFeishu2Request(authConfig); }else if(provider.equalsIgnoreCase("Github")) { authRequest = new AuthGithubRequest(authConfig); }else if(provider.equalsIgnoreCase("Gitlab")) { diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl index 2d58744c4..cacd925ce 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl @@ -87,7 +87,10 @@ <#if sspLogin.dingTalkLogin != 'none'> <#include "loginscandingtalk.ftl"> - <#if sspLogin.weLinkLogin != 'none'> + <#if sspLogin.feiShuLogin != 'none'> + <#include "loginscanfeishu.ftl"> + + <#if sspLogin.weLinkLogin != 'none'> <#include "loginscanwelink.ftl"> diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginscandingtalk.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginscandingtalk.ftl index 7f916da72..950e5c1b2 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginscandingtalk.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginscandingtalk.ftl @@ -1,10 +1,4 @@ - <#if sspLogin.dingTalkLogin == 'https'> - - - <#if sspLogin.dingTalkLogin == 'http'> - - - + + \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginscanwelink.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginscanwelink.ftl index 6f27d8ba9..9e52ad074 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginscanwelink.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginscanwelink.ftl @@ -1,14 +1,10 @@ - <#if sspLogin.weLinkLogin == 'https'> - - - <#if sspLogin.weLinkLogin == 'http'> - - + - - <#if sspLogin.workWeixinLogin == 'http'> - - +