lxm_library_java/JustAuth
1
0
Fork 0
mirror of synced 2025-12-17 20:44:29 +08:00
Code Issues Projects Releases Wiki Activity

💩 微软平台适配 AzureAD（目前改名为 Microsoft Entra ID）登录认证

Browse Source
This commit is contained in:
yadong.zhang
2023-12-03 20:18:39 +08:00
parent 14dd2b6179
commit 1d38ce2835
3 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/me/zhyd/oauth/config/AuthConfig.java
View File

@@ -181,4 +181,9 @@ public class AuthConfig {
public String getAuthServerId() { public String getAuthServerId() {
return StringUtils.isEmpty(authServerId) ? "default" : authServerId; return StringUtils.isEmpty(authServerId) ? "default" : authServerId;
} }
/**
* Microsoft Entra ID（原微软 AAD）中的租户 ID
*/
private String tenantId;
} }

18
src/main/java/me/zhyd/oauth/config/AuthDefaultSource.java
View File

@@ -410,17 +410,17 @@ public enum AuthDefaultSource implements AuthSource {
FACEBOOK { FACEBOOK {
@Override @Override
public String authorize() { public String authorize() {
return "https://www.facebook.com/v10.0/dialog/oauth"; return "https://www.facebook.com/v18.0/dialog/oauth";
} }
@Override @Override
public String accessToken() { public String accessToken() {
return "https://graph.facebook.com/v10.0/oauth/access_token"; return "https://graph.facebook.com/v18.0/oauth/access_token";
} }
@Override @Override
public String userInfo() { public String userInfo() {
return "https://graph.facebook.com/v10.0/me"; return "https://graph.facebook.com/v18.0/me";
} }
@Override @Override
@@ -492,12 +492,12 @@ public enum AuthDefaultSource implements AuthSource {
MICROSOFT { MICROSOFT {
@Override @Override
public String authorize() { public String authorize() {
return "https://login.microsoftonline.com/common/oauth2/v2.0/authorize"; return "https://login.microsoftonline.com/%s/oauth2/v2.0/authorize";
} }
@Override @Override
public String accessToken() { public String accessToken() {
return "https://login.microsoftonline.com/common/oauth2/v2.0/token"; return "https://login.microsoftonline.com/%s/oauth2/v2.0/token";
} }
@Override @Override
@@ -507,7 +507,7 @@ public enum AuthDefaultSource implements AuthSource {
@Override @Override
public String refresh() { public String refresh() {
return "https://login.microsoftonline.com/common/oauth2/v2.0/token"; return "https://login.microsoftonline.com/%s/oauth2/v2.0/token";
} }
@Override @Override
@@ -521,12 +521,12 @@ public enum AuthDefaultSource implements AuthSource {
MICROSOFT_CN { MICROSOFT_CN {
@Override @Override
public String authorize() { public String authorize() {
return "https://login.partner.microsoftonline.cn/common/oauth2/v2.0/authorize"; return "https://login.partner.microsoftonline.cn/%s/oauth2/v2.0/authorize";
} }
@Override @Override
public String accessToken() { public String accessToken() {
return "https://login.partner.microsoftonline.cn/common/oauth2/v2.0/token"; return "https://login.partner.microsoftonline.cn/%s/oauth2/v2.0/token";
} }
@Override @Override
@@ -536,7 +536,7 @@ public enum AuthDefaultSource implements AuthSource {
@Override @Override
public String refresh() { public String refresh() {
return "https://login.partner.microsoftonline.cn/common/oauth2/v2.0/token"; return "https://login.partner.microsoftonline.cn/%s/oauth2/v2.0/token";
} }
@Override @Override

22
src/main/java/me/zhyd/oauth/request/AbstractAuthMicrosoftRequest.java
View File

@@ -16,6 +16,7 @@ import me.zhyd.oauth.model.AuthToken;
import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUser;
import me.zhyd.oauth.utils.AuthScopeUtils; import me.zhyd.oauth.utils.AuthScopeUtils;
import me.zhyd.oauth.utils.HttpUtils; import me.zhyd.oauth.utils.HttpUtils;
import me.zhyd.oauth.utils.StringUtils;
import me.zhyd.oauth.utils.UrlBuilder; import me.zhyd.oauth.utils.UrlBuilder;
import java.util.Map; import java.util.Map;
@@ -126,9 +127,16 @@ public abstract class AbstractAuthMicrosoftRequest extends AuthDefaultRequest {
*/ */
@Override @Override
public String authorize(String state) { public String authorize(String state) {
return UrlBuilder.fromBaseUrl(super.authorize(state)) // 兼容 Microsoft Entra ID 登录（原微软 AAD）
// @since 1.16.6
String tenantId = StringUtils.isEmpty(config.getTenantId()) ? "common" : config.getTenantId();
return UrlBuilder.fromBaseUrl(String.format(source.authorize(), tenantId))
.queryParam("response_type", "code")
.queryParam("client_id", config.getClientId())
.queryParam("redirect_uri", config.getRedirectUri())
.queryParam("state", getRealState(state))
.queryParam("response_mode", "query") .queryParam("response_mode", "query")
.queryParam("scope", this.getScopes(" ", true, AuthScopeUtils.getDefaultScopes(AuthMicrosoftScope.values()))) .queryParam("scope", this.getScopes(" ", false, AuthScopeUtils.getDefaultScopes(AuthMicrosoftScope.values())))
.build(); .build();
} }
@@ -140,12 +148,13 @@ public abstract class AbstractAuthMicrosoftRequest extends AuthDefaultRequest {
*/ */
@Override @Override
protected String accessTokenUrl(String code) { protected String accessTokenUrl(String code) {
return UrlBuilder.fromBaseUrl(source.accessToken()) String tenantId = StringUtils.isEmpty(config.getTenantId()) ? "common" : config.getTenantId();
return UrlBuilder.fromBaseUrl(String.format(source.accessToken(), tenantId))
.queryParam("code", code) .queryParam("code", code)
.queryParam("client_id", config.getClientId()) .queryParam("client_id", config.getClientId())
.queryParam("client_secret", config.getClientSecret()) .queryParam("client_secret", config.getClientSecret())
.queryParam("grant_type", "authorization_code") .queryParam("grant_type", "authorization_code")
.queryParam("scope", this.getScopes(" ", true, AuthScopeUtils.getDefaultScopes(AuthMicrosoftScope.values()))) .queryParam("scope", this.getScopes(" ", false, AuthScopeUtils.getDefaultScopes(AuthMicrosoftScope.values())))
.queryParam("redirect_uri", config.getRedirectUri()) .queryParam("redirect_uri", config.getRedirectUri())
.build(); .build();
} }
@@ -169,12 +178,13 @@ public abstract class AbstractAuthMicrosoftRequest extends AuthDefaultRequest {
*/ */
@Override @Override
protected String refreshTokenUrl(String refreshToken) { protected String refreshTokenUrl(String refreshToken) {
return UrlBuilder.fromBaseUrl(source.refresh()) String tenantId = StringUtils.isEmpty(config.getTenantId()) ? "common" : config.getTenantId();
return UrlBuilder.fromBaseUrl(String.format(source.refresh(), tenantId))
.queryParam("client_id", config.getClientId()) .queryParam("client_id", config.getClientId())
.queryParam("client_secret", config.getClientSecret()) .queryParam("client_secret", config.getClientSecret())
.queryParam("refresh_token", refreshToken) .queryParam("refresh_token", refreshToken)
.queryParam("grant_type", "refresh_token") .queryParam("grant_type", "refresh_token")
.queryParam("scope", this.getScopes(" ", true, AuthScopeUtils.getDefaultScopes(AuthMicrosoftScope.values()))) .queryParam("scope", this.getScopes(" ", false, AuthScopeUtils.getDefaultScopes(AuthMicrosoftScope.values())))
.queryParam("redirect_uri", config.getRedirectUri()) .queryParam("redirect_uri", config.getRedirectUri())
.build(); .build();
} }