v2.0.0.0 fixes after testing

Author: AMSoftwareNL

AMSoftware.Crm.PowerShell.Commands/ConnectOrganizationCommand.cs

@@ -42,28 +42,27 @@ protected override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
 
-            if (Connection == null)
+            try
             {
-                try
+                if (!string.IsNullOrWhiteSpace(Connectionstring))
                 {
                     Connection = new CrmServiceClient(Connectionstring);
+                }
 
-                    if (Connection != null && Connection.IsReady)
-                    {
-                        CrmContext.Connect(Connection);
-                        WriteObject(Connection.OrganizationDetail);
-                    }
-                    else
-                    {
-                        throw new Exception(Connection.LastCrmError, Connection.LastCrmException);
-                    }
+                if (Connection != null && Connection.IsReady)
+                {
+                    CrmContext.Connect(Connection);
+                    WriteObject(Connection.OrganizationDetail);
                 }
-                catch {
-                    throw;
+                else
+                {
+                    throw new Exception(Connection.LastCrmError, Connection.LastCrmException);
                 }
             }
-
-            
+            catch
+            {
+                throw;
+            }
         }
     }
 }

AMSoftware.Crm.PowerShell.Common/CrmContext.cs

@@ -25,6 +25,8 @@ namespace AMSoftware.Crm.PowerShell.Common
 {
     internal static class CrmContext
     {
+        private static CrmSession _session = null;
+
         static CrmContext()
         {
             try
@@ -34,17 +36,24 @@ static CrmContext()
                 accelerators.InvokeMember("Add", System.Reflection.BindingFlags.InvokeMethod, null, null, new object[] { "crmoptionsetvalue", typeof(OptionSetValue) });
                 accelerators.InvokeMember("Add", System.Reflection.BindingFlags.InvokeMethod, null, null, new object[] { "crmlabel", typeof(Label) });
             }
-            catch {
-                
+            catch
+            {
+
             }
 
             ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
         }
 
         public static void Connect(CrmServiceClient connection)
         {
-
-            Session = new CrmSession(connection);
+            if (connection != null && connection.IsReady)
+            {
+                Session = new CrmSession(connection);
+            }
+            else
+            {
+                throw new Exception("Invalid connection");
+            }
         }
 
         public static void Disconnect()
@@ -57,8 +66,21 @@ public static void Disconnect()
 
         public static CrmSession Session
         {
-            get;
-            private set;
+            get
+            {
+                if (_session != null && _session.Client != null && _session.Client.IsReady)
+                {
+                    return _session;
+                }
+                else
+                {
+                    throw new Exception("Session is not available or not connected. Use Connect-CrmOrganization to connect.");
+                }
+            }
+            private set
+            {
+                _session = value;
+            }
         }
     }
 }