InfoSA/KTUSA-PS
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Huge work

Browse Source
This commit is contained in:
Karolis Kundrotas
2021-10-25 22:00:01 +03:00
parent c3bb8983ef
commit aff6f8df82
26 changed files with 578 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
KTUSAPS/ClientApp/src/App.vue
View File

@@ -19,6 +19,15 @@
</span>
</div>
</div>
<div v-if="$store.getters['auth/isExpiringSoon']" class="container">
<div class="alert alert-warning">
<h4 class="alert-heading">Greitai baisis jūsų sesija</h4>
<span>
Po {{ expiresIn }} baigsis jūsų sesija.
<a :href="$store.getters['auth/loginUrl']">Pratęsti sesija.</a>
</span>
</div>
</div>
<router-view />
</template>
@@ -30,6 +39,12 @@ export default {
components: {
NavMenu,
},
data() {
return {
expiresIn: '',
interval: null,
}
},
created() {
this.$store.dispatch('auth/initialize')
},
@@ -43,6 +58,26 @@ export default {
return location.protocol !== 'https:'
},
},
methods: {
updateExpiry() {
const totalSeconds = Math.floor(
(this.$store.getters['auth/expires'] - new Date()) / 1000
)
const seconds = totalSeconds % 60
const minutes = Math.floor(totalSeconds / 60)
if (minutes) {
this.expiresIn = `${minutes} min. ir ${seconds} sek.`
} else {
this.expiresIn = `${seconds} sek.`
}
},
},
mounted() {
this.interval = setInterval(this.updateExpiry, 1000)
},
beforeUnmount() {
clearInterval(this.interval)
},
}
</script>

3
KTUSAPS/ClientApp/src/components/NavMenu.vue
View File

@@ -27,6 +27,9 @@
>Pagrindinis</router-link
>
</li>
<li class="nav-item">
<a href="/swagger" class="nav-link">Swagger UI</a>
</li>
</ul>
<div class="navbar-nav">
<span v-if="$store.getters['auth/isValid']" class="navbar-text"

4
KTUSAPS/ClientApp/src/pages/Home.vue
View File

@@ -29,7 +29,7 @@
</table>
<h3>Techninė duomenų reprezentacija</h3>
<a
href="https://docs.microsoft.com/en-us/azure/active-directory/develop/access-tokens"
href="https://docs.microsoft.com/en-us/azure/active-directory/develop/id-tokens"
>Dokumentacija apie laukų reikšmes</a
>
<pre>{{ $store.state.auth.tokenData }}</pre>
@@ -92,7 +92,7 @@ export default {
serverVerify() {
this.verificationResult = null
axios
.get('/test/authed', {
.get('/api/AuthMetadata/authed', {
headers: { Authorization: `Bearer ${this.$store.state.auth.token}` },
})
.then(response => {

8
KTUSAPS/ClientApp/src/store/index.js
View File

@@ -1,7 +1,7 @@
import { createStore, createLogger } from "vuex";
import auth from "./modules/auth";
import { createStore, createLogger } from 'vuex'
import auth from './modules/auth'
const debug = process.env.NODE_ENV !== "production";
const debug = process.env.NODE_ENV !== 'production'
export default createStore({
modules: {
@@ -9,4 +9,4 @@ export default createStore({
},
strict: debug,
plugins: debug ? [createLogger()] : [],
});
})

10
KTUSAPS/ClientApp/src/store/modules/auth.js
View File

@@ -52,7 +52,15 @@ const getters = {
},
userId(state, getters) {
if (!getters.isValid) return null
return state.tokenData.email
return state.tokenData.sub
},
isExpiringSoon(state, getters) {
if (!getters.isValid) return false
return true
},
expires(state, getters) {
if (!getters.isValid) return 0
return new Date(state.tokenData.exp * 1000)
},
loginUrl(state, getters) {
if (!getters.isReady) return null

29
KTUSAPS/Controllers/AuthMetadataController.cs
View File

@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using System;
@@ -10,15 +11,39 @@ namespace KTUSAPS.Controllers
{
[Route("api/[controller]")]
[ApiController]
[Produces("application/json")]
public class AuthMetadataController : ControllerBase
{
public class AuthMetadata
{
public string ClientId { get; set; }
public string Authority { get; set; }
public string Tenant { get; set; }
}
private readonly IConfiguration _configuration;
public AuthMetadataController(IConfiguration configuration)
{
_configuration = configuration;
}
/// <summary>
/// Get authethication metadata needed to obtain token.
/// </summary>
/// <returns></returns>
[HttpGet]
public object Index() => new { ClientId = _configuration["ClientId"], Authority = _configuration["Authority"], Tenant = _configuration["Tenant"] };
public AuthMetadata Index() => new AuthMetadata { ClientId = _configuration["ClientId"], Authority = _configuration["Authority"], Tenant = _configuration["Tenant"] };
/// <summary>
/// Returns true is provided token is valid, else throws exception
/// </summary>
/// <returns></returns>
/// <response code="200">Provided token is correct.</response>
/// <response code="401">No valid token provided.</response>
[Authorize]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
[ProducesResponseType(StatusCodes.Status200OK)]
[HttpGet("Authed")]
public bool IsAuthed() => true;
}
}

96
KTUSAPS/Controllers/IssueController.cs Normal file
View File

@@ -0,0 +1,96 @@
using KTUSAPS.Data.Model;
using KTUSAPS.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace KTUSAPS.Controllers
{
[Route("api/[controller]")]
[ApiController]
public class IssueController : ControllerBase
{
private readonly Data.SAPSDataContext dataContext;
public IssueController(Data.SAPSDataContext dataContext)
{
this.dataContext = dataContext;
}
[HttpGet]
[ProducesResponseType(StatusCodes.Status200OK)]
public IEnumerable<Issue> GetIssues()
{
return dataContext.Issues;
}
[HttpPost]
[ProducesResponseType(StatusCodes.Status201Created)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
public async Task<ActionResult<Issue>> CreateIssueAsync([FromBody] Issue issueToCreate)
{
if (issueToCreate == null)
return BadRequest("No data provided for object to be created.");
if (issueToCreate.Id != default)
return BadRequest("Id has been set on create request, please do not do that, set id to 0 or ommit it.");
if (issueToCreate.IssueTypeId == default)
return BadRequest("No typeId has been specified");
if (issueToCreate.Problem != null && issueToCreate.Feedback != null && issueToCreate.IssueType != null)
return BadRequest("Do not privide navigation property values.");
// TODO: Enable next line and make thoes two fields come from user identity
//if (issueToCreate.UserID != default || issueToCreate.Email != default)
// return BadRequest("Do not provide indentity values.");
var createdValue = await dataContext.AddAsync(issueToCreate);
await dataContext.SaveChangesAsync();
var url = Url.ActionLink(action: nameof(GetIssue), values: new { Id = createdValue.Entity.Id });
return Created(url, createdValue.Entity);
}
[HttpGet("{id}")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public ActionResult<Issue> GetIssue(int id)
{
var issue = dataContext.Issues.AsQueryable().Where(i => i.Id == id).FirstOrDefault();
if(issue == default)
return NotFound();
return Ok(issue);
}
[HttpPatch("{id}")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult<Issue>> UpdateIssueAsync(int id, [FromBody] Issue issue)
{
var databaseIssue = dataContext.Issues.AsQueryable().Where(i => i.Id == id).FirstOrDefault();
if (databaseIssue == default)
return NotFound();
var eIssue = dataContext.Attach(databaseIssue);
eIssue.MovePropertyDataWhiteList(issue, new string[] {
nameof(databaseIssue.Description),
nameof(databaseIssue.IssueTypeId),
nameof(databaseIssue.Publishable)
});
await dataContext.SaveChangesAsync();
return Ok(eIssue.Entity);
}
[HttpDelete("{id}")]
[ProducesResponseType(StatusCodes.Status204NoContent)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<IActionResult> DeleteIssueAsync(int id)
{
var issue = dataContext.Issues.AsQueryable().Where(i => i.Id == id).FirstOrDefault();
if (issue == default)
return NotFound();
dataContext.Issues.Remove(issue);
await dataContext.SaveChangesAsync();
return NoContent();
}
}
}

26
KTUSAPS/Controllers/TestController.cs
View File

@@ -1,26 +0,0 @@
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace KTUSAPS.Controllers
{
[Route("[controller]")]
[Authorize]
[ApiController]
public class TestController : ControllerBase
{
[HttpGet]
public object[] Index()
{
return HttpContext.User.Claims.Select(x => new { Name = x.Type, Value= x.Value }).ToArray();
}
[HttpGet("authed")]
public bool IsAuthed() => true;
}
}

44
KTUSAPS/Extensions/EntityEntryExtensions.cs Normal file
View File

@@ -0,0 +1,44 @@
using Microsoft.EntityFrameworkCore.ChangeTracking;
using System;
using System.Collections.Generic;
using System.Linq;
namespace KTUSAPS.Extensions
{
public static class EntityEntryExtensions
{
public static void MovePropertyDataBlackList(this EntityEntry target, object source, IEnumerable<string> blacklistedProprties)
{
MovePropertyData(target, source, (prop) => blacklistedProprties.Contains(prop.Metadata.Name));
}
public static void MovePropertyDataWhiteList(this EntityEntry target, object source, IEnumerable<string> whitelistedProprties)
{
MovePropertyData(target, source, (prop) => !whitelistedProprties.Contains(prop.Metadata.Name));
}
public static void MovePropertyData(this EntityEntry target, object source, Func<PropertyEntry, bool> isBlacklisted)
{
foreach (var prop in target.Properties)
{
if (isBlacklisted(prop))
continue;
var propertyInfo = prop.Metadata.PropertyInfo;
var newValue = propertyInfo.GetValue(source);
if (!newValue.isDefault()) {
prop.CurrentValue = newValue;
}
}
}
private static bool isDefault(this object value)
{
if(value == default)
return true;
if (value is int || value is long)
return (int)value == default(int);
return false;
}
}
}

10
KTUSAPS/KTUSAPS.csproj
View File

@@ -11,8 +11,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.8" />
<PackageReference Include="VueCliMiddleware" Version="3.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.10" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.2.1" />
<PackageReference Include="VueCliMiddleware" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
@@ -22,6 +24,10 @@
<None Include="$(SpaRoot)**" Exclude="$(SpaRoot)node_modules\**" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\KTUSAPS.Data\KTUSAPS.Data.csproj" />
</ItemGroup>
<Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">
<!-- Ensure Node.js is installed -->
<Exec Command="node --version" ContinueOnError="true">

138
KTUSAPS/Services/DatabaseInitializationService.cs Normal file
View File

@@ -0,0 +1,138 @@
using KTUSAPS.Data;
using KTUSAPS.Data.Model;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using System;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
namespace KTUSAPS.Services
{
public class DatabaseInitializationService : IHostedService
{
private readonly IServiceProvider serviceProvider;
private readonly ILogger<DatabaseInitializationService> logger;
public DatabaseInitializationService(IServiceProvider serviceProvider, ILogger<DatabaseInitializationService> logger)
{
this.serviceProvider = serviceProvider;
this.logger = logger;
}
public async Task StartAsync(CancellationToken cancellationToken)
{
using var scope = serviceProvider.CreateScope();
var dataContext = scope.ServiceProvider.GetRequiredService<SAPSDataContext>();
var migrations = (await dataContext.Database.GetPendingMigrationsAsync(cancellationToken: cancellationToken)).ToList();
if(migrations.Any())
{
logger.LogInformation($"There are {migrations.Count} pending migrations. Applying them");
try
{
await dataContext.Database.MigrateAsync(cancellationToken: cancellationToken);
await Seed(dataContext);
}
catch (Exception ex)
{
logger.LogError("Migration failed. Database may be corrupt!");
logger.LogError(ex, "Migration failed.");
}
}
}
public async Task Seed(SAPSDataContext dataContext)
{
var generalIssueType = await dataContext.IssueTypes.AddAsync(new IssueType()
{
Name = "Bendra",
NameEn = "General"
});
var otherIssueType = await dataContext.IssueTypes.AddAsync(new IssueType()
{
Name = "Kita",
NameEn = "Other"
});
var feedbackIssueType = await dataContext.IssueTypes.AddAsync(new IssueType()
{
Name = "Atsiliepimas",
NameEn = "Feedback"
});
await dataContext.SaveChangesAsync();
var issue1 = await dataContext.Issues.AddAsync(new Issue()
{
Created = DateTime.Now.AddDays(-5),
Description = "Man nepatinka dėstytojas.",
Email = "karolis.kundrotas@ktu.edu",
Publishable = true,
IssueType = generalIssueType.Entity
});
var issue2 = await dataContext.Issues.AddAsync(new Issue()
{
Created = DateTime.Now.AddDays(-12).AddHours(3),
Description = "Dėtytoja atsiskaitymo metu leido nusirašynėti kitiems, o man neleido.",
Email = "karolis.kundrotas@ktu.edu",
Publishable = true,
IssueType = otherIssueType.Entity
});
var issue3 = await dataContext.Issues.AddAsync(new Issue()
{
Created = DateTime.Now.AddDays(-18),
Description = "Tinklų destytoja per paskaitą neatsako į klausimus ir per paskaitą nieko neišmoko.",
Email = "karolis.kundrotas@ktu.edu",
Publishable = false,
IssueType = generalIssueType.Entity
});
var issue4 = await dataContext.Issues.AddAsync(new Issue()
{
Created = DateTime.Now.AddDays(-18),
Description = "Saitynų destytojas Tomas labai maloniai ir profesonaliai bendrauja.",
Email = "karolis.kundrotas@ktu.edu",
Publishable = true,
IssueType = feedbackIssueType.Entity,
Solved = true
});
await dataContext.SaveChangesAsync();
await dataContext.PublishedFeedbacks.AddAsync(new PublishedFeedback()
{
Issue = issue4.Entity,
FeedbackLt = "Studentas mano kad Saitynų dėstytojas Tomas yra profesonalus ir mandagiai bendraujantis.",
FeedbackEn = "Student thinks that Site creation module lecturer Tomas is profesonal ir pleasant at communications.",
});
var problem1 = await dataContext.PublishedProblems.AddAsync(new PublishedProblem()
{
Issue = issue2.Entity,
ProblemLt = "Atsikaitymo metu buvo leista nusirašynėti.",
ProblemEn = "During exam cheating was allowed.",
});
var problem2 = await dataContext.PublishedProblems.AddAsync(new PublishedProblem()
{
Issue = issue3.Entity,
ProblemLt = "Dėstytoja V. Pavardenė nemoko studentų per paskaitas, neraguoja į studentų klausimus, nesuteikia pagalbos.",
ProblemEn = "Lecturer V. Pavardenė does not lecture students, do not react to student questions and doesn't provide help."
});
await dataContext.SaveChangesAsync();
await dataContext.Solutions.AddAsync(new Solution()
{
Problem = problem2.Entity,
SolutionLt = "V. Parvedenei buvo priskirta tarnybinę nuobauda.",
SolutionEn = ""
});
await dataContext.SaveChangesAsync();
}
public Task StopAsync(CancellationToken cancellationToken)
{
return Task.CompletedTask;
}
}
}

18
KTUSAPS/Startup.cs
View File

@@ -1,9 +1,12 @@
using KTUSAPS.Services;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using System;
using VueCliMiddleware;
namespace KTUSAPS
@@ -39,7 +42,12 @@ namespace KTUSAPS
.RequireAuthenticatedUser()
.Build();
});
var connectionString = Configuration.GetConnectionString("Main");
services.AddDbContext<Data.SAPSDataContext>((options) => options.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString)));
services.AddHostedService<DatabaseInitializationService>();
services.AddSwaggerGen();
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -48,8 +56,16 @@ namespace KTUSAPS
if (env.IsDevelopment())
{
app.UseDeveloperExceptionPage();
app.UseSwaggerUI(c =>
{
c.SwaggerEndpoint("/swagger/v1/swagger.json", "API");
});
}
app.UseSwagger(c =>
{
});
app.UseRouting();
app.UseSpaStaticFiles();
app.UseAuthentication();

3
KTUSAPS/appsettings.Development.json
View File

@@ -1,4 +1,7 @@
{
"ConnectionStrings": {
"Main": "Server=localhost;User=saps_dev;Password=;Database=saps_dev"
},
"Logging": {
"LogLevel": {
"Default": "Information",

3
KTUSAPS/appsettings.json
View File

@@ -1,4 +1,7 @@
{
"ConnectionStrings": {
"Main": "Server=localhost;User=saps;Password=B35eJUmIJxeG0g9yi6ni;Database=saps"
},
"Logging": {
"LogLevel": {
"Default": "Information",