monor refactoring, added deployment file

Dmitriy Kozlov · Dmitriy Kozlov · commit ad59b5dac629 · 2020-05-07T14:46:20.000+03:00
diff --git a/.deployment b/.deployment
@@ -0,0 +1,2 @@
+[config]
+project = Dynamics365/BusinessCentral/Dynamics365.BusinessCentral.csproj
diff --git a/Dynamics365/BusinessCentral/Authorize.cs b/Dynamics365/BusinessCentral/Authorize.cs
@@ -23,11 +23,11 @@ namespace Plumsail.DataSource.Dynamics365.BusinessCentral
 {
     public class Authorize
     {
-        private AppSettings _settings;
+        private readonly AzureApp _settings;
 
         public Authorize(IOptions<AppSettings> settings)
         {
-            _settings = settings.Value;
+            _settings = settings.Value.AzureApp;
         }
 
         [FunctionName("Dynamics365-BusinessCentral-Authorize")]
@@ -43,9 +43,9 @@ public async Task<IActionResult> Run(
             {
                 var code = queryParams["code"];
 
-                var app = ConfidentialClientApplicationBuilder.Create(_settings.AzureApp.ClientId)
-                    .WithClientSecret(_settings.AzureApp.ClientSecret)
-                    .WithTenantId(_settings.AzureApp.Tenant)
+                var app = ConfidentialClientApplicationBuilder.Create(_settings.ClientId)
+                    .WithClientSecret(_settings.ClientSecret)
+                    .WithTenantId(_settings.Tenant)
                     .WithRedirectUri(currentUrl)
                     .Build();
 
@@ -57,8 +57,8 @@ public async Task<IActionResult> Run(
             }
 
             var url = new StringBuilder();
-            url.Append($"https://login.microsoftonline.com/{_settings.AzureApp.Tenant}/oauth2/v2.0/authorize?");
-            url.Append($"client_id={_settings.AzureApp.ClientId}&");
+            url.Append($"https://login.microsoftonline.com/{_settings.Tenant}/oauth2/v2.0/authorize?");
+            url.Append($"client_id={_settings.ClientId}&");
             url.Append($"response_type=code&");
             url.Append($"redirect_uri={WebUtility.UrlEncode(currentUrl)}&");
             url.Append($"response_mode=query&");
diff --git a/Dynamics365/BusinessCentral/Customers.cs b/Dynamics365/BusinessCentral/Customers.cs
@@ -23,8 +23,8 @@ namespace Plumsail.DataSource.Dynamics365.BusinessCentral
 {
     public class Customers
     {
-        private Settings.Customers _settings;
-        private GraphServiceClientProvider _graphProvider;
+        private readonly Settings.Customers _settings;
+        private readonly GraphServiceClientProvider _graphProvider;
 
         public Customers(IOptions<AppSettings> settings, GraphServiceClientProvider graphProvider)
         {
diff --git a/Dynamics365/BusinessCentral/GraphServiceClientProvider.cs b/Dynamics365/BusinessCentral/GraphServiceClientProvider.cs
@@ -13,7 +13,7 @@ namespace Plumsail.DataSource.Dynamics365.BusinessCentral
 {
     public class GraphServiceClientProvider
     {
-        private AzureApp _azureAppSettings;
+        private readonly AzureApp _azureAppSettings;
 
         public GraphServiceClientProvider(IOptions<AppSettings> settings)
         {
diff --git a/Dynamics365/BusinessCentral/Items.cs b/Dynamics365/BusinessCentral/Items.cs
@@ -23,8 +23,8 @@ namespace Plumsail.DataSource.Dynamics365.BusinessCentral
 {
     public class Items
     {
-        private Settings.Items _settings;
-        private GraphServiceClientProvider _graphProvider;
+        private readonly Settings.Items _settings;
+        private readonly GraphServiceClientProvider _graphProvider;
 
         public Items(IOptions<AppSettings> settings, GraphServiceClientProvider graphProvider)
         {
diff --git a/Dynamics365/BusinessCentral/Vendors.cs b/Dynamics365/BusinessCentral/Vendors.cs
@@ -23,8 +23,8 @@ namespace Plumsail.DataSource.Dynamics365.BusinessCentral
 {
     public class Vendors
     {
-        private Settings.Vendors _settings;
-        private GraphServiceClientProvider _graphProvider;
+        private readonly Settings.Vendors _settings;
+        private readonly GraphServiceClientProvider _graphProvider;
 
         public Vendors(IOptions<AppSettings> settings, GraphServiceClientProvider graphProvider)
         {
diff --git a/Plumsail.DataSource.sln b/Plumsail.DataSource.sln
@@ -7,6 +7,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharePoint", "SharePoint\Sh
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dynamics365.BusinessCentral", "Dynamics365\BusinessCentral\Dynamics365.BusinessCentral.csproj", "{B0CB2C8F-B264-4AA4-8CBE-35F32791E870}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionsApp", "FunctionsApp\FunctionsApp.csproj", "{EFCE1BCA-A1D8-46D5-8681-5D96C16FC760}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,6 +23,10 @@ Global
 		{B0CB2C8F-B264-4AA4-8CBE-35F32791E870}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B0CB2C8F-B264-4AA4-8CBE-35F32791E870}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B0CB2C8F-B264-4AA4-8CBE-35F32791E870}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EFCE1BCA-A1D8-46D5-8681-5D96C16FC760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EFCE1BCA-A1D8-46D5-8681-5D96C16FC760}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EFCE1BCA-A1D8-46D5-8681-5D96C16FC760}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EFCE1BCA-A1D8-46D5-8681-5D96C16FC760}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/SharePoint/GraphServiceClientProvider.cs b/SharePoint/GraphServiceClientProvider.cs
@@ -0,0 +1,35 @@
+﻿using Microsoft.Extensions.Options;
+using Microsoft.Graph;
+using Microsoft.Graph.Auth;
+using Microsoft.Identity.Client;
+using Plumsail.DataSource.SharePoint.Settings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Plumsail.DataSource.SharePoint
+{
+    public class GraphServiceClientProvider
+    {
+        private readonly AzureApp _azureAppSettings;
+
+        public GraphServiceClientProvider(IOptions<AppSettings> settings)
+        {
+            _azureAppSettings = settings.Value.AzureApp;
+        }
+
+        public GraphServiceClient Create()
+        {
+            var confidentialClientApplication = ConfidentialClientApplicationBuilder.Create(_azureAppSettings.ClientId)
+                .WithClientSecret(_azureAppSettings.ClientSecret)
+                .WithTenantId(_azureAppSettings.Tenant)
+                .Build();
+
+            var authProvider = new ClientCredentialProvider(confidentialClientApplication);
+            return new GraphServiceClient(authProvider);
+        }
+    }
+}
diff --git a/SharePoint/ListData.cs b/SharePoint/ListData.cs
@@ -19,11 +19,13 @@ namespace Plumsail.DataSource.SharePoint
 {
     public class ListData
     {
-        private Settings.AppSettings _settings;
+        private readonly Settings.ListData _settings;
+        private readonly GraphServiceClientProvider _graphProvider;
 
-        public ListData(IOptions<Settings.AppSettings> settings)
+        public ListData(IOptions<Settings.AppSettings> settings, GraphServiceClientProvider graphProvider)
         {
-            _settings = settings.Value;
+            _settings = settings.Value.ListData;
+            _graphProvider = graphProvider;
         }
 
         [FunctionName("SharePoint-ListData")]
@@ -33,14 +35,8 @@ public async Task<IActionResult> Run(
         {
             log.LogInformation("ListData is requested.");
 
-            var confidentialClientApplication = ConfidentialClientApplicationBuilder.Create(_settings.AzureApp.ClientId)
-                .WithClientSecret(_settings.AzureApp.ClientSecret)
-                .WithTenantId(_settings.AzureApp.Tenant)
-                .Build();
-
-            var authProvider = new ClientCredentialProvider(confidentialClientApplication);
-            var graph = new GraphServiceClient(authProvider);
-            var list = await graph.GetListAsync(_settings.ListData.SiteUrl, _settings.ListData.ListName);
+            var graph = _graphProvider.Create();
+            var list = await graph.GetListAsync(_settings.SiteUrl, _settings.ListName);
 
             var queryOptions = new List<QueryOption>()
             {
diff --git a/SharePoint/SharePoint.csproj b/SharePoint/SharePoint.csproj
@@ -4,6 +4,7 @@
     <AzureFunctionsVersion>v3</AzureFunctionsVersion>
     <AssemblyName>Plumsail.DataSource.SharePoint</AssemblyName>
     <RootNamespace>Plumsail.DataSource.SharePoint</RootNamespace>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.0.0" />
diff --git a/SharePoint/Startup.cs b/SharePoint/Startup.cs
@@ -18,6 +18,7 @@ public override void Configure(IFunctionsHostBuilder builder)
               .Build();
 
             builder.Services.Configure<AppSettings>(configuration.GetSection("SharePoint"));
+            builder.Services.AddTransient<GraphServiceClientProvider>();
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[config]`
	`2`	`+project = Dynamics365/BusinessCentral/Dynamics365.BusinessCentral.csproj`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,11 @@ namespace Plumsail.DataSource.Dynamics365.BusinessCentral`
`23`	`23`	`{`
`24`	`24`	`public class Authorize`
`25`	`25`	`{`
`26`		`- private AppSettings _settings;`
	`26`	`+ private readonly AzureApp _settings;`
`27`	`27`
`28`	`28`	`public Authorize(IOptions<AppSettings> settings)`
`29`	`29`	`{`
`30`		`- _settings = settings.Value;`
	`30`	`+ _settings = settings.Value.AzureApp;`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`[FunctionName("Dynamics365-BusinessCentral-Authorize")]`
`@@ -43,9 +43,9 @@ public async Task<IActionResult> Run(`
`43`	`43`	`{`
`44`	`44`	`var code = queryParams["code"];`
`45`	`45`
`46`		`- var app = ConfidentialClientApplicationBuilder.Create(_settings.AzureApp.ClientId)`
`47`		`- .WithClientSecret(_settings.AzureApp.ClientSecret)`
`48`		`- .WithTenantId(_settings.AzureApp.Tenant)`
	`46`	`+ var app = ConfidentialClientApplicationBuilder.Create(_settings.ClientId)`
	`47`	`+ .WithClientSecret(_settings.ClientSecret)`
	`48`	`+ .WithTenantId(_settings.Tenant)`
`49`	`49`	`.WithRedirectUri(currentUrl)`
`50`	`50`	`.Build();`
`51`	`51`
`@@ -57,8 +57,8 @@ public async Task<IActionResult> Run(`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`var url = new StringBuilder();`
`60`		`- url.Append($"https://login.microsoftonline.com/{_settings.AzureApp.Tenant}/oauth2/v2.0/authorize?");`
`61`		`- url.Append($"client_id={_settings.AzureApp.ClientId}&");`
	`60`	`+ url.Append($"https://login.microsoftonline.com/{_settings.Tenant}/oauth2/v2.0/authorize?");`
	`61`	`+ url.Append($"client_id={_settings.ClientId}&");`
`62`	`62`	`url.Append($"response_type=code&");`
`63`	`63`	`url.Append($"redirect_uri={WebUtility.UrlEncode(currentUrl)}&");`
`64`	`64`	`url.Append($"response_mode=query&");`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ namespace Plumsail.DataSource.Dynamics365.BusinessCentral`
`23`	`23`	`{`
`24`	`24`	`public class Customers`
`25`	`25`	`{`
`26`		`- private Settings.Customers _settings;`
`27`		`- private GraphServiceClientProvider _graphProvider;`
	`26`	`+ private readonly Settings.Customers _settings;`
	`27`	`+ private readonly GraphServiceClientProvider _graphProvider;`
`28`	`28`
`29`	`29`	`public Customers(IOptions<AppSettings> settings, GraphServiceClientProvider graphProvider)`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace Plumsail.DataSource.Dynamics365.BusinessCentral`
`13`	`13`	`{`
`14`	`14`	`public class GraphServiceClientProvider`
`15`	`15`	`{`
`16`		`- private AzureApp _azureAppSettings;`
	`16`	`+ private readonly AzureApp _azureAppSettings;`
`17`	`17`
`18`	`18`	`public GraphServiceClientProvider(IOptions<AppSettings> settings)`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,13 @@ namespace Plumsail.DataSource.SharePoint`
`19`	`19`	`{`
`20`	`20`	`public class ListData`
`21`	`21`	`{`
`22`		`- private Settings.AppSettings _settings;`
	`22`	`+ private readonly Settings.ListData _settings;`
	`23`	`+ private readonly GraphServiceClientProvider _graphProvider;`
`23`	`24`
`24`		`- public ListData(IOptions<Settings.AppSettings> settings)`
	`25`	`+ public ListData(IOptions<Settings.AppSettings> settings, GraphServiceClientProvider graphProvider)`
`25`	`26`	`{`
`26`		`- _settings = settings.Value;`
	`27`	`+ _settings = settings.Value.ListData;`
	`28`	`+ _graphProvider = graphProvider;`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`[FunctionName("SharePoint-ListData")]`
`@@ -33,14 +35,8 @@ public async Task<IActionResult> Run(`
`33`	`35`	`{`
`34`	`36`	`log.LogInformation("ListData is requested.");`
`35`	`37`
`36`		`- var confidentialClientApplication = ConfidentialClientApplicationBuilder.Create(_settings.AzureApp.ClientId)`
`37`		`- .WithClientSecret(_settings.AzureApp.ClientSecret)`
`38`		`- .WithTenantId(_settings.AzureApp.Tenant)`
`39`		`- .Build();`
`40`		`-`
`41`		`- var authProvider = new ClientCredentialProvider(confidentialClientApplication);`
`42`		`- var graph = new GraphServiceClient(authProvider);`
`43`		`- var list = await graph.GetListAsync(_settings.ListData.SiteUrl, _settings.ListData.ListName);`
	`38`	`+ var graph = _graphProvider.Create();`
	`39`	`+ var list = await graph.GetListAsync(_settings.SiteUrl, _settings.ListName);`
`44`	`40`
`45`	`41`	`var queryOptions = new List<QueryOption>()`
`46`	`42`	`{`