From 60af92ed2d17d6bb188e25c68c361d6da6af6cac Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 16 十二月 2024 19:27:49 +0800
Subject: [PATCH] !618 update 适配 TOPAIM 2.0 单点登录 Merge pull request !618 from 马铃薯头/dev
---
ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java | 15 ++++++++++++++-
ruoyi-admin/src/main/resources/application-dev.yml | 2 +-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 283cdad..e4f6086 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -200,7 +200,7 @@
redirect-uri: ${justauth.address}/social-callback?source=maxkey
topiam:
# topiam 鏈嶅姟鍣ㄥ湴鍧�
- server-url: http://127.0.0.1:1989/api/v1/authorize/y0q************spq***********8ol
+ server-url: http://127.0.0.1:1898/api/v1/authorize/y0q************spq***********8ol
client-id: 449c4*********937************759
client-secret: ac7***********1e0************28d
redirect-uri: ${justauth.address}/social-callback?source=topiam
diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java
index 13f198d..31bb955 100644
--- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java
+++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java
@@ -1,7 +1,10 @@
package org.dromara.common.social.topiam;
+import cn.hutool.core.codec.Base64;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
import com.xkcoding.http.support.HttpHeader;
import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.cache.AuthStateCache;
@@ -70,6 +73,16 @@
.build();
}
+ @Override
+ protected String doPostAuthorizationCode(String code) {
+ HttpRequest request = HttpRequest.post(source.accessToken())
+ .header("Authorization", "Basic " + Base64.encode("%s:%s".formatted(config.getClientId(), config.getClientSecret())))
+ .form("grant_type", "authorization_code")
+ .form("code", code)
+ .form("redirect_uri", config.getRedirectUri());
+ HttpResponse response = request.execute();
+ return response.body();
+ }
@Override
protected String doGetUserInfo(AuthToken authToken) {
@@ -86,7 +99,7 @@
.build();
}
- public static void checkResponse(Dict object) {
+ private static void checkResponse(Dict object) {
// oauth/token 楠岃瘉寮傚父
if (object.containsKey("error")) {
throw new AuthException(object.getStr("error_description"));
--
Gitblit v1.9.3