Resolve namespaces.

peombwa · peombwa · commit bd0b988b57b6 · 2020-10-12T16:39:43.000-07:00
diff --git a/src/Authentication/Authentication.Test/Common/GraphSettingsTests.cs b/src/Authentication/Authentication.Test/Common/GraphSettingsTests.cs
@@ -3,12 +3,9 @@
     using Microsoft.Graph.Authentication.Test.Mocks;
     using Microsoft.Graph.PowerShell.Authentication;
     using Microsoft.Graph.PowerShell.Authentication.Common;
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
+    using Microsoft.Graph.PowerShell.Authentication.Interfaces;
+    using Microsoft.Graph.PowerShell.Authentication.Models;
     using System.Linq;
-    using System.Runtime.Serialization.Formatters.Binary;
-    using System.Text;
     using Xunit;
 
     public class GraphSettingsTests
diff --git a/src/Authentication/Authentication.Test/Handlers/NationalCloudHandlerTests.cs b/src/Authentication/Authentication.Test/Handlers/NationalCloudHandlerTests.cs
@@ -2,12 +2,13 @@ namespace Microsoft.Graph.Authentication.Test
 {
     using Microsoft.Graph.PowerShell.Authentication;
     using Microsoft.Graph.PowerShell.Authentication.Handlers;
+    using Microsoft.Graph.PowerShell.Authentication.Models;
     using System;
-    using System.Linq;
     using System.Net.Http;
     using System.Threading;
     using System.Threading.Tasks;
     using Xunit;
+
     public class NationalCloudHandlerTests : IDisposable
     {
         private HttpMessageInvoker _invoker;
diff --git a/src/Authentication/Authentication.Test/Mocks/MockDataStore.cs b/src/Authentication/Authentication.Test/Mocks/MockDataStore.cs
@@ -1,6 +1,6 @@
 ﻿namespace Microsoft.Graph.Authentication.Test.Mocks
 {
-    using Microsoft.Graph.PowerShell.Authentication;
+    using Microsoft.Graph.PowerShell.Authentication.Interfaces;
     using System;
     using System.Collections.Concurrent;
     using System.Collections.Generic;
diff --git a/src/Authentication/Authentication.Test/TokenCache/ProcessTokenCacheStorageTests.cs b/src/Authentication/Authentication.Test/TokenCache/ProcessTokenCacheStorageTests.cs
@@ -1,6 +1,7 @@
 ﻿namespace Microsoft.Graph.Authentication.Test.TokenCache
 {
     using Microsoft.Graph.PowerShell.Authentication;
+    using Microsoft.Graph.PowerShell.Authentication.Common;
     using Microsoft.Graph.PowerShell.Authentication.TokenCache;
     using System;
     using System.Text;
diff --git a/src/Authentication/Authentication/Cmdlets/ConnectMgGraph.cs b/src/Authentication/Authentication/Cmdlets/ConnectMgGraph.cs
@@ -16,6 +16,7 @@ namespace Microsoft.Graph.PowerShell.Authentication.Cmdlets
     using System.Threading.Tasks;
     using System.Net;
     using System.Globalization;
+    using Microsoft.Graph.PowerShell.Authentication.Interfaces;
     using Microsoft.Graph.PowerShell.Authentication.Common;
 
     [Cmdlet(VerbsCommunications.Connect, "MgGraph", DefaultParameterSetName = Constants.UserParameterSet)]
@@ -77,16 +78,6 @@ protected override void BeginProcessing()
             base.BeginProcessing();
             ValidateParameters();
 
-            if (GraphEnvironment.BuiltInEnvironments.ContainsKey(GraphEnvironmentConstants.EnvironmentName.Global))
-            {
-                environment = GraphEnvironment.BuiltInEnvironments[GraphEnvironmentConstants.EnvironmentName.Global];
-            }
-            else
-            {
-                WriteWarning($"Default environment {GraphEnvironmentConstants.EnvironmentName.Global} cannot be found from environment list.");
-                WriteWarning("You can get current list via [Microsoft.Graph.PowerShell.Authentication.GraphEnvironment]::GraphEnvironments");
-            }
-
             if (MyInvocation.BoundParameters.ContainsKey(nameof(Environment)))
             {
                 GraphSettings settings = this.GetContextSettings();
@@ -95,6 +86,10 @@ protected override void BeginProcessing()
                     throw new PSInvalidOperationException(string.Format(ErrorConstants.Message.InvalidEnvironment, Environment));
                 }
             }
+            else
+            {
+                environment = GraphEnvironment.BuiltInEnvironments[GraphEnvironmentConstants.EnvironmentName.Global];
+            }
         }
 
         protected override void EndProcessing()
diff --git a/src/Authentication/Authentication/Cmdlets/Environment/AddMgEnvironment.cs b/src/Authentication/Authentication/Cmdlets/Environment/AddMgEnvironment.cs
@@ -4,8 +4,11 @@
 
 namespace Microsoft.Graph.PowerShell.Authentication.Cmdlets
 {
+    using Microsoft.Graph.PowerShell.Authentication.Common;
     using Microsoft.Graph.PowerShell.Authentication.Extensions;
     using Microsoft.Graph.PowerShell.Authentication.Helpers;
+    using Microsoft.Graph.PowerShell.Authentication.Interfaces;
+    using Microsoft.Graph.PowerShell.Authentication.Models;
     using System;
     using System.Linq;
     using System.Management.Automation;
diff --git a/src/Authentication/Authentication/Cmdlets/Environment/GetMgEnvironment.cs b/src/Authentication/Authentication/Cmdlets/Environment/GetMgEnvironment.cs
@@ -4,6 +4,8 @@
 
 namespace Microsoft.Graph.PowerShell.Authentication.Cmdlets
 {
+    using Microsoft.Graph.PowerShell.Authentication.Common;
+    using Microsoft.Graph.PowerShell.Authentication.Models;
     using System.Management.Automation;
 
     /// <summary>
diff --git a/src/Authentication/Authentication/Cmdlets/Environment/RemoveMgEnvironment.cs b/src/Authentication/Authentication/Cmdlets/Environment/RemoveMgEnvironment.cs
@@ -4,7 +4,9 @@
 
 namespace Microsoft.Graph.PowerShell.Authentication.Cmdlets
 {
+    using Microsoft.Graph.PowerShell.Authentication.Common;
     using Microsoft.Graph.PowerShell.Authentication.Helpers;
+    using Microsoft.Graph.PowerShell.Authentication.Models;
     using System;
     using System.Globalization;
     using System.Linq;
diff --git a/src/Authentication/Authentication/Cmdlets/Environment/SetMgEnvironment.cs b/src/Authentication/Authentication/Cmdlets/Environment/SetMgEnvironment.cs
@@ -4,7 +4,10 @@
 
 namespace Microsoft.Graph.PowerShell.Authentication.Cmdlets
 {
+    using Microsoft.Graph.PowerShell.Authentication.Common;
     using Microsoft.Graph.PowerShell.Authentication.Extensions;
+    using Microsoft.Graph.PowerShell.Authentication.Interfaces;
+    using Microsoft.Graph.PowerShell.Authentication.Models;
     using System;
     using System.Globalization;
     using System.Linq;
@@ -52,12 +55,7 @@ protected override void ProcessRecord()
                 GraphSettings settings = this.GetContextSettings();
                 if (!settings.TryGetEnvironment(Name, out IGraphEnvironment newEnvironment))
                 {
-                    // Create default environment if it doesn't exist.
-                    newEnvironment = new GraphEnvironment {
-                        Name = Name,
-                        AzureADEndpoint = settings.EnvironmentTable[GraphEnvironmentConstants.EnvironmentName.Global].AzureADEndpoint,
-                        GraphEndpoint = settings.EnvironmentTable[GraphEnvironmentConstants.EnvironmentName.Global].GraphEndpoint
-                    };
+                    newEnvironment = new GraphEnvironment { Name = Name };
                 }
 
                 if (MyInvocation.BoundParameters.ContainsKey(nameof(AzureADEndpoint)))
@@ -70,6 +68,7 @@ protected override void ProcessRecord()
                     newEnvironment.GraphEndpoint = GraphEndpoint.GetBaseUrl();
                 }
 
+                ValidateEnvironment(newEnvironment);
                 newEnvironment.Type = GraphEnvironmentConstants.EnvironmentType.UserDefined;
                 bool isSuccess = settings.TrySetEnvironment(newEnvironment, out IGraphEnvironment mergedEnvironment);
 
@@ -83,6 +82,19 @@ protected override void ProcessRecord()
             }
         }
 
+        /// <summary>
+        /// Ensures all required properties are set to <see cref="IGraphEnvironment"/> object.
+        /// </summary>
+        /// <param name="newEnvironment">The new <see cref="IGraphEnvironment"/> object.</param>
+        private void ValidateEnvironment(IGraphEnvironment newEnvironment)
+        {
+            if (string.IsNullOrWhiteSpace(newEnvironment.AzureADEndpoint)
+                || string.IsNullOrWhiteSpace(newEnvironment.GraphEndpoint))
+            {
+                this.ThrowParameterError(ErrorConstants.Message.InvalidUrlParameter, $"{nameof(GraphEndpoint)} or {nameof(AzureADEndpoint)}");
+            }
+        }
+
         private void ValidateParameters()
         {
             if (string.IsNullOrWhiteSpace(Name))
diff --git a/src/Authentication/Authentication/Cmdlets/InvokeMgGraphRequest.cs b/src/Authentication/Authentication/Cmdlets/InvokeMgGraphRequest.cs
@@ -12,12 +12,11 @@
 using System.Threading;
 using Microsoft.Graph.PowerShell.Authentication.Extensions;
 using Microsoft.Graph.PowerShell.Authentication.Helpers;
+using Microsoft.Graph.PowerShell.Authentication.Interfaces;
 using Microsoft.Graph.PowerShell.Authentication.Models;
 using Microsoft.Graph.PowerShell.Authentication.Properties;
 using Microsoft.PowerShell.Commands;
-
 using Newtonsoft.Json;
-
 using DriveNotFoundException = System.Management.Automation.DriveNotFoundException;
 
 namespace Microsoft.Graph.PowerShell.Authentication.Cmdlets
diff --git a/src/Authentication/Authentication/Common/DiskDataStore.cs b/src/Authentication/Authentication/Common/DiskDataStore.cs
@@ -2,13 +2,14 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-namespace Microsoft.Graph.PowerShell.Authentication
+namespace Microsoft.Graph.PowerShell.Authentication.Common
 {
+    using Microsoft.Graph.PowerShell.Authentication.Interfaces;
     using System.IO;
     using System.Text;
 
     /// <summary>
-    /// Disk data store based on Windows file management APIs (System.IO).
+    /// Disk data store based on System.IO APIs.
     /// </summary>
     internal class DiskDataStore : IDataStore
     {
diff --git a/src/Authentication/Authentication/Common/GraphSession.cs b/src/Authentication/Authentication/Common/GraphSession.cs
@@ -4,6 +4,7 @@
 
 namespace Microsoft.Graph.PowerShell.Authentication
 {
+    using Microsoft.Graph.PowerShell.Authentication.Interfaces;
     using System;
     using System.Security;
     using System.Threading;
diff --git a/src/Authentication/Authentication/Common/GraphSessionInitializer.cs b/src/Authentication/Authentication/Common/GraphSessionInitializer.cs
@@ -2,8 +2,10 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-namespace Microsoft.Graph.PowerShell.Authentication
+namespace Microsoft.Graph.PowerShell.Authentication.Common
 {
+    using Microsoft.Graph.PowerShell.Authentication.Interfaces;
+
     public static class GraphSessionInitializer
     {
         /// <summary>
diff --git a/src/Authentication/Authentication/Common/GraphSettings.cs b/src/Authentication/Authentication/Common/GraphSettings.cs
@@ -2,11 +2,13 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-namespace Microsoft.Graph.PowerShell.Authentication
+namespace Microsoft.Graph.PowerShell.Authentication.Common
 {
     using Microsoft.Graph.PowerShell.Authentication.Common;
     using Microsoft.Graph.PowerShell.Authentication.Extensions;
     using Microsoft.Graph.PowerShell.Authentication.Helpers;
+    using Microsoft.Graph.PowerShell.Authentication.Interfaces;
+    using Microsoft.Graph.PowerShell.Authentication.Models;
     using Newtonsoft.Json;
     using System;
     using System.Collections.Concurrent;
@@ -181,25 +183,23 @@ internal bool TryDeserializeObject<T>(string serialization, out T result, JsonCo
         /// <summary>
         /// Gets a list of <see cref="IGraphEnvironment"/>.
         /// </summary>
-        /// <param name="name">The name of the environment to remove.</param>
-        /// <returns>A list of <see cref="IGraphEnvironment"/></returns>
-        public List<IGraphEnvironment> ListEnvironments(string name)
+        /// <param name="name">The name of the environment to get. This is optional.</param>
+        /// <returns>A list of <see cref="IGraphEnvironment"/>.</returns>
+        public List<IGraphEnvironment> ListEnvironments(string name = null)
         {
             var result = new List<IGraphEnvironment>();
-            IGraphEnvironment environment;
             if (string.IsNullOrWhiteSpace(name))
             {
                 result.AddRange(Environments);
+                result.Sort((e1, e2) => {
+                    return e1.Type.CompareTo(e2.Type);
+                });
             }
-            else if (TryGetEnvironment(name, out environment))
+            else if (TryGetEnvironment(name, out IGraphEnvironment environment))
             {
                 result.Add(environment);
             }
 
-            result.Sort((e1, e2) => {
-                return e1.Type.CompareTo(e2.Type);
-            });
-
             return result;
         }
 
@@ -212,7 +212,7 @@ public IGraphEnvironment RemoveEnvironment(string name)
         {
             if (string.IsNullOrEmpty(name))
             {
-                throw new ArgumentNullException(nameof(name), "Environment name deeds to be specified.");
+                throw new ArgumentNullException(nameof(name), "Environment name needs to be specified.");
             }
             if (GraphEnvironment.BuiltInEnvironments.ContainsKey(name))
             {
diff --git a/src/Authentication/Authentication/Common/GraphSettingsConverter.cs b/src/Authentication/Authentication/Common/GraphSettingsConverter.cs
@@ -4,6 +4,8 @@
 
 namespace Microsoft.Graph.PowerShell.Authentication.Common
 {
+    using Microsoft.Graph.PowerShell.Authentication.Interfaces;
+    using Microsoft.Graph.PowerShell.Authentication.Models;
     using Newtonsoft.Json;
     using System;
     using System.Collections.Generic;
diff --git a/src/Authentication/Authentication/Common/ProtectedFileProvider.cs b/src/Authentication/Authentication/Common/ProtectedFileProvider.cs
@@ -5,6 +5,7 @@
 namespace Microsoft.Graph.PowerShell.Authentication.Common
 {
     using Microsoft.Graph.PowerShell.Authentication.Helpers;
+    using Microsoft.Graph.PowerShell.Authentication.Interfaces;
     using System;
     using System.IO;
     using System.Text;
@@ -17,7 +18,7 @@ public enum FileProtection
     }
 
     /// <summary>
-    /// Provides a protected access a shared file.
+    /// Provides protected access to a shared file.
     /// The file can be accessed in ReadOnly or ReadWrite mode.
     /// This class MUST be disposed by the caller.
     /// </summary>
diff --git a/src/Authentication/Authentication/Extensions/IGraphEnvironmentExtensions.cs b/src/Authentication/Authentication/Extensions/IGraphEnvironmentExtensions.cs
@@ -4,7 +4,10 @@
 
 namespace Microsoft.Graph.PowerShell.Authentication.Extensions
 {
+    using Microsoft.Graph.PowerShell.Authentication.Interfaces;
+    using Microsoft.Graph.PowerShell.Authentication.Models;
     using System;
+
     public static class IGraphEnvironmentExtensions
     {
         /// <summary>
diff --git a/src/Authentication/Authentication/GraphEnvironmentConstants.cs b/src/Authentication/Authentication/GraphEnvironmentConstants.cs
@@ -4,7 +4,9 @@
 
 namespace Microsoft.Graph.PowerShell.Authentication
 {
+    using Microsoft.Graph.PowerShell.Authentication.Models;
     using System.Collections.Generic;
+
     internal static class GraphEnvironmentConstants
     {
         /// <summary>
diff --git a/src/Authentication/Authentication/Handlers/NationalCloudHandler.cs b/src/Authentication/Authentication/Handlers/NationalCloudHandler.cs
@@ -9,6 +9,9 @@ namespace Microsoft.Graph.PowerShell.Authentication.Handlers
     using System.Threading;
     using System.Threading.Tasks;
 
+    /// <summary>
+    /// A <see cref="DelegatingHandler"/> implementation that switches the base URL of a request based on the specified environment\cloud.
+    /// </summary>
     internal class NationalCloudHandler : DelegatingHandler
     {
         /// <summary>
diff --git a/src/Authentication/Authentication/Helpers/AuthenticationHelpers.cs b/src/Authentication/Authentication/Helpers/AuthenticationHelpers.cs
@@ -4,6 +4,7 @@
 namespace Microsoft.Graph.PowerShell.Authentication.Helpers
 {
     using Microsoft.Graph.Auth;
+    using Microsoft.Graph.PowerShell.Authentication.Models;
     using Microsoft.Graph.PowerShell.Authentication.TokenCache;
     using Microsoft.Identity.Client;
     using System;
diff --git a/src/Authentication/Authentication/Interfaces/IDataStore.cs b/src/Authentication/Authentication/Interfaces/IDataStore.cs
@@ -2,7 +2,7 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-namespace Microsoft.Graph.PowerShell.Authentication
+namespace Microsoft.Graph.PowerShell.Authentication.Interfaces
 {
     using System.IO;
     using System.Text;
diff --git a/src/Authentication/Authentication/Interfaces/IFileProvider.cs b/src/Authentication/Authentication/Interfaces/IFileProvider.cs
@@ -2,7 +2,7 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-namespace Microsoft.Graph.PowerShell.Authentication
+namespace Microsoft.Graph.PowerShell.Authentication.Interfaces
 {
     using System;
     using System.IO;
diff --git a/src/Authentication/Authentication/Interfaces/IGraphEnvironment.cs b/src/Authentication/Authentication/Interfaces/IGraphEnvironment.cs
@@ -2,7 +2,7 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-namespace Microsoft.Graph.PowerShell.Authentication
+namespace Microsoft.Graph.PowerShell.Authentication.Interfaces
 {
     public interface IGraphEnvironment
     {
diff --git a/src/Authentication/Authentication/Interfaces/IGraphSession.cs b/src/Authentication/Authentication/Interfaces/IGraphSession.cs
@@ -2,7 +2,7 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-namespace Microsoft.Graph.PowerShell.Authentication
+namespace Microsoft.Graph.PowerShell.Authentication.Interfaces
 {
     public interface IGraphSession
     {
diff --git a/src/Authentication/Authentication/Models/GraphEnvironment.cs b/src/Authentication/Authentication/Models/GraphEnvironment.cs
@@ -2,8 +2,9 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-namespace Microsoft.Graph.PowerShell.Authentication
+namespace Microsoft.Graph.PowerShell.Authentication.Models
 {
+    using Microsoft.Graph.PowerShell.Authentication.Interfaces;
     using System;
     using System.Collections.Concurrent;
     using System.Collections.Generic;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace Microsoft.Graph.Authentication.Test.Mocks`
`2`	`2`	`{`
`3`		`- using Microsoft.Graph.PowerShell.Authentication;`
	`3`	`+ using Microsoft.Graph.PowerShell.Authentication.Interfaces;`
`4`	`4`	`using System;`
`5`	`5`	`using System.Collections.Concurrent;`
`6`	`6`	`using System.Collections.Generic;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`namespace Microsoft.Graph.Authentication.Test.TokenCache`
`2`	`2`	`{`
`3`	`3`	`using Microsoft.Graph.PowerShell.Authentication;`
	`4`	`+ using Microsoft.Graph.PowerShell.Authentication.Common;`
`4`	`5`	`using Microsoft.Graph.PowerShell.Authentication.TokenCache;`
`5`	`6`	`using System;`
`6`	`7`	`using System.Text;`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`
`5`	`5`	`namespace Microsoft.Graph.PowerShell.Authentication.Cmdlets`
`6`	`6`	`{`
	`7`	`+ using Microsoft.Graph.PowerShell.Authentication.Common;`
	`8`	`+ using Microsoft.Graph.PowerShell.Authentication.Models;`
`7`	`9`	`using System.Management.Automation;`
`8`	`10`
`9`	`11`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,9 @@`
`4`	`4`
`5`	`5`	`namespace Microsoft.Graph.PowerShell.Authentication.Cmdlets`
`6`	`6`	`{`
	`7`	`+ using Microsoft.Graph.PowerShell.Authentication.Common;`
`7`	`8`	`using Microsoft.Graph.PowerShell.Authentication.Helpers;`
	`9`	`+ using Microsoft.Graph.PowerShell.Authentication.Models;`
`8`	`10`	`using System;`
`9`	`11`	`using System.Globalization;`
`10`	`12`	`using System.Linq;`