From d3e23914a42028189088d7414862a85aca83d576 Mon Sep 17 00:00:00 2001
From: Heaven96 <lrx96@foxmail>
Date: Wed, 30 Nov 2022 14:16:24 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD](master):?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E5=AF=B9gitlab=E9=80=9A=E8=BF=87=E4=BB=A4?=
 =?UTF-8?q?=E7=89=8C=E6=8E=A8=E9=80=81=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增对Gitlab提供的通过Oauth2协议认证，操作Git的支持
---
 .../src/main/java/org/ssssssss/magicapi/git/GitRepo.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitRepo.java b/magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitRepo.java
index 0dd77898..85b06b5a 100644
--- a/magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitRepo.java
+++ b/magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitRepo.java
@@ -52,7 +52,7 @@ public class GitRepo {
     }
 
     /**
-     * 设置ssh秘钥或者账号密码
+     * 设置ssh秘钥或者账号密码或者使用OAuth2进行认证
      *
      * @param transportCommand
      * @return
@@ -87,6 +87,13 @@ public class GitRepo {
             transportCommand.setCredentialsProvider(new UsernamePasswordCredentialsProvider(
                     properties.getUsername(),
                     properties.getPassword()));
+        } else if (StringUtils.isNotBlank(properties.getUrl()) && properties.getUrl().contains("oauth2:")) {
+            //采取OAuth2进行认证 面向gitlab api场景 Heaven96 @ 2022年11月30日13:27:38 开始
+            final String url = properties.getUrl();
+            int start = url.indexOf("oauth2:") + 7;
+            int end = url.indexOf("@");
+            transportCommand.setCredentialsProvider(new UsernamePasswordCredentialsProvider("oauth2",url.substring(start,end)));
+            //采取OAuth2进行认证 面向gitlab api场景 Heaven96 @ 2022年11月30日13:27:38 结束
         }
     }