Revert "Add method AzureCPConfig.CreateDefaultConfiguration"

This reverts commit 548583f.
Yvand · Jul 10, 2019 · a8c739f · a8c739f
1 parent 548583f
commit a8c739f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 28 deletions.
diff --git a/AzureCP/AzureCPConfig.cs b/AzureCP/AzureCPConfig.cs
@@ -389,35 +389,17 @@ public void ResetClaimTypesList()
                 TraceSeverity.High, EventSeverity.Information, TraceCategory.Core);
         }
 
-        /// <summary>
-        /// If AzureCP is associated with a SPTrustedLoginProvider, create its configuration with default settings and save it into configuration database. If it already exists, it will be replaced.
-        /// </summary>
-        /// <returns></returns>
-        public static AzureCPConfig CreateDefaultConfiguration()
-        {
-            SPTrustedLoginProvider spTrust = AzureCP.GetSPTrustAssociatedWithCP(AzureCP._ProviderInternalName);
-            if (spTrust == null)
-            {
-                return null;
-            }
-            else
-            {
-                return CreateConfiguration(ClaimsProviderConstants.CONFIG_ID, ClaimsProviderConstants.CONFIG_NAME, spTrust.Name);
-            }
-        }
-
         /// <summary>
         /// Create a persisted object with default configuration of AzureCP.
         /// </summary>
-        /// <param name="persistedObjectID">GUID of the configuration, stored as a persisted object into SharePoint configuration database</param>
-        /// <param name="persistedObjectName">Name of the configuration, stored as a persisted object into SharePoint configuration database</param>
-        /// <param name="spTrustName">Name of the SPTrustedLoginProvider that claims provider is associated with</param>
+        /// <param name="persistedObjectID"></param>
+        /// <param name="persistedObjectName"></param>
         /// <returns></returns>
         public static AzureCPConfig CreateConfiguration(string persistedObjectID, string persistedObjectName, string spTrustName)
         {
             if (String.IsNullOrEmpty(spTrustName))
             {
-                throw new ArgumentNullException("spTrustName");
+                throw new ArgumentNullException("spTrust");
             }
 
             // Ensure it doesn't already exists and delete it if so

diff --git a/AzureCP/Features/AzureCP/AzureCP.EventReceiver.cs b/AzureCP/Features/AzureCP/AzureCP.EventReceiver.cs
@@ -39,14 +39,19 @@ private void ExecBaseFeatureActivated(Microsoft.SharePoint.SPFeatureReceiverProp
                 {
                     ClaimsProviderLogging svc = ClaimsProviderLogging.Local;
                     ClaimsProviderLogging.Log($"[{AzureCP._ProviderInternalName}] Activating farm-scoped feature for claims provider \"{AzureCP._ProviderInternalName}\"", TraceSeverity.High, EventSeverity.Information, ClaimsProviderLogging.TraceCategory.Configuration);
-                    AzureCPConfig existingConfig = AzureCPConfig.GetConfiguration(ClaimsProviderConstants.CONFIG_NAME);
-                    if (existingConfig == null)
-                    {
-                        AzureCPConfig.CreateDefaultConfiguration();
-                    }
-                    else
+
+                    var spTrust = AzureCP.GetSPTrustAssociatedWithCP(AzureCP._ProviderInternalName);
+                    if (spTrust != null)
                     {
-                        ClaimsProviderLogging.Log($"[{AzureCP._ProviderInternalName}] Use configuration \"{ClaimsProviderConstants.CONFIG_NAME}\" found in the configuration database", TraceSeverity.High, EventSeverity.Information, ClaimsProviderLogging.TraceCategory.Configuration);
+                        AzureCPConfig existingConfig = AzureCPConfig.GetConfiguration(ClaimsProviderConstants.CONFIG_NAME);
+                        if (existingConfig == null)
+                        {
+                            AzureCPConfig.CreateConfiguration(ClaimsProviderConstants.CONFIG_ID, ClaimsProviderConstants.CONFIG_NAME, spTrust.Name);
+                        }
+                        else
+                        {
+                            ClaimsProviderLogging.Log($"[{AzureCP._ProviderInternalName}] Use configuration \"{ClaimsProviderConstants.CONFIG_NAME}\" found in the configuration database", TraceSeverity.High, EventSeverity.Information, ClaimsProviderLogging.TraceCategory.Configuration);
+                        }
                     }
                 }
                 catch (Exception ex)