ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix deprecation warnings

Browse Source
This commit is contained in:
Rafsanul Hasan 2019-04-04 10:08:49 +06:00
parent 5c60b6ace7
commit a846f041cd
No known key found for this signature in database
GPG Key ID: 4BBF45E04D0AD72B
7 changed files with 156 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs
View File

@ -1,33 +1,37 @@
namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Filters namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Filters
{ {
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Swashbuckle.AspNetCore.Swagger; using Swashbuckle.AspNetCore.Swagger;
using Swashbuckle.AspNetCore.SwaggerGen; using Swashbuckle.AspNetCore.SwaggerGen;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
namespace Basket.API.Infrastructure.Filters namespace Basket.API.Infrastructure.Filters
{ {
public class AuthorizeCheckOperationFilter : IOperationFilter public class AuthorizeCheckOperationFilter : IOperationFilter
{ {
public void Apply(Operation operation, OperationFilterContext context) public void Apply(Operation operation, OperationFilterContext context)
{ {
// Check for authorize attribute // Check for authorize attribute
var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() ||
context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any();
if (hasAuthorize) var hasAuthorize = context.MethodInfo.DeclaringType.GetCustomAttributes(true)
{ .Union(context.MethodInfo.GetCustomAttributes(true))
operation.Responses.Add("401", new Response { Description = "Unauthorized" }); .OfType<AuthorizeAttribute>().Any();
operation.Responses.Add("403", new Response { Description = "Forbidden" });
operation.Security = new List<IDictionary<string, IEnumerable<string>>>(); if (hasAuthorize)
operation.Security.Add(new Dictionary<string, IEnumerable<string>> {
{ operation.Responses.Add("401", new Response { Description = "Unauthorized" });
{ "oauth2", new [] { "Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator" } } operation.Responses.Add("403", new Response { Description = "Forbidden" });
});
} operation.Security = new List<IDictionary<string, IEnumerable<string>>>
} {
} new Dictionary<string, IEnumerable<string>>
} {
{ "oauth2", new [] { "Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator" } }
}
};
}
}
}
}
} }

58
src/ApiGateways/Web.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs
View File

@ -1,33 +1,37 @@
namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Filters namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Filters
{ {
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Swashbuckle.AspNetCore.Swagger; using Swashbuckle.AspNetCore.Swagger;
using Swashbuckle.AspNetCore.SwaggerGen; using Swashbuckle.AspNetCore.SwaggerGen;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
namespace Basket.API.Infrastructure.Filters namespace Basket.API.Infrastructure.Filters
{ {
public class AuthorizeCheckOperationFilter : IOperationFilter public class AuthorizeCheckOperationFilter : IOperationFilter
{ {
public void Apply(Operation operation, OperationFilterContext context) public void Apply(Operation operation, OperationFilterContext context)
{ {
// Check for authorize attribute // Check for authorize attribute
var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() ||
context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any();
if (hasAuthorize) var hasAuthorize = context.MethodInfo.DeclaringType.GetCustomAttributes(true)
{ .Union(context.MethodInfo.GetCustomAttributes(true))
operation.Responses.Add("401", new Response { Description = "Unauthorized" }); .OfType<AuthorizeAttribute>().Any();
operation.Responses.Add("403", new Response { Description = "Forbidden" });
operation.Security = new List<IDictionary<string, IEnumerable<string>>>(); if (hasAuthorize)
operation.Security.Add(new Dictionary<string, IEnumerable<string>> {
{ operation.Responses.Add("401", new Response { Description = "Unauthorized" });
{ "oauth2", new [] { "Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator" } } operation.Responses.Add("403", new Response { Description = "Forbidden" });
});
} operation.Security = new List<IDictionary<string, IEnumerable<string>>>
} {
} new Dictionary<string, IEnumerable<string>>
} {
{ "oauth2", new [] { "Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator" } }
}
};
}
}
}
}
} }

7
src/Services/Basket/Basket.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
View File

@ -10,9 +10,10 @@ namespace Basket.API.Infrastructure.Filters
{ {
public void Apply(Operation operation, OperationFilterContext context) public void Apply(Operation operation, OperationFilterContext context)
{ {
// Check for authorize attribute // Check for authorize attribute
var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() || var hasAuthorize = context.MethodInfo.DeclaringType.GetCustomAttributes(true)
context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any(); .Union(context.MethodInfo.GetCustomAttributes(true))
.OfType<AuthorizeAttribute>().Any();
if (hasAuthorize) if (hasAuthorize)
{ {

41
src/Services/Location/Locations.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
View File

@ -7,25 +7,28 @@ using System.Linq;
namespace Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Filters namespace Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Filters
{ {
internal class AuthorizeCheckOperationFilter : IOperationFilter internal class AuthorizeCheckOperationFilter : IOperationFilter
{ {
public void Apply(Operation operation, OperationFilterContext context) public void Apply(Operation operation, OperationFilterContext context)
{ {
// Check for authorize attribute // Check for authorize attribute
var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() || var hasAuthorize = context.MethodInfo.DeclaringType.GetCustomAttributes(true)
context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any(); .Union(context.MethodInfo.GetCustomAttributes(true))
.OfType<AuthorizeAttribute>().Any();
if (hasAuthorize) if (hasAuthorize)
{ {
operation.Responses.Add("401", new Response { Description = "Unauthorized" }); operation.Responses.Add("401", new Response { Description = "Unauthorized" });
operation.Responses.Add("403", new Response { Description = "Forbidden" }); operation.Responses.Add("403", new Response { Description = "Forbidden" });
operation.Security = new List<IDictionary<string, IEnumerable<string>>>(); operation.Security = new List<IDictionary<string, IEnumerable<string>>>
operation.Security.Add(new Dictionary<string, IEnumerable<string>> {
{ new Dictionary<string, IEnumerable<string>>
{ "oauth2", new [] { "locationsapi" } } {
}); { "oauth2", new [] { "locationsapi" } }
} }
} };
} }
}
}
} }

43
src/Services/Marketing/Marketing.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
View File

@ -6,27 +6,28 @@ using System.Linq;
namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.Filters namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.Filters
{ {
public class AuthorizeCheckOperationFilter : IOperationFilter public class AuthorizeCheckOperationFilter : IOperationFilter
{ {
public void Apply(Operation operation, OperationFilterContext context) public void Apply(Operation operation, OperationFilterContext context)
{ {
// Check for authorize attribute // Check for authorize attribute
var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() || var hasAuthorize = context.MethodInfo.DeclaringType.GetCustomAttributes(true)
context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any(); .Union(context.MethodInfo.GetCustomAttributes(true))
.OfType<AuthorizeAttribute>().Any();
if (hasAuthorize) if (hasAuthorize)
{ {
operation.Responses.Add("401", new Response { Description = "Unauthorized" }); operation.Responses.Add("401", new Response { Description = "Unauthorized" });
operation.Responses.Add("403", new Response { Description = "Forbidden" }); operation.Responses.Add("403", new Response { Description = "Forbidden" });
operation.Security = new List<IDictionary<string, IEnumerable<string>>> operation.Security = new List<IDictionary<string, IEnumerable<string>>>
{ {
new Dictionary<string, IEnumerable<string>> new Dictionary<string, IEnumerable<string>>
{ {
{ "oauth2", new [] { "marketingapi" } } { "oauth2", new [] { "marketingapi" } }
} }
}; };
} }
} }
} }
} }

44
src/Services/Ordering/Ordering.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
View File

@ -1,32 +1,34 @@
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Swashbuckle.AspNetCore.Swagger; using Swashbuckle.AspNetCore.Swagger;
using Swashbuckle.AspNetCore.SwaggerGen; using Swashbuckle.AspNetCore.SwaggerGen;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
namespace Ordering.API.Infrastructure.Filters namespace Ordering.API.Infrastructure.Filters
{ {
public class AuthorizeCheckOperationFilter : IOperationFilter public class AuthorizeCheckOperationFilter : IOperationFilter
{ {
public void Apply(Operation operation, OperationFilterContext context) public void Apply(Operation operation, OperationFilterContext context)
{ {
// Check for authorize attribute // Check for authorize attribute
var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() ||
context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any();
if (hasAuthorize) var hasAuthorize = context.MethodInfo.DeclaringType.GetCustomAttributes(true)
{ .Union(context.MethodInfo.GetCustomAttributes(true))
operation.Responses.Add("401", new Response { Description = "Unauthorized" }); .OfType<AuthorizeAttribute>().Any();
operation.Responses.Add("403", new Response { Description = "Forbidden" });
operation.Security = new List<IDictionary<string, IEnumerable<string>>>(); if (hasAuthorize)
operation.Security.Add(new Dictionary<string, IEnumerable<string>> {
{ operation.Responses.Add("401", new Response { Description = "Unauthorized" });
{ "oauth2", new [] { "orderingapi" } } operation.Responses.Add("403", new Response { Description = "Forbidden" });
});
} operation.Security = new List<IDictionary<string, IEnumerable<string>>>
} {
} new Dictionary<string, IEnumerable<string>>
{
{ "oauth2", new [] { "orderingapi" } }
}
};
}
}
}
} }

44
src/Services/Webhooks/Webhooks.API/Infrastructure/AuthorizeCheckOperationFilter.cs
View File

@ -1,32 +1,34 @@
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Swashbuckle.AspNetCore.Swagger; using Swashbuckle.AspNetCore.Swagger;
using Swashbuckle.AspNetCore.SwaggerGen; using Swashbuckle.AspNetCore.SwaggerGen;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
namespace Webhooks.API.Infrastructure namespace Webhooks.API.Infrastructure
{ {
public class AuthorizeCheckOperationFilter : IOperationFilter public class AuthorizeCheckOperationFilter : IOperationFilter
{ {
public void Apply(Operation operation, OperationFilterContext context) public void Apply(Operation operation, OperationFilterContext context)
{ {
// Check for authorize attribute // Check for authorize attribute
var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() ||
context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any();
if (hasAuthorize) var hasAuthorize = context.MethodInfo.DeclaringType.GetCustomAttributes(true)
{ .Union(context.MethodInfo.GetCustomAttributes(true))
operation.Responses.Add("401", new Response { Description = "Unauthorized" }); .OfType<AuthorizeAttribute>().Any();
operation.Responses.Add("403", new Response { Description = "Forbidden" });
operation.Security = new List<IDictionary<string, IEnumerable<string>>>(); if (hasAuthorize)
operation.Security.Add(new Dictionary<string, IEnumerable<string>> {
{ operation.Responses.Add("401", new Response { Description = "Unauthorized" });
{ "oauth2", new [] { "webhooksapi" } } operation.Responses.Add("403", new Response { Description = "Forbidden" });
});
} operation.Security = new List<IDictionary<string, IEnumerable<string>>>
} {
} new Dictionary<string, IEnumerable<string>>
{
{ "oauth2", new [] { "webhooksapi" } }
}
};
}
}
}
} }