From a6f994c8bcd6949c186fe4209ad5a5f5f9f58eb5 Mon Sep 17 00:00:00 2001 From: Sonja Galovic Date: Wed, 9 Mar 2022 22:27:02 +0100 Subject: Komponenta za ucitavanje i prikaz csv fajla v2 --- backend/api/api/Controllers/AuthController.cs | 14 +++- backend/api/api/Controllers/UserController.cs | 91 ++++++++++++++++++++++ backend/api/api/Data/MongoDbSettings.cs | 17 ---- backend/api/api/Data/UserStoreDatabaseSettings.cs | 13 ++++ .../api/Interfaces/IUserStoreDatabaseSettings.cs | 9 +++ backend/api/api/Models/User.cs | 24 ++++-- backend/api/api/Program.cs | 40 ++++++++++ backend/api/api/Services/AuthService.cs | 41 ++++++---- backend/api/api/Services/IAuthService.cs | 10 +++ backend/api/api/Services/IUserService.cs | 13 ++++ backend/api/api/Services/MongoDbService.cs | 11 --- backend/api/api/Services/UserService.cs | 54 +++++++++++++ backend/api/api/api.csproj | 1 + backend/api/api/appsettings.json | 9 +-- 14 files changed, 290 insertions(+), 57 deletions(-) create mode 100644 backend/api/api/Controllers/UserController.cs delete mode 100644 backend/api/api/Data/MongoDbSettings.cs create mode 100644 backend/api/api/Data/UserStoreDatabaseSettings.cs create mode 100644 backend/api/api/Interfaces/IUserStoreDatabaseSettings.cs create mode 100644 backend/api/api/Services/IAuthService.cs create mode 100644 backend/api/api/Services/IUserService.cs delete mode 100644 backend/api/api/Services/MongoDbService.cs create mode 100644 backend/api/api/Services/UserService.cs (limited to 'backend/api') diff --git a/backend/api/api/Controllers/AuthController.cs b/backend/api/api/Controllers/AuthController.cs index 1f47067f..c74c579d 100644 --- a/backend/api/api/Controllers/AuthController.cs +++ b/backend/api/api/Controllers/AuthController.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using api.Services; +using Microsoft.AspNetCore.Authorization; namespace api.Controllers { @@ -9,10 +10,10 @@ namespace api.Controllers [ApiController] public class AuthController : ControllerBase { - private AuthService _auth; - public AuthController(IConfiguration configuration) + private IAuthService _auth; + public AuthController(IAuthService auth) { - _auth=new AuthService(configuration); + _auth = auth; } [HttpPost("register")] @@ -29,6 +30,13 @@ namespace api.Controllers return Ok(_auth.Login(user)); } + [HttpGet("Auth")] + [Authorize(Roles ="User")] + public async Task> TestAuth() + { + return Ok("works"); + } + } } diff --git a/backend/api/api/Controllers/UserController.cs b/backend/api/api/Controllers/UserController.cs new file mode 100644 index 00000000..b1544477 --- /dev/null +++ b/backend/api/api/Controllers/UserController.cs @@ -0,0 +1,91 @@ +using api.Models; +using api.Services; +using Microsoft.AspNetCore.Mvc; +using System.Diagnostics; + +// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 +//dovrsi kontroler +namespace api.Controllers +{ + [Route("api/[controller]")] + [ApiController] + public class UserController : ControllerBase + { + private readonly IUserService userService; + + public UserController(IUserService userService) + { + this.userService = userService; + } + + // GET: api/ + [HttpGet] + public ActionResult> Get() + { + return userService.Get(); + } + + // GET api//5 + //potrebno za profile page + [HttpGet("{id}")] + public ActionResult Get(string id) + { + var user = userService.Get(id); + + if (user == null) + return NotFound($"User with Id = {id} not found"); + + return user; + } + + // POST api/ + [HttpPost] + public ActionResult Post([FromBody] User user) + { + userService.Create(user); + + //Debug.WriteLine("\nTest.\n"); + + return CreatedAtAction(nameof(Get), new { id = user._id }, user); + + } + + // PUT api//5 + [HttpPut("{id}")] + public ActionResult Put(string id, [FromBody] User user) + { + var existingUser = userService.Get(id); + + if(existingUser == null) + return NotFound($"User with Id = {id} not found"); + + userService.Update(id, existingUser); + return NoContent(); + } + + // DELETE api//5 + [HttpDelete("{id}")] + public ActionResult Delete(string id) + { + var user = userService.Get(id); + + if (user == null) + return NotFound($"User with Id = {id} not found"); + + userService.Delete(user._id); + return Ok($"Student with Id = {id} deleted"); + } + } +} +/* +{ + "userId": { + "$oid": "62276146c4a20eabc664abc3" + }, + "username" : "ivan996sk", + "email" : "ivan996sk@gmail.com", + "password" : "proba", + "firstName" : "Ivan", + "lastName" : "Ljubisavljevic" +} +*/ \ No newline at end of file diff --git a/backend/api/api/Data/MongoDbSettings.cs b/backend/api/api/Data/MongoDbSettings.cs deleted file mode 100644 index 8b42a02c..00000000 --- a/backend/api/api/Data/MongoDbSettings.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using MongoDB.Driver; - -namespace api.Data -{ - public class MongoDbSettings - { - public string? ConnectionURI { get; set; } = null; - public string? DatabaseName { get; set; } = null; - public string? CollectionName { get; set; } = null; - - - - - - } -} diff --git a/backend/api/api/Data/UserStoreDatabaseSettings.cs b/backend/api/api/Data/UserStoreDatabaseSettings.cs new file mode 100644 index 00000000..0efd2895 --- /dev/null +++ b/backend/api/api/Data/UserStoreDatabaseSettings.cs @@ -0,0 +1,13 @@ +using Microsoft.EntityFrameworkCore; +using MongoDB.Driver; +using api.Interfaces; + +namespace api.Data +{ + public class UserStoreDatabaseSettings : IUserStoreDatabaseSettings + { + public string ConnectionString { get; set; } = String.Empty; + public string DatabaseName { get; set; } = String.Empty; + public string CollectionName { get; set; } = String.Empty; + } +} diff --git a/backend/api/api/Interfaces/IUserStoreDatabaseSettings.cs b/backend/api/api/Interfaces/IUserStoreDatabaseSettings.cs new file mode 100644 index 00000000..43fe9b3a --- /dev/null +++ b/backend/api/api/Interfaces/IUserStoreDatabaseSettings.cs @@ -0,0 +1,9 @@ +namespace api.Interfaces +{ + public interface IUserStoreDatabaseSettings + { + string ConnectionString { get; set; } + string DatabaseName { get; set; } + string CollectionName { get; set; } + } +} diff --git a/backend/api/api/Models/User.cs b/backend/api/api/Models/User.cs index d0f2bc0f..46db50ab 100644 --- a/backend/api/api/Models/User.cs +++ b/backend/api/api/Models/User.cs @@ -1,18 +1,28 @@ using System.ComponentModel.DataAnnotations; +using MongoDB.Bson; +using MongoDB.Bson.Serialization.Attributes; + namespace api.Models { + [BsonIgnoreExtraElements]//ignorise visak elemenata iz baze --moze da se obrise jer nemamo viska public class User { - [Key] - public Guid userId { get; set; } - public string username { get; set; } - public string email { get; set; } - public string password { get; set; } + [BsonId] + [BsonRepresentation(BsonType.ObjectId)]//mongo data type to .net + public string _id { get; set; } + [BsonElement("username")] + public string Username { get; set; } + [BsonElement("email")] + public string Email { get; set; } + [BsonElement("password")] + public string Password { get; set; } - public string firstName { get; set; } - public int lastName { get; set; } + [BsonElement("firstName")] + public string FirstName { get; set; } + [BsonElement("lastName")] + public string LastName { get; set; } } } diff --git a/backend/api/api/Program.cs b/backend/api/api/Program.cs index 84514972..550f6ce1 100644 --- a/backend/api/api/Program.cs +++ b/backend/api/api/Program.cs @@ -1,9 +1,46 @@ +using System.Text; +using api.Data; +using api.Interfaces; +using api.Services; +using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.Extensions.Options; +using Microsoft.IdentityModel.Tokens; +using MongoDB.Driver; + var builder = WebApplication.CreateBuilder(args); //Add Cors builder.Services.AddCors(); // Add services to the container +//dodajemo dep inj + +builder.Services.Configure( + builder.Configuration.GetSection(nameof(UserStoreDatabaseSettings))); + +builder.Services.AddSingleton(sp => + sp.GetRequiredService>().Value); + +builder.Services.AddSingleton(s => + new MongoClient(builder.Configuration.GetValue("UserStoreDatabaseSettings:ConnectionString"))); + +//Inject Dependencies +builder.Services.AddScoped(); +builder.Services.AddScoped(); + +//Add Authentication +builder.Services.AddAuthentication( + JwtBearerDefaults.AuthenticationScheme).AddJwtBearer(options => { + options.TokenValidationParameters = new TokenValidationParameters + { + ValidateIssuerSigningKey = true, + IssuerSigningKey = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(builder.Configuration.GetSection("AppSettings:JwtToken").Value)), + ValidateIssuer=false, + ValidateAudience=false + }; + + }); + builder.Services.AddControllers(); @@ -19,6 +56,9 @@ app.UseCors( // Configure the HTTP request pipeline. +//Add Authentication +app.UseAuthentication(); + app.UseAuthorization(); app.MapControllers(); diff --git a/backend/api/api/Services/AuthService.cs b/backend/api/api/Services/AuthService.cs index 1a901cb8..015fdac7 100644 --- a/backend/api/api/Services/AuthService.cs +++ b/backend/api/api/Services/AuthService.cs @@ -1,34 +1,47 @@ -using api.Models; +using api.Interfaces; +using api.Models; using api.Models.Users; +using MongoDB.Driver; namespace api.Services { - public class AuthService + public class AuthService : IAuthService { private JwtToken _jwt; private readonly IConfiguration _configuration; - public AuthService(IConfiguration configuration) + private readonly IMongoCollection _users; + public AuthService(IConfiguration configuration, IUserStoreDatabaseSettings settings, IMongoClient mongoClient) { _configuration = configuration; _jwt = new JwtToken(_configuration); + var database = mongoClient.GetDatabase(settings.DatabaseName); + _users = database.GetCollection(settings.CollectionName); } public string Login(AuthRequest user) { - //Check username in DB - - //Verify password - - //gen token - + User u = _users.Find(x => x.Username == user.UserName).FirstOrDefault(); + if (u == null) + return "Username doesn't exist"; + if (!PasswordCrypt.checkPassword(user.Password, u.Password)) + return "Wrong password"; return _jwt.GenToken(user); } - public RegisterRequest Register(RegisterRequest user) + public string Register(RegisterRequest user) { - //check for existing email and username - user.password = PasswordCrypt.hashPassword(user.password); - //Add to DB. TO DO - return user; + User u = new User(); + u.Username = user.username; + u.Email = user.email; + u.Password = PasswordCrypt.hashPassword(user.password); + u.FirstName = user.firstName; + u.LastName = user.lastName; + if (_users.Find(user => user.Username == u.Username).FirstOrDefault() != null) + return "Username Already Exists"; + if (_users.Find(user => user.Email == u.Email).FirstOrDefault() != null) + return "Email Already Exists"; + + _users.InsertOne(u); + return "User added"; } diff --git a/backend/api/api/Services/IAuthService.cs b/backend/api/api/Services/IAuthService.cs new file mode 100644 index 00000000..79085f8c --- /dev/null +++ b/backend/api/api/Services/IAuthService.cs @@ -0,0 +1,10 @@ +using api.Models.Users; + +namespace api.Services +{ + public interface IAuthService + { + string Login(AuthRequest user); + string Register(RegisterRequest user); + } +} \ No newline at end of file diff --git a/backend/api/api/Services/IUserService.cs b/backend/api/api/Services/IUserService.cs new file mode 100644 index 00000000..e9f14c8b --- /dev/null +++ b/backend/api/api/Services/IUserService.cs @@ -0,0 +1,13 @@ +using api.Models; + +namespace api.Services +{ + public interface IUserService + { + List Get();// daje sve korisnike + User Get(string id); //daje korisnika po id-u + User Create(User user); // kreira korisnika + void Update(string id, User user); //apdejruje korisnika po idu + void Delete(string id);//brise korisnika + } +} diff --git a/backend/api/api/Services/MongoDbService.cs b/backend/api/api/Services/MongoDbService.cs deleted file mode 100644 index f8b37536..00000000 --- a/backend/api/api/Services/MongoDbService.cs +++ /dev/null @@ -1,11 +0,0 @@ - - - -namespace api.Services -{ - public class MongoDbService - { - - - } -} diff --git a/backend/api/api/Services/UserService.cs b/backend/api/api/Services/UserService.cs new file mode 100644 index 00000000..e5d1bb32 --- /dev/null +++ b/backend/api/api/Services/UserService.cs @@ -0,0 +1,54 @@ +using api.Interfaces; +using api.Models; +using MongoDB.Driver; + +namespace api.Services +{ + public class UserService : IUserService + { + private readonly IMongoCollection _users; + + public UserService(IUserStoreDatabaseSettings settings, IMongoClient mongoClient) + { + var database = mongoClient.GetDatabase(settings.DatabaseName); + _users = database.GetCollection(settings.CollectionName); + } + public User Create(User user) + { + _users.InsertOne(user); + return user; + } + + + + public List Get() + { + return _users.Find(user => true).ToList(); + } + + public User Get(string id) + { + return _users.Find(user => user._id == id).FirstOrDefault(); + } + + public void Delete(string id) + { + _users.DeleteOne(user => user._id == id); + + } + public void Update(string id, User user) + { + _users.ReplaceOne(user => user._id == id, user); + } + } +} +/* + { + "_id": "", + "username" : "ivan996sk", + "email" : "ivan996sk@gmail.com", + "password" : "proba", + "firstName" : "Ivan", + "lastName" : "Ljubisavljevic" +} + */ \ No newline at end of file diff --git a/backend/api/api/api.csproj b/backend/api/api/api.csproj index 1451fa77..6081cd21 100644 --- a/backend/api/api/api.csproj +++ b/backend/api/api/api.csproj @@ -8,6 +8,7 @@ + diff --git a/backend/api/api/appsettings.json b/backend/api/api/appsettings.json index b9144d93..d2c95254 100644 --- a/backend/api/api/appsettings.json +++ b/backend/api/api/appsettings.json @@ -9,10 +9,9 @@ } }, "AllowedHosts": "*", - "MongoDb": { - "ConnectionURI": "mongodb+srv://LINKIKKKKKKK", - "DatabaseName": "", - "CollectionName": "" - + "UserStoreDatabaseSettings": { + "ConnectionString": "mongodb://127.0.0.1:27017/", + "DatabaseName": "si_project", + "CollectionName": "User" } } -- cgit v1.2.3