opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-31 02:38:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11350 from ioito/automated-cherry-pick-of-#11349-upstream-release-3.7

Browse Source 
Automated cherry pick of #11349: fix(cloudid): avoid duplicate create saml provider
This commit is contained in:
Zexi Li
2021-06-08 23:13:54 +08:00
committed by GitHub
parent cb3aadd014 87c1c0e290
commit 200911ef38
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudid/models/cloudaccount.go
+2 -1
View File
@@ -1133,6 +1133,7 @@ func (self *SCloudaccount) RegisterSAMProvider() (*SSAMLProvider, error) {
}()
sp.EntityId = options.Options.ApiServer
sp.CloudaccountId = self.Id
sp.DomainId = self.DomainId
sp.Status = api.SAML_PROVIDER_STATUS_CREATING
metadata := SamlIdpInstance().GetMetadata(self.Id).String()
sp.MetadataDocument = metadata
@@ -1199,7 +1200,7 @@ func (self *SCloudaccount) StartSyncCloudrolesTask(ctx context.Context, userCred
}
func (self *SCloudaccount) GetSAMLProviders() ([]SSAMLProvider, error) {
q := SAMLProviderManager.Query().Equals("cloudaccount_id", self.Id)
q := SAMLProviderManager.Query().Equals("cloudaccount_id", self.Id).Desc("external_id")
samls := []SSAMLProvider{}
err := db.FetchModelObjects(SAMLProviderManager, q, &samls)
if err != nil {