Version 1.1

Author: gsimardnet

.gitignore

@@ -265,3 +265,4 @@ __pycache__/
 /Engine/lib/Microsoft.Mashup.OAuth.dll
 /Engine/lib/Microsoft.Data.Mashup.dll
 /Engine/lib/Microsoft.ApplicationInsights.dll
+/.doc

Client/CredentialOData.cs

@@ -15,5 +15,15 @@ public class CredentialOData : Credential
         /// URL address of the resource
         /// </summary>
         public string Url { get; set; }
+
+        /// <summary>
+        /// Username value
+        /// </summary>
+        public string Username { get; set; }
+
+        /// <summary>
+        /// Password value
+        /// </summary>
+        public string Password { get; set; }
     }
 }

Engine/CommandCredentials.cs

@@ -65,12 +65,19 @@ public void SetCredentialSQL(string sql, string userName, string password)
             return;
         }
 
-        public void SetCredentialOData(string url)
+        public void SetCredentialOData(string url, string userName, string password)
         {
             DataSource dataSource = new DataSource("OData", url);
-            DataSourceSetting dataSourceSetting = new DataSourceSetting("Anonymous");
-
-            CredentialStore.SetCredential(dataSource, dataSourceSetting, null);
+            if (userName == null)
+            {
+                DataSourceSetting dataSourceSetting = new DataSourceSetting("Anonymous");
+                CredentialStore.SetCredential(dataSource, dataSourceSetting, null);
+            }
+            else
+            {
+                var dataSourceSetting = DataSourceSetting.CreateUsernamePasswordCredential(userName, password);
+                CredentialStore.SetCredential(dataSource, dataSourceSetting, null);
+            }
 
             return;
         }

PowerQueryNet.sln

@@ -13,6 +13,8 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup", "Setup\Setup.wixpro
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Setup.Actions", "Setup.Actions\Setup.Actions.csproj", "{C4521615-F8A1-4021-90C4-A2B85EB09703}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PQNet", "PQNet\PQNet.csproj", "{91D3B517-685E-4806-A17F-5589CFF21E29}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -58,6 +60,14 @@ Global
 		{C4521615-F8A1-4021-90C4-A2B85EB09703}.Release|Any CPU.ActiveCfg = Release|x86
 		{C4521615-F8A1-4021-90C4-A2B85EB09703}.Release|x86.ActiveCfg = Release|x86
 		{C4521615-F8A1-4021-90C4-A2B85EB09703}.Release|x86.Build.0 = Release|x86
+		{91D3B517-685E-4806-A17F-5589CFF21E29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91D3B517-685E-4806-A17F-5589CFF21E29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91D3B517-685E-4806-A17F-5589CFF21E29}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{91D3B517-685E-4806-A17F-5589CFF21E29}.Debug|x86.Build.0 = Debug|Any CPU
+		{91D3B517-685E-4806-A17F-5589CFF21E29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91D3B517-685E-4806-A17F-5589CFF21E29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91D3B517-685E-4806-A17F-5589CFF21E29}.Release|x86.ActiveCfg = Release|Any CPU
+		{91D3B517-685E-4806-A17F-5589CFF21E29}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Service/PowerQueryService.cs

@@ -163,6 +163,8 @@ public ExecuteResponse Execute(ExecuteRequest executeRequest)
                             commandCredentials.SetCredentialWeb(credentialWeb.Url);
                         else if (credential is CredentialSQL credentialSQL)
                             commandCredentials.SetCredentialSQL(credentialSQL.SQL, credentialSQL.Username, credentialSQL.Password);
+                        else if (credential is CredentialOData credentialOData)
+                            commandCredentials.SetCredentialOData(((CredentialOData)credential).Url, credentialOData.Username, credentialOData.Password);
                         else
                             throw new NotImplementedException("This Credential kind is not supported for now.");
                     }