From fea4a6b07b2a574ccc90ae6fa0982f62aba15173 Mon Sep 17 00:00:00 2001
From: Jian Qiu <swordqiu@gmail.com>
Date: Tue, 25 Aug 2020 09:57:31 +0800
Subject: [PATCH] fix: oauth2 not support default_project_id and
 default_role_id (#7622)

Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
---
 pkg/apis/identity/oauth2.go          |  2 ++
 pkg/apis/identity/oidc.go            |  6 ++++++
 pkg/apis/identity/saml.go            | 32 ++++++++++++++++++++++++++++
 pkg/keystone/driver/oauth2/oauth2.go |  3 ++-
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/pkg/apis/identity/oauth2.go b/pkg/apis/identity/oauth2.go
index 4ee2803d6b..df462ac6dd 100644
--- a/pkg/apis/identity/oauth2.go
+++ b/pkg/apis/identity/oauth2.go
@@ -18,4 +18,6 @@ package identity
 type SOAuth2IdpConfigOptions struct {
 	AppId  string `json:"app_id"`
 	Secret string `json:"secret"`
+
+	SIdpAttributeOptions
 }
diff --git a/pkg/apis/identity/oidc.go b/pkg/apis/identity/oidc.go
index b6d9321318..1ddc9dd82b 100644
--- a/pkg/apis/identity/oidc.go
+++ b/pkg/apis/identity/oidc.go
@@ -35,11 +35,15 @@ type SOIDCDexConfigOptions struct {
 	ClientId     string `json:"client_id"`
 	ClientSecret string `json:"client_secret"`
 	Endpoint     string `json:"endpoint"`
+
+	SIdpAttributeOptions
 }
 
 type SOIDCGithubConfigOptions struct {
 	ClientId     string `json:"client_id"`
 	ClientSecret string `json:"client_secret"`
+
+	SIdpAttributeOptions
 }
 
 const (
@@ -52,4 +56,6 @@ type SOIDCAzureConfigOptions struct {
 	ClientSecret string `json:"client_secret"`
 	TenantId     string `json:"tenant_id"`
 	CloudEnv     string `json:"cloud_env"`
+
+	SIdpAttributeOptions
 }
diff --git a/pkg/apis/identity/saml.go b/pkg/apis/identity/saml.go
index fbf729c6b8..a5ff0ff046 100644
--- a/pkg/apis/identity/saml.go
+++ b/pkg/apis/identity/saml.go
@@ -42,4 +42,36 @@ type SSAMLTestIdpConfigOptions struct {
 
 type SSAMLAzureADConfigOptions struct {
 	TenantId string `json:"tenant_id"`
+
+	SIdpAttributeOptions
+}
+
+func (a *SIdpAttributeOptions) Update(a2 SIdpAttributeOptions) {
+	if len(a2.UserNameAttribute) > 0 {
+		a.UserNameAttribute = a2.UserNameAttribute
+	}
+	if len(a2.UserIdAttribute) > 0 {
+		a.UserIdAttribute = a2.UserIdAttribute
+	}
+	if len(a2.UserDisplaynameAttribtue) > 0 {
+		a.UserDisplaynameAttribtue = a2.UserDisplaynameAttribtue
+	}
+	if len(a2.UserEmailAttribute) > 0 {
+		a.UserEmailAttribute = a2.UserEmailAttribute
+	}
+	if len(a2.UserMobileAttribute) > 0 {
+		a.UserMobileAttribute = a2.UserMobileAttribute
+	}
+	if len(a2.ProjectAttribute) > 0 {
+		a.ProjectAttribute = a2.ProjectAttribute
+	}
+	if len(a2.RolesAttribute) > 0 {
+		a.RolesAttribute = a2.RolesAttribute
+	}
+	if len(a2.DefaultProjectId) > 0 {
+		a.DefaultProjectId = a2.DefaultProjectId
+	}
+	if len(a2.DefaultRoleId) > 0 {
+		a.DefaultRoleId = a2.DefaultRoleId
+	}
 }
diff --git a/pkg/keystone/driver/oauth2/oauth2.go b/pkg/keystone/driver/oauth2/oauth2.go
index 7f1c08b85a..713e4e788c 100644
--- a/pkg/keystone/driver/oauth2/oauth2.go
+++ b/pkg/keystone/driver/oauth2/oauth2.go
@@ -79,7 +79,8 @@ func (self *SOAuth2Driver) Authenticate(ctx context.Context, ident mcclient.SAut
 	if factory == nil {
 		return nil, errors.Wrapf(httperrors.ErrNotSupported, "template %s not supported", self.Template)
 	}
-	options := factory.IdpAttributeOptions()
+	options := self.oauth2Config.SIdpAttributeOptions
+	options.Update(factory.IdpAttributeOptions())
 	driver := factory.NewDriver(self.oauth2Config.AppId, self.oauth2Config.Secret)
 	attrs, err := driver.Authenticate(ctx, ident.OAuth2.Code)
 	if err != nil {