Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add graph & api call to worker2 #901

Merged
merged 10 commits into from
Jan 25, 2021
Merged

Add graph & api call to worker2 #901

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e1e4629
initial commit to add graph & api call to worker2
jennyf19 Jan 22, 2021
385f4dd
remove renamed file
jennyf19 Jan 22, 2021
f2b66f7
more updates to worker2
jennyf19 Jan 22, 2021
f0cd658
update test templates
jennyf19 Jan 22, 2021
1a23fb0
fix usings
jennyf19 Jan 22, 2021
140ef1f
one more using
jennyf19 Jan 22, 2021
324a140
move api calls to greeterService
jennyf19 Jan 23, 2021
a554be3
fix variable name
jennyf19 Jan 23, 2021
df422ca
remove space
jennyf19 Jan 25, 2021
ddf92fb
fix helloReply
jennyf19 Jan 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion ProjectTemplates/templates/Worker-CSharp/.template.config/dotnetcli.host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,19 @@
"shortName": ""
},
"ExcludeLaunchSettings": {
"longName": "exclude-launch-settings",
"longName": "exclude-launch-settings",
"shortName": ""
},
"CalledApiUrl": {
"longName": "called-api-url",
"shortName": ""
},
"CalledApiScopes": {
"longName": "called-api-scopes",
"shortName": ""
},
"CallsMicrosoftGraph": {
"longName": "calls-graph",
"shortName": ""
}
},
Expand Down
35 changes: 33 additions & 2 deletions ProjectTemplates/templates/Worker-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,41 @@
}
},
"skipRestore": {
"type": "parameter",
"datatype": "bool",
"description": "If specified, skips the automatic restore of the project on create.",
"defaultValue": "false"
},
"CalledApiUrl": {
"type": "parameter",
"datatype": "string",
"replaces": "[WebApiUrl]",
"defaultValue": "https://graph.microsoft.com/v1.0",
"description": "URL of the API to call from the web app. This option only applies if --auth SingleOrg or --auth IndividualB2C is specified."
},
"CallsMicrosoftGraph": {
"type": "parameter",
"datatype": "bool",
"description": "If specified, skips the automatic restore of the project on create.",
"defaultValue": "false"
"defaultValue": "false",
"description": "Specifies if the web app calls Microsoft Graph. This option only applies if --auth SingleOrg is specified."
},
"CalledApiScopes": {
"type": "parameter",
"datatype": "string",
"replaces": "user.read",
"description": "Scopes to request to call the API from the web app. This option only applies if --auth SingleOrg or --auth IndividualB2C is specified."
},
"GenerateApi": {
"type": "computed",
"value": "((IndividualB2CAuth || OrganizationalAuth) && (CalledApiUrl != \"https://graph.microsoft.com/v1.0\" || CalledApiScopes != \"user.read\"))"
},
"GenerateGraph": {
"type": "computed",
"value": "(OrganizationalAuth && CallsMicrosoftGraph)"
},
"GenerateApiOrGraph": {
"type": "computed",
"value": "(GenerateApi || GenerateGraph)"
}
},
"primaryOutputs": [
Expand Down
4 changes: 3 additions & 1 deletion ProjectTemplates/templates/Worker-CSharp/Company.Application1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@

<ItemGroup>
<PackageReference Include="Grpc.AspNetCore" Version="2.32.0" />
<!--<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.0-0" />-->
<PackageReference Include="Microsoft.Identity.Web" Version="1.*" />
<!--#if (GenerateGraph) -->
jennyf19 marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="1.*" />
<!--#endif -->
</ItemGroup>
</Project>
27 changes: 23 additions & 4 deletions ProjectTemplates/templates/Worker-CSharp/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.AspNetCore.Http;
#if (GenerateGraph)
using Microsoft.Graph;
#endif

namespace Company.Application1
{
Expand All @@ -28,15 +31,31 @@ public void ConfigureServices(IServiceCollection services)

#if (OrganizationalAuth)
services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
#if (GenerateApiOrGraph)
jennyf19 marked this conversation as resolved.
Show resolved Hide resolved
.AddMicrosoftIdentityWebApi(Configuration.GetSection("AzureAd"))
.EnableTokenAcquisitionToCallDownstreamApi()
jennyf19 marked this conversation as resolved.
Show resolved Hide resolved
#if (GenerateApi)
.AddDownstreamWebApi("DownstreamApi", Configuration.GetSection("DownstreamApi"))
#endif
#if (GenerateGraph)
.AddMicrosoftGraph(Configuration.GetSection("DownstreamApi"))
#endif
.AddInMemoryTokenCaches();
#else
.AddMicrosoftIdentityWebApi(Configuration.GetSection("AzureAd"));

services.AddAuthorization();
#endif
#elif (IndividualB2CAuth)
services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
#if (GenerateApi)
.AddMicrosoftIdentityWebApi(Configuration.GetSection("AzureAdB2C"))
.EnableTokenAcquisitionToCallDownstreamApi()
.AddDownstreamWebApi("DownstreamApi", Configuration.GetSection("DownstreamApi"))
.AddInMemoryTokenCaches();
#else
.AddMicrosoftIdentityWebApi(Configuration.GetSection("AzureAdB2C"));

services.AddAuthorization();
#endif
#endif
services.AddAuthorization();
}

// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
Expand Down
83 changes: 83 additions & 0 deletions ProjectTemplates/templates/Worker-CSharp/Worker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,110 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
#if (!NoAuth)
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
#endif
#if (GenerateApi)
using Microsoft.Extensions.Configuration;
using Microsoft.Identity.Web;
using System.Net;
using System.Net.Http;
#endif
#if (GenerateGraph)
using Microsoft.Graph;
#endif
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
#if (OrganizationalAuth || IndividualB2CAuth)
using Microsoft.Identity.Web.Resource;
#endif

namespace Company.Application1
{
public class Worker : BackgroundService
{
private readonly ILogger<Worker> _logger;

#if (!NoAuth)
// The web API will only accept tokens 1) for users, and 2) having the "api-scope" scope for this API
static readonly string[] scopeRequiredByApi = new string[] { "api-scope" };
#endif


#if (GenerateApi)
private readonly IDownstreamWebApi _downstreamWebApi;

public Worker(ILogger<Worker> logger,
IDownstreamWebApi downstreamWebApi)
{
_logger = logger;
_downstreamWebApi = downstreamWebApi;
}

protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
HttpContext.VerifyUserHasAnyAcceptedScope(scopeRequiredByApi);

while (!stoppingToken.IsCancellationRequested)
{
_logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
await Task.Delay(1000, stoppingToken);
}

using var response = await _downstreamWebApi.CallWebApiForUserAsync("DownstreamApi").ConfigureAwait(false);
if (response.StatusCode == System.Net.HttpStatusCode.OK)
{
var apiResult = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
// Do something
}
else
{
var error = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
throw new HttpRequestException($"Invalid status code in the HttpResponseMessage: {response.StatusCode}: {error}");
}
}

#elseif (GenerateGraph)
private readonly GraphServiceClient _graphServiceClient;

public Worker(ILogger<Worker> logger,
GraphServiceClient graphServiceClient)
{
_logger = logger;
_graphServiceClient = graphServiceClient;
}

protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
HttpContext.VerifyUserHasAnyAcceptedScope(scopeRequiredByApi);

while (!stoppingToken.IsCancellationRequested)
{
_logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
await Task.Delay(1000, stoppingToken);
}

var user = await _graphServiceClient.Me.Request().GetAsync();
}

#else
public Worker(ILogger<Worker> logger)
{
_logger = logger;
}

protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
#if (!NoAuth)
HttpContext.VerifyUserHasAnyAcceptedScope(scopeRequiredByApi);
#endif
while (!stoppingToken.IsCancellationRequested)
{
_logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
await Task.Delay(1000, stoppingToken);
}
}
#endif
}
}
15 changes: 15 additions & 0 deletions ProjectTemplates/test-templates-from-nuget.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,21 @@ cd worker2-b2c
dotnet new worker2 --auth IndividualB2C
dotnet sln ..\..\tests.sln add worker2-b2c.csproj
cd ..

echo "Test worker2, single-org, calling microsoft graph"
mkdir worker2-singleorg-callsgraph
cd worker2-singleorg-callsgraph
dotnet new worker2 --auth SingleOrg --calls-graph
dotnet sln ..\..\tests.sln add worker2-singleorg-callsgraph.csproj
cd ..

echo "Test worker2, single-org, calling a downstream web api"
mkdir worker2-singleorg-callswebapi
cd worker2-singleorg-callswebapi
dotnet new worker2 --auth SingleOrg --called-api-url "https://graph.microsoft.com/beta/me" --called-api-scopes "user.read"
dotnet sln ..\..\tests.sln add worker2-singleorg-callswebapi.csproj
cd ..

cd ..

echo "Configure the applications"
Expand Down
14 changes: 14 additions & 0 deletions ProjectTemplates/test-templates.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,20 @@ dotnet new worker2 --auth IndividualB2C
dotnet sln ..\..\tests.sln add worker2-b2c.csproj
cd ..

echo "Test worker2, single-org, calling microsoft graph"
mkdir worker2-singleorg-callsgraph
cd worker2-singleorg-callsgraph
dotnet new worker2 --auth SingleOrg --calls-graph
dotnet sln ..\..\tests.sln add worker2-singleorg-callsgraph.csproj
cd ..

echo "Test worker2, single-org, calling a downstream web api"
mkdir worker2-singleorg-callswebapi
cd worker2-singleorg-callswebapi
dotnet new worker2 --auth SingleOrg --called-api-url "https://graph.microsoft.com/beta/me" --called-api-scopes "user.read"
dotnet sln ..\..\tests.sln add worker2-singleorg-callswebapi.csproj
cd ..

cd ..

echo "Configure the applications"
Expand Down