features/role-updates #18
@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authentication.JwtBearer;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Newsbot.Collector.Api.Domain;
|
||||
using Newsbot.Collector.Api.Domain.Consts;
|
||||
using Newsbot.Collector.Domain.Models.Config;
|
||||
using Newsbot.Collector.Services.Jobs;
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Newsbot.Collector.Api.Domain;
|
||||
using Newsbot.Collector.Api.Domain.Consts;
|
||||
using Newsbot.Collector.Domain.Requests;
|
||||
using Newsbot.Collector.Domain.Response;
|
||||
using Newsbot.Collector.Domain.Results;
|
||||
|
@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authentication.JwtBearer;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Newsbot.Collector.Api.Domain;
|
||||
using Newsbot.Collector.Api.Domain.Consts;
|
||||
using Newsbot.Collector.Domain.Models.Config;
|
||||
using Newsbot.Collector.Domain.Models.Config.Sources;
|
||||
using Newsbot.Collector.Services.Jobs;
|
||||
|
@ -1,17 +1,14 @@
|
||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Newsbot.Collector.Api.Domain;
|
||||
using Newsbot.Collector.Database.Repositories;
|
||||
using Newsbot.Collector.Api.Domain.Consts;
|
||||
using Newsbot.Collector.Domain.Consts;
|
||||
using Newsbot.Collector.Domain.Dto;
|
||||
using Newsbot.Collector.Domain.Entities;
|
||||
using Newsbot.Collector.Domain.Interfaces;
|
||||
using Newsbot.Collector.Domain.Models;
|
||||
using Newsbot.Collector.Services.HtmlParser;
|
||||
|
||||
namespace Newsbot.Collector.Api.Controllers;
|
||||
namespace Newsbot.Collector.Api.Controllers.v1;
|
||||
|
||||
[ApiController]
|
||||
[Route("api/sources")]
|
||||
|
@ -3,11 +3,10 @@ using Microsoft.AspNetCore.Authentication.JwtBearer;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Newsbot.Collector.Api.Domain;
|
||||
using Newsbot.Collector.Api.Domain.Consts;
|
||||
using Newsbot.Collector.Domain.Models.Config;
|
||||
using Newsbot.Collector.Domain.Models.Config.Sources;
|
||||
using Newsbot.Collector.Services.Jobs;
|
||||
using ILogger = Grpc.Core.Logging.ILogger;
|
||||
|
||||
namespace Newsbot.Collector.Api.Controllers.v1;
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Newsbot.Collector.Api.Domain;
|
||||
using Newsbot.Collector.Api.Domain.Consts;
|
||||
using Newsbot.Collector.Database;
|
||||
using Newsbot.Collector.Database.Repositories;
|
||||
using Newsbot.Collector.Domain.Interfaces;
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text;
|
||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
||||
using Microsoft.IdentityModel.Tokens;
|
||||
using Newsbot.Collector.Api.Domain;
|
||||
using Newsbot.Collector.Api.Domain.Consts;
|
||||
using Newsbot.Collector.Domain.Models.Config;
|
||||
|
||||
namespace Newsbot.Collector.Api.Startup;
|
||||
@ -44,7 +44,9 @@ public static class IdentityStartup
|
||||
services.AddAuthorization(options =>
|
||||
{
|
||||
options.AddPolicy(Authorization.AdministratorPolicy,
|
||||
b => b.RequireClaim(Authorization.AdministratorClaim, "true"));
|
||||
b => b.RequireRole(Authorization.AdministratorsRole, "true"));
|
||||
options.AddPolicy(Authorization.UserPolicy,
|
||||
b => b.RequireRole(Authorization.UsersRole, "true"));
|
||||
});
|
||||
}
|
||||
}
|
@ -1,17 +1,13 @@
|
||||
using System.Data;
|
||||
using Dapper;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Newsbot.Collector.Domain.Entities;
|
||||
using Newsbot.Collector.Domain.Interfaces;
|
||||
using Newsbot.Collector.Domain.Models;
|
||||
using Npgsql;
|
||||
|
||||
namespace Newsbot.Collector.Database.Repositories;
|
||||
|
||||
public class SourcesTable : ISourcesRepository
|
||||
{
|
||||
//private readonly string _connectionString;
|
||||
private DatabaseContext _context;
|
||||
private readonly DatabaseContext _context;
|
||||
|
||||
public SourcesTable(string connectionString)
|
||||
{
|
||||
@ -114,6 +110,14 @@ public class SourcesTable : ISourcesRepository
|
||||
return res;
|
||||
}
|
||||
|
||||
public async Task<int> TotalByTypeAsync(string type)
|
||||
{
|
||||
var res = await _context.Sources
|
||||
.Where(f => f.Type == type )
|
||||
.CountAsync();
|
||||
return res;
|
||||
}
|
||||
|
||||
public int Disable(Guid id)
|
||||
{
|
||||
//using var context = new DatabaseContext(_connectionString);
|
||||
|
@ -1,12 +1,13 @@
|
||||
namespace Newsbot.Collector.Api.Domain;
|
||||
namespace Newsbot.Collector.Api.Domain.Consts;
|
||||
|
||||
public static class Authorization
|
||||
{
|
||||
public const string AdministratorPolicy = "Administrator";
|
||||
public const string AdministratorsRole = AdministratorPolicy;
|
||||
public const string AdministratorClaim = "administrator";
|
||||
|
||||
public const string AdministratorsRole = AdministratorPolicy;
|
||||
|
||||
public const string UserPolicy = "User";
|
||||
public const string UsersRole = UserPolicy;
|
||||
public const string UserClaim = "user";
|
||||
}
|
@ -14,6 +14,7 @@ public interface ISourcesRepository
|
||||
public List<SourceEntity> List(int page, int count);
|
||||
public List<SourceEntity> ListBySource(string source,int page, int limit);
|
||||
public List<SourceEntity> ListByType(string type,int page, int limit = 25);
|
||||
public Task<int> TotalByTypeAsync(string type);
|
||||
public int Disable(Guid id);
|
||||
public int Enable(Guid id);
|
||||
public void Delete(Guid id);
|
||||
|
@ -3,6 +3,7 @@ using System.Security.Claims;
|
||||
using System.Text;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.IdentityModel.Tokens;
|
||||
using Newsbot.Collector.Api.Domain.Consts;
|
||||
using Newsbot.Collector.Domain.Results;
|
||||
using Newsbot.Collector.Domain.Entities;
|
||||
using Newsbot.Collector.Domain.Interfaces;
|
||||
@ -16,22 +17,24 @@ public interface IIdentityService
|
||||
AuthenticationResult Register(string email, string password);
|
||||
AuthenticationResult Login(string email, string password);
|
||||
AuthenticationResult RefreshToken(string token, string refreshToken);
|
||||
void AddRole(string roleName, string userId);
|
||||
void AddRole(string name, string userId);
|
||||
}
|
||||
|
||||
public class IdentityService : IIdentityService
|
||||
{
|
||||
private readonly UserManager<IdentityUser> _userManager;
|
||||
private readonly RoleManager<IdentityRole> _roleManager;
|
||||
private readonly JwtSettings _jwtSettings;
|
||||
private readonly TokenValidationParameters _tokenValidationParameters;
|
||||
private readonly IRefreshTokenRepository _refreshTokenRepository;
|
||||
|
||||
public IdentityService(UserManager<IdentityUser> userManager, JwtSettings jwtSettings, TokenValidationParameters tokenValidationParameters, IRefreshTokenRepository refreshTokenRepository)
|
||||
public IdentityService(UserManager<IdentityUser> userManager, JwtSettings jwtSettings, TokenValidationParameters tokenValidationParameters, IRefreshTokenRepository refreshTokenRepository, RoleManager<IdentityRole> roleManager)
|
||||
{
|
||||
_userManager = userManager;
|
||||
_jwtSettings = jwtSettings;
|
||||
_tokenValidationParameters = tokenValidationParameters;
|
||||
_refreshTokenRepository = refreshTokenRepository;
|
||||
_roleManager = roleManager;
|
||||
}
|
||||
|
||||
public AuthenticationResult Register(string email, string password)
|
||||
@ -63,8 +66,11 @@ public class IdentityService : IIdentityService
|
||||
ErrorMessage = new List<string>(createdUser.Result.Errors.Select(x => x.Description))
|
||||
};
|
||||
}
|
||||
|
||||
return GenerateJwtToken(newUser);
|
||||
|
||||
var addRole = _userManager.AddToRoleAsync(newUser, Authorization.UsersRole);
|
||||
addRole.Wait();
|
||||
|
||||
return GenerateJwtToken(newUser);
|
||||
}
|
||||
|
||||
public AuthenticationResult Login(string email, string password)
|
||||
@ -109,8 +115,9 @@ public class IdentityService : IIdentityService
|
||||
var expiryDateUnix = long.Parse(validatedToken.Claims.Single(x => x.Type == JwtRegisteredClaimNames.Exp).Value);
|
||||
|
||||
// generate the unix epoc, add expiry time
|
||||
var expiryDateTimeUtc = new DateTime(1970, 0, 0, 0, 0, 0, DateTimeKind.Utc)
|
||||
.AddSeconds(expiryDateUnix);
|
||||
|
||||
var unixTime = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
|
||||
var expiryDateTimeUtc = unixTime.AddSeconds(expiryDateUnix);
|
||||
|
||||
// if it expires in the future
|
||||
if (expiryDateTimeUtc > DateTime.Now)
|
||||
@ -179,7 +186,7 @@ public class IdentityService : IIdentityService
|
||||
return GenerateJwtToken(user.Result);
|
||||
}
|
||||
|
||||
public void AddRole(string roleName, string userId)
|
||||
public void AddRole(string name, string userId)
|
||||
{
|
||||
var user = _userManager.FindByIdAsync(userId);
|
||||
user.Wait();
|
||||
@ -189,7 +196,14 @@ public class IdentityService : IIdentityService
|
||||
throw new Exception("User was not found");
|
||||
}
|
||||
|
||||
_userManager.AddToRoleAsync(user.Result, roleName);
|
||||
if (!name.Equals(Authorization.AdministratorClaim)
|
||||
|| !name.Equals(Authorization.UserClaim))
|
||||
{
|
||||
throw new Exception("Invalid role");
|
||||
}
|
||||
|
||||
var addRole = _userManager.AddToRoleAsync(user.Result, name);
|
||||
addRole.Wait();
|
||||
}
|
||||
|
||||
private ClaimsPrincipal? CheckTokenSigner(string token)
|
||||
@ -221,15 +235,25 @@ public class IdentityService : IIdentityService
|
||||
{
|
||||
var tokenHandler = new JwtSecurityTokenHandler();
|
||||
var key = Encoding.ASCII.GetBytes(_jwtSettings.Secret ?? "");
|
||||
|
||||
var claims = new List<Claim>
|
||||
{
|
||||
new Claim(JwtRegisteredClaimNames.Sub, user.Email ?? ""),
|
||||
new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()),
|
||||
new Claim(JwtRegisteredClaimNames.Email, user.Email ?? ""),
|
||||
new Claim("id", user.Id)
|
||||
};
|
||||
|
||||
var userRoles = _userManager.GetRolesAsync(user);
|
||||
userRoles.Wait();
|
||||
foreach (var role in userRoles.Result)
|
||||
{
|
||||
claims.Add(new Claim(ClaimTypes.Role, role));
|
||||
}
|
||||
|
||||
var tokenDescriptor = new SecurityTokenDescriptor
|
||||
{
|
||||
Subject = new ClaimsIdentity(new[]
|
||||
{
|
||||
new Claim(JwtRegisteredClaimNames.Sub, user.Email ?? ""),
|
||||
new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()),
|
||||
new Claim(JwtRegisteredClaimNames.Email, user.Email ?? ""),
|
||||
new Claim("id", user.Id)
|
||||
}),
|
||||
Subject = new ClaimsIdentity(claims),
|
||||
Expires = DateTime.UtcNow.AddHours(3),
|
||||
SigningCredentials =
|
||||
new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256Signature)
|
||||
@ -239,6 +263,7 @@ public class IdentityService : IIdentityService
|
||||
|
||||
var refreshToken = new RefreshTokenEntity
|
||||
{
|
||||
Token = token.Id,
|
||||
JwtId = token.Id,
|
||||
UserId = user.Id,
|
||||
CreatedDate = DateTime.UtcNow,
|
||||
|
@ -181,7 +181,7 @@ public class CodeProjectWatcherJob
|
||||
Tags = source.Tags,
|
||||
Title = item.Title.Text,
|
||||
Url = itemUrl,
|
||||
PubDate = item.LastUpdatedTime.DateTime,
|
||||
PubDate = item.LastUpdatedTime.DateTime.ToUniversalTime(),
|
||||
Thumbnail = parser.Data.Header.Image,
|
||||
Description = item.Title.Text,
|
||||
CodeIsRelease = isRelease,
|
||||
|
@ -105,7 +105,7 @@ public class RssWatcherJob
|
||||
Title = post.Title.Text,
|
||||
Tags = FetchTags(post),
|
||||
Url = articleUrl,
|
||||
PubDate = post.PublishDate.DateTime,
|
||||
PubDate = post.PublishDate.DateTime.ToUniversalTime(),
|
||||
Thumbnail = meta.Data.Header.Image,
|
||||
Description = meta.Data.Header.Description,
|
||||
SourceId = sourceId
|
||||
|
@ -56,7 +56,9 @@ public class YoutubeWatcherJob
|
||||
|
||||
private void Execute()
|
||||
{
|
||||
var sources = _source.ListByType(SourceTypes.YouTube, 100);
|
||||
var totalSources = _source.TotalByTypeAsync(SourceTypes.YouTube);
|
||||
|
||||
var sources = _source.ListByType(SourceTypes.YouTube, 0);
|
||||
|
||||
foreach (var source in sources)
|
||||
{
|
||||
@ -165,7 +167,7 @@ public class YoutubeWatcherJob
|
||||
Title = post.Title.Text,
|
||||
Tags = FetchTags(post),
|
||||
Url = articleUrl,
|
||||
PubDate = post.PublishDate.DateTime,
|
||||
PubDate = post.PublishDate.DateTime.ToUniversalTime(),
|
||||
Thumbnail = videoDetails.Data.Header.Image,
|
||||
Description = videoDetails.Data.Header.Description,
|
||||
SourceId = sourceId,
|
||||
|
Loading…
Reference in New Issue
Block a user