Merge branch 'refs/heads/feat-login-website'

# Conflicts:
#	proto/conf.go

handler/tool.go

@@ -863,6 +863,14 @@ func GetThirdPartyAuthUrl(c *gin.Context) {
 		params.Add("state", stateID)
 		params.Add("scope", "user")
 		respUrl = fmt.Sprintf("%s?%s", baseUrl, params.Encode())
+	case "microsoft":
+		params := url.Values{}
+		params.Add("client_id", worker.MicroSoftClientID)
+		params.Add("redirect_uri", "https://pm.ljsea.top/tool/third_party_callback")
+		params.Add("response_type", "code") //返回code
+		params.Add("state", stateID)
+		params.Add("scope", "User.Read Mail.Read")
+		respUrl = fmt.Sprintf("https://login.microsoftonline.com/%s/oauth2/v2.0/authorize?%s", worker.MicroSoftTenantID, params.Encode())
 	default:
 		log.Println("platform not support:", platform)
 	}

proto/conf.go

@@ -93,6 +93,7 @@ type ConfigStruct struct {
 	GITHUB_CLIENT_SECRET string        `json:"github_client_secret"`     // github client secret
 	GITEE_CLIENT_ID      string        `json:"gitee_client_id"`          // gitee client id
 	GITEE_CLIENT_SECRET  string        `json:"gitee_client_secret"`      // gitee client secret
+	MICROSOFT_CLIENT_SECRET string        `json:"microsoft_client_secret"` // microsoft client secret
 }
 
 type KBaseServer struct {

proto/tool.go

@@ -353,3 +353,34 @@ type GiteaUserInfo struct {
 	Picture           string      `json:"picture"`
 	Groups            interface{} `json:"groups"`
 }
+
+/**************************microsoft***********************/
+type MicrosoftOAuthResponse struct {
+	AccessToken  string `json:"access_token"`
+	TokenType    string `json:"token_type"`
+	ExpiresIn    int    `json:"expires_in"`
+	RefreshToken string `json:"refresh_token"`
+}
+
+type MicrosoftOAuthRequest struct {
+	ClientID     string `json:"client_id"`
+	ClientSecret string `json:"client_secret"`
+	Code         string `json:"code"`
+	RedirectURI  string `json:"redirect_uri"`
+	GrantType    string `json:"grant_type"` // authorization_code
+}
+
+type MicrosoftUserInfo struct {
+	OdataContext      string      `json:"@odata.context"`
+	BusinessPhones    []string    `json:"businessPhones"`
+	DisplayName       string      `json:"displayName"`
+	GivenName         string      `json:"givenName"`
+	JobTitle          interface{} `json:"jobTitle"`
+	Mail              interface{} `json:"mail"`
+	MobilePhone       interface{} `json:"mobilePhone"`
+	OfficeLocation    interface{} `json:"officeLocation"`
+	PreferredLanguage string      `json:"preferredLanguage"`
+	Surname           string      `json:"surname"`
+	UserPrincipalName string      `json:"userPrincipalName"`
+	ID                string      `json:"id"`
+}

service/toolService.go

@@ -491,6 +491,8 @@ func DoThirdPartyCallBack(state *proto.ThirdPartyLoginState, code string) {
 		DoStackoverflowCallBack(state, code)
 	case "my_gitea", "gitea":
 		DoGiteaCallBack(state, code)
+	case "microsoft":
+		DoMicroSoftCallBack(state, code)
 	default:
 		log.Println("DoThirdPartyCallBack platform error:", state.Platform)
 	}
@@ -704,3 +706,36 @@ func DoGiteaCallBack(state *proto.ThirdPartyLoginState, code string) {
 	log.Printf("do handle %s callback success, third party login status: %v\n", state.Platform, thirdPartyLoginStatus)
 	worker.SetRedisWithExpire(state.UUID, string(thirdPartyLoginStatusStr), time.Minute*10)
 }
+
+func DoMicroSoftCallBack(state *proto.ThirdPartyLoginState, code string) {
+	var thirdPartyLoginStatus proto.ThirdPartyLoginStatus
+	thirdPartyLoginStatus.Type = state.Platform
+	//根据code获取Access Token
+	tokenResp, _ := worker.GetMicroSoftAccessTokenByCode(code, "https://pm.ljsea.top/tool/third_party_callback", worker.MicroSoftClientID, proto.Config.MICROSOFT_CLIENT_SECRET)
+	//if err != nil {
+	//	log.Printf("get %s access token error:%v\n", state.Platform, err)
+	//	thirdPartyLoginStatus.Status = proto.ParameterError
+	//	return
+	//}
+	if tokenResp.AccessToken == "" {
+		log.Printf("get %s access token is empty,token resp:%v\n", state.Platform, tokenResp)
+		thirdPartyLoginStatus.Status = proto.ParameterError
+	} else {
+		log.Printf("get %s access token:%v\n", state.Platform, tokenResp.AccessToken)
+		//获取用户信息
+		userInfoResp, err2 := worker.GetMicroSoftUserInfo(tokenResp.AccessToken)
+		if err2 != nil {
+			log.Printf("get %s user info error:%v\n", state.Platform, err2)
+			thirdPartyLoginStatus.Status = proto.ParameterError
+		} else {
+			log.Printf("get %s user info:%v\n", state.Platform, userInfoResp)
+			thirdPartyUserInfo := proto.ThirdPartyUserInfo{UserID: userInfoResp.ID, Name: userInfoResp.DisplayName, Avatar: "", Email: ""}
+			HandleThirdPartyLoginStatusV2(state, &thirdPartyLoginStatus, &thirdPartyUserInfo)
+			thirdPartyLoginStatus.Status = proto.SuccessCode
+		}
+	}
+	//更新redis中的第三方登录状态
+	thirdPartyLoginStatusStr, _ := json.Marshal(thirdPartyLoginStatus)
+	log.Printf("do handle %s callback success, third party login status: %v\n", state.Platform, thirdPartyLoginStatus)
+	worker.SetRedisWithExpire(state.UUID, string(thirdPartyLoginStatusStr), time.Minute*10)
+}

worker/thirdParty.go

@@ -569,3 +569,53 @@ func GetGiteaUserInfo(baseDomain, accessToken string) (proto.GiteaUserInfo, erro
 	return resp, nil
 
 }
+
+// microsoft登录
+const (
+	MicroSoftClientID = "53ce40d3-260e-4256-a500-201b30203e80"
+	MicroSoftTenantID = "df0fa05b-820a-48c3-8ebd-f159845bf0b2"
+)
+
+func GetMicroSoftAccessTokenByCode(code string, redirectURI string, clientID string, clientSecret string) (proto.MicrosoftOAuthResponse, error) {
+	var resp proto.MicrosoftOAuthResponse
+
+	url := fmt.Sprintf("https://login.microsoftonline.com/%s/oauth2/v2.0/token", MicroSoftTenantID)
+	req := proto.MicrosoftOAuthRequest{
+		ClientID:     clientID,
+		ClientSecret: clientSecret,
+		Code:         code,
+		RedirectURI:  redirectURI,
+		GrantType:    "authorization_code",
+	}
+	reqData, err := json.Marshal(req)
+
+	log.Println("microsoft request url:", url, "reqData:", string(reqData))
+	err2, respBytes := DoPostRequestJSON(url, reqData, nil)
+	if err2 != nil {
+		log.Println("microsoft response err:", err2)
+		return resp, err2
+	}
+	err = json.Unmarshal(respBytes, &resp)
+	if err != nil {
+		log.Println("microsoft response decode err:", err, " response content:", string(respBytes))
+		return resp, err
+	}
+	return resp, nil
+}
+
+func GetMicroSoftUserInfo(accessToken string) (proto.MicrosoftUserInfo, error) {
+	url := "https://graph.microsoft.com/v1.0/me"
+	headers := map[string]string{
+		"Authorization": "Bearer " + accessToken,
+	}
+	var resp proto.MicrosoftUserInfo
+	err2, respBytes := DoGetRequest(url, headers)
+	if err2 != nil {
+		return resp, err2
+	}
+	err := json.Unmarshal(respBytes, &resp)
+	if err != nil {
+		return resp, err
+	}
+	return resp, nil
+}