Merge pull request #839 from ioito/hotfix/qx-saml-auth

fix(qcloud): saml auth
yunionio · Mar 29, 2024 · 376ab51 · 376ab51
2 parents 0d32177 + 26d5972
commit 376ab51
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/pkg/multicloud/qcloud/qcloud.go b/pkg/multicloud/qcloud/qcloud.go
@@ -767,6 +767,23 @@ func (client *SQcloudClient) verifyAppId() error {
 	return errors.Wrap(err, "Head")
 }
 
+func (client *SQcloudClient) getOwnerName() string {
+	if len(client.ownerName) > 0 {
+		return client.ownerName
+	}
+	coscli, err := client.getCosClient(nil)
+	if err != nil {
+		return ""
+	}
+	s, _, err := coscli.Service.Get(context.Background())
+	if err != nil {
+		return ""
+	}
+	client.ownerId = s.Owner.ID
+	client.ownerName = s.Owner.DisplayName
+	return client.ownerName
+}
+
 func (client *SQcloudClient) fetchBuckets() error {
 	coscli, err := client.getCosClient(nil)
 	if err != nil {

diff --git a/pkg/multicloud/qcloud/saml_provider.go b/pkg/multicloud/qcloud/saml_provider.go
@@ -61,7 +61,7 @@ func (self *SAMLProvider) Delete() error {
 }
 
 func (self *SAMLProvider) GetAuthUrl(apiServer string) string {
-	return fmt.Sprintf("https://cloud.tencent.com/login/forwardIdp/%s/%s", self.client.ownerName, self.Name)
+	return fmt.Sprintf("https://cloud.tencent.com/login/forwardIdp/%s/%s", self.client.getOwnerName(), self.Name)
 }
 
 func (self *SAMLProvider) GetMetadataDocument() (*samlutils.EntityDescriptor, error) {