diff --git a/KTUSAPS.Data/Model/IssueType.cs b/KTUSAPS.Data/Model/IssueType.cs index b745503..3d25130 100644 --- a/KTUSAPS.Data/Model/IssueType.cs +++ b/KTUSAPS.Data/Model/IssueType.cs @@ -12,7 +12,7 @@ namespace KTUSAPS.Data.Model public string Name { get; set; } public string NameEn { get; set; } - public virtual ICollection Issues { get; set; } + public virtual HashSet Issues { get; set; } } } diff --git a/KTUSAPS.Data/Model/PublishedProblem.cs b/KTUSAPS.Data/Model/PublishedProblem.cs index b841209..d088ee8 100644 --- a/KTUSAPS.Data/Model/PublishedProblem.cs +++ b/KTUSAPS.Data/Model/PublishedProblem.cs @@ -26,7 +26,7 @@ namespace KTUSAPS.Data.Model public int? SolutionId { get; set; } public virtual Solution Solution { get; set; } - public ICollection Votes { get; set; } + public virtual HashSet Votes { get; set; } public PublishedProblem() { diff --git a/KTUSAPS/ClientApp/package-lock.json b/KTUSAPS/ClientApp/package-lock.json index db7f3de..438ea4d 100644 --- a/KTUSAPS/ClientApp/package-lock.json +++ b/KTUSAPS/ClientApp/package-lock.json @@ -4,6 +4,22 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@azure/msal-browser": { + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.18.0.tgz", + "integrity": "sha512-YiWsimjsjjVu56+zOUDB1U3BCD9YNPIEZmw5iHzMk14aanqxWIvJlo+Ewo5/3FqxILgBOFWliH2hZCQPRIqKSg==", + "requires": { + "@azure/msal-common": "^5.0.1" + } + }, + "@azure/msal-common": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-5.0.1.tgz", + "integrity": "sha512-CmPR3XM9+CGUu7V/+bAwDxyN6XqWJJhVLmv7utT3sbgay4l5roVXsD1t4wURTs8PwzxmmnJOrhvvGhoDxUW69g==", + "requires": { + "debug": "^4.1.1" + } + }, "@babel/code-frame": { "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", @@ -4289,7 +4305,6 @@ "version": "4.3.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, "requires": { "ms": "2.1.2" } @@ -7626,8 +7641,7 @@ "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "multicast-dns": { "version": "6.2.3", diff --git a/KTUSAPS/ClientApp/package.json b/KTUSAPS/ClientApp/package.json index 644267b..c5513b7 100644 --- a/KTUSAPS/ClientApp/package.json +++ b/KTUSAPS/ClientApp/package.json @@ -8,6 +8,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "@azure/msal-browser": "^2.18.0", "@popperjs/core": "^2.10.1", "axios": "^0.20.0-0", "bootstrap": "^5.1.1", diff --git a/KTUSAPS/ClientApp/src/App.vue b/KTUSAPS/ClientApp/src/App.vue index a9ed8f9..5dfba76 100644 --- a/KTUSAPS/ClientApp/src/App.vue +++ b/KTUSAPS/ClientApp/src/App.vue @@ -19,15 +19,6 @@ -
-
-

Greitai baisis jūsų sesija

- - Po {{ expiresIn }} baigsis jūsų sesija. - Pratęsti sesija. - -
-
@@ -46,7 +37,7 @@ export default { } }, created() { - this.$store.dispatch('auth/initialize') + this.$store.dispatch('msalAuth/initialize') }, computed: { isLocal() { @@ -58,26 +49,6 @@ 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) - }, } diff --git a/KTUSAPS/ClientApp/src/components/NavMenu.vue b/KTUSAPS/ClientApp/src/components/NavMenu.vue index 740ce71..a757b13 100644 --- a/KTUSAPS/ClientApp/src/components/NavMenu.vue +++ b/KTUSAPS/ClientApp/src/components/NavMenu.vue @@ -27,18 +27,19 @@ >Pagrindinis -
  • +
    - Prisijungta kaip {{ $store.getters['auth/email'] }}Prisijungta kaip {{ $store.state.msalAuth.displayName }} + Atsijungti
    - Prisijungti + Prisijungti
    @@ -48,6 +49,8 @@ diff --git a/KTUSAPS/ClientApp/src/router/index.js b/KTUSAPS/ClientApp/src/router/index.js index a82a9e0..0c1731a 100644 --- a/KTUSAPS/ClientApp/src/router/index.js +++ b/KTUSAPS/ClientApp/src/router/index.js @@ -1,6 +1,5 @@ import { createWebHistory, createRouter } from 'vue-router' import Home from '@/pages/Home.vue' -import OidcEndpoint from '@/pages/OidcEndpoint.vue' const routes = [ { @@ -8,11 +7,6 @@ const routes = [ name: 'Home', component: Home, }, - { - path: '/oidc', - name: 'OpenID connect endpoint', - component: OidcEndpoint, - }, ] const router = createRouter({ diff --git a/KTUSAPS/ClientApp/src/store/index.js b/KTUSAPS/ClientApp/src/store/index.js index 7ba006d..f5ea949 100644 --- a/KTUSAPS/ClientApp/src/store/index.js +++ b/KTUSAPS/ClientApp/src/store/index.js @@ -1,11 +1,11 @@ import { createStore, createLogger } from 'vuex' -import auth from './modules/auth' +import msalAuth from './modules/msalAuth' const debug = process.env.NODE_ENV !== 'production' export default createStore({ modules: { - auth, + msalAuth, }, strict: debug, plugins: debug ? [createLogger()] : [], diff --git a/KTUSAPS/ClientApp/src/store/modules/auth.js b/KTUSAPS/ClientApp/src/store/modules/auth.js deleted file mode 100644 index a64ce91..0000000 --- a/KTUSAPS/ClientApp/src/store/modules/auth.js +++ /dev/null @@ -1,153 +0,0 @@ -import Cookies from 'cookies-js' -import jwt_decode from 'jwt-decode' -import axios from 'axios' - -const TokenCookieName = 'ktusaktutoken' -const ClientIdCookieName = 'ktusakacas' -const AuthorityCookieName = 'ktusakeksas' -const TenantCookieName = 'ktusalaimis' -const NonceCookieName = 'ktusakumpikas' - -const Scope = 'openid email' - -// initial state -const state = () => ({ - token: null, - tokenData: null, - clientId: null, // 5931fda0-e9e0-4754-80c2-18bcb9d9561a - authority: null, // https://login.microsoftonline.com/3415f2f7-f5a8-4092-b52a-003aaf844853/v2.0 - tenant: null, // 3415f2f7-f5a8-4092-b52a-003aaf844853 -}) - -const callbackUrl = - window.location.protocol + '//' + window.location.host + '/oidc' - -// getters -const getters = { - isReady(state) { - if ( - state.clientId == null || - state.authority == null || - state.tenant == null - ) - return false - return true - }, - isValid(state, getters) { - if (!getters.isReady) return false - if (state.token == null || state.tokenData == null) return false - const d = state.tokenData - if (d.nonce !== state.nonce) return false - if (d.iss !== state.authority) return false - - if (d.aud !== state.clientId) return false - const now = new Date() - const exp = new Date(d.exp * 1000) - if (now > exp) return false - return true - }, - email(state, getters) { - if (!getters.isValid) return null - return state.tokenData.email - }, - userId(state, getters) { - if (!getters.isValid) return null - 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 - return `https://login.microsoftonline.com/${ - state.tenant - }/oauth2/v2.0/authorize?client_id=${ - state.clientId - }&redirect_uri=${encodeURIComponent( - callbackUrl - )}&response_type=id_token&scope=${Scope}&nonce=${state.nonce}` - }, -} - -// actions -const actions = { - async initialize({ commit }) { - const token = Cookies.get(TokenCookieName) - const primaryClientId = Cookies.get(ClientIdCookieName) - const primaryAuthority = Cookies.get(AuthorityCookieName) - const primaryTenant = Cookies.get(TenantCookieName) - const nonce = Cookies.get(NonceCookieName) - if (!nonce) { - const newNonce = - Date.now().toString(36) + - Math.random() - .toString(36) - .substring(2) - Cookies.set(NonceCookieName, newNonce) - commit('setNonce', newNonce) - } else { - commit('setNonce', nonce) - } - commit('setToken', token) - commit('computeTokenVars') - commit('setMetadata', [primaryClientId, primaryAuthority, primaryTenant]) - axios - .get('/api/AuthMetadata') - .then(response => { - Cookies.set(ClientIdCookieName, response.data.clientId) - Cookies.set(AuthorityCookieName, response.data.authority) - Cookies.set(TenantCookieName, response.data.tenant) - commit('setMetadata', [ - response.data.clientId, - response.data.authority, - response.data.tenant, - ]) - }) - .catch(error => { - console.error(error) - }) - }, - async setToken({ commit }, token) { - Cookies.set(TokenCookieName, token) - commit('setToken', token) - commit('computeTokenVars') - }, -} - -// mutations -const mutations = { - setToken(state, token) { - state.token = token - }, - setNonce(state, nonce) { - state.nonce = nonce - }, - computeTokenVars(state) { - if (state.token == null) return - try { - state.tokenData = jwt_decode(state.token) - } catch { - console.log('Token was invalid.') - state.tokenData = null - state.token = null - } - }, - setMetadata(state, [clientId, authority, tenant]) { - state.clientId = clientId - state.authority = authority - state.tenant = tenant - }, -} - -export default { - namespaced: true, - state, - getters, - actions, - mutations, -} diff --git a/KTUSAPS/ClientApp/src/store/modules/msalAuth.js b/KTUSAPS/ClientApp/src/store/modules/msalAuth.js new file mode 100644 index 0000000..9ae577e --- /dev/null +++ b/KTUSAPS/ClientApp/src/store/modules/msalAuth.js @@ -0,0 +1,46 @@ +import { WatchMsalState, GetMsalState } from '@/msal' + +// initial state +const state = () => ({ + isLoggedIn: false, + accessToken: null, + idToken: null, + email: null, + displayName: null, + + debugFullTokenResponse: null, + debugAccountInfo: null, +}) + +// getters +const getters = {} + +// actions +const actions = { + initialize({ commit }) { + WatchMsalState(() => { + commit('setState', GetMsalState()) + }) + }, +} + +// mutations +const mutations = { + setState(state, msalState) { + state.isLoggedIn = msalState.isLoggedIn + state.accessToken = msalState.accessToken + state.idToken = msalState.idToken + state.debugFullTokenResponse = msalState.debugFullTokenResponse + state.debugAccountInfo = msalState.debugAccountInfo + state.email = msalState.email + state.displayName = msalState.displayName + }, +} + +export default { + namespaced: true, + state, + getters, + actions, + mutations, +} diff --git a/KTUSAPS/Controllers/IssueTypesController.cs b/KTUSAPS/Controllers/IssueTypesController.cs new file mode 100644 index 0000000..95df773 --- /dev/null +++ b/KTUSAPS/Controllers/IssueTypesController.cs @@ -0,0 +1,101 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using KTUSAPS.Data; +using KTUSAPS.Data.Model; +using KTUSAPS.Extensions; + +namespace KTUSAPS.Controllers +{ + [Route("api/[controller]")] + [ApiController] + public class IssueTypesController : ControllerBase + { + private readonly SAPSDataContext _context; + + public IssueTypesController(SAPSDataContext context) + { + _context = context; + } + + [HttpGet] + [ProducesResponseType(StatusCodes.Status200OK)] + public async Task>> GetIssueTypes() + { + return await _context.IssueTypes.ToListAsync(); + } + + [HttpPost] + [ProducesResponseType(StatusCodes.Status201Created)] + [ProducesResponseType(StatusCodes.Status400BadRequest)] + public async Task> CreateIssueType([FromBody] IssueType issueType) + { + if (issueType == null) + return BadRequest("No data provided for object to be created."); + if (issueType.Id != default) + return BadRequest("Id has been set on create request, please do not do that, set id to 0 or ommit it."); + if (issueType.Issues != null) + return BadRequest("Do not privide navigation property values."); + + _context.IssueTypes.Add(issueType); + await _context.SaveChangesAsync(); + + return CreatedAtAction(nameof(GetIssueType), new { id = issueType.Id }, issueType); + } + + // GET: api/IssueTypes/5 + [HttpGet("{id}")] + [ProducesResponseType(StatusCodes.Status200OK)] + [ProducesResponseType(StatusCodes.Status404NotFound)] + public async Task> GetIssueType(int id) + { + var issueType = await _context.IssueTypes.FindAsync(id); + + if (issueType == null) + return NotFound(); + + return issueType; + } + + [HttpPatch("{id}")] + [ProducesResponseType(StatusCodes.Status204NoContent)] + [ProducesResponseType(StatusCodes.Status404NotFound)] + public async Task UpdateIssueType(int id, IssueType issueType) + { + var databaseIssueType = await _context.IssueTypes.FindAsync(id); + if (databaseIssueType == default) + return NotFound(); + + var eIssueType = _context.Attach(databaseIssueType); + + eIssueType.MovePropertyDataWhiteList(issueType, new string[] { + nameof(databaseIssueType.Name), + nameof(databaseIssueType.NameEn), + }); + + await _context.SaveChangesAsync(); + + return NoContent(); + } + + + [HttpDelete("{id}")] + [ProducesResponseType(StatusCodes.Status204NoContent)] + [ProducesResponseType(StatusCodes.Status404NotFound)] + public async Task DeleteIssueType(int id) + { + var issueType = await _context.IssueTypes.FindAsync(id); + if (issueType == default) + return NotFound(); + + _context.IssueTypes.Remove(issueType); + await _context.SaveChangesAsync(); + + return NoContent(); + } + } +} diff --git a/KTUSAPS/Controllers/IssueController.cs b/KTUSAPS/Controllers/IssuesController.cs similarity index 89% rename from KTUSAPS/Controllers/IssueController.cs rename to KTUSAPS/Controllers/IssuesController.cs index 7956d54..9453463 100644 --- a/KTUSAPS/Controllers/IssueController.cs +++ b/KTUSAPS/Controllers/IssuesController.cs @@ -11,11 +11,11 @@ namespace KTUSAPS.Controllers { [Route("api/[controller]")] [ApiController] - public class IssueController : ControllerBase + public class IssuesController : ControllerBase { private readonly Data.SAPSDataContext dataContext; - public IssueController(Data.SAPSDataContext dataContext) + public IssuesController(Data.SAPSDataContext dataContext) { this.dataContext = dataContext; } @@ -23,9 +23,9 @@ namespace KTUSAPS.Controllers [HttpGet] [ProducesResponseType(StatusCodes.Status200OK)] - public IEnumerable GetIssues() + public async Task>> GetIssues() { - return dataContext.Issues; + return await dataContext.Issues.ToListAsync(); } [HttpPost] @@ -47,8 +47,8 @@ namespace KTUSAPS.Controllers 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); + + return CreatedAtAction(nameof(GetIssue), new { Id = createdValue.Entity.Id }, createdValue.Entity); } [HttpGet("{id}")] @@ -77,7 +77,7 @@ namespace KTUSAPS.Controllers nameof(databaseIssue.Publishable) }); await dataContext.SaveChangesAsync(); - return Ok(eIssue.Entity); + return NoContent(); } [HttpDelete("{id}")] diff --git a/KTUSAPS/Controllers/PublishedFeedbacksController.cs b/KTUSAPS/Controllers/PublishedFeedbacksController.cs new file mode 100644 index 0000000..7879a71 --- /dev/null +++ b/KTUSAPS/Controllers/PublishedFeedbacksController.cs @@ -0,0 +1,103 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using KTUSAPS.Data; +using KTUSAPS.Data.Model; +using KTUSAPS.Extensions; + +namespace KTUSAPS.Controllers +{ + [Route("api/[controller]")] + [ApiController] + public class PublishedFeedbacksController : ControllerBase + { + private readonly SAPSDataContext _context; + + public PublishedFeedbacksController(SAPSDataContext context) + { + _context = context; + } + + [HttpGet] + [ProducesResponseType(StatusCodes.Status200OK)] + public async Task>> GetPublishedFeedbacks() + { + return await _context.PublishedFeedbacks.ToListAsync(); + } + + [HttpPost] + [ProducesResponseType(StatusCodes.Status201Created)] + [ProducesResponseType(StatusCodes.Status400BadRequest)] + public async Task> PostPublishedFeedback(PublishedFeedback publishedFeedback) + { + if (publishedFeedback == null) + return BadRequest("No data provided for object to be created."); + if (publishedFeedback.Id != default) + return BadRequest("Id has been set on create request, please do not do that, set id to 0 or ommit it."); + if (publishedFeedback.Issue != null) + return BadRequest("Do not privide navigation property values."); + + _context.PublishedFeedbacks.Add(publishedFeedback); + await _context.SaveChangesAsync(); + + return CreatedAtAction(nameof(GetPublishedFeedback), new { id = publishedFeedback.Id }, publishedFeedback); + } + + [HttpGet("{id}")] + [ProducesResponseType(StatusCodes.Status200OK)] + [ProducesResponseType(StatusCodes.Status404NotFound)] + public async Task> GetPublishedFeedback(int id) + { + var publishedFeedback = await _context.PublishedFeedbacks.FindAsync(id); + + if (publishedFeedback == null) + return NotFound(); + + return publishedFeedback; + } + + [HttpPatch("{id}")] + [ProducesResponseType(StatusCodes.Status204NoContent)] + [ProducesResponseType(StatusCodes.Status404NotFound)] + public async Task UpdatePublishedFeedback(int id, PublishedFeedback publishedFeedback) + { + var databasePublishedFeedback = await _context.PublishedFeedbacks.FindAsync(id); + if (databasePublishedFeedback == default) + return NotFound(); + + var ePublishedFeedback = _context.Attach(databasePublishedFeedback); + + ePublishedFeedback.MovePropertyDataWhiteList(publishedFeedback, new string[] + { + nameof(databasePublishedFeedback.FeedbackLt), + nameof(databasePublishedFeedback.FeedbackEn), + nameof(databasePublishedFeedback.Created), + nameof(databasePublishedFeedback.IssueId), + }); + + await _context.SaveChangesAsync(); + + return NoContent(); + } + + + [HttpDelete("{id}")] + [ProducesResponseType(StatusCodes.Status204NoContent)] + [ProducesResponseType(StatusCodes.Status404NotFound)] + public async Task DeletePublishedFeedback(int id) + { + var publishedFeedback = await _context.PublishedFeedbacks.FindAsync(id); + if (publishedFeedback == null) + return NotFound(); + + _context.PublishedFeedbacks.Remove(publishedFeedback); + await _context.SaveChangesAsync(); + + return NoContent(); + } + } +} diff --git a/KTUSAPS/Controllers/PublishedProblemsController.cs b/KTUSAPS/Controllers/PublishedProblemsController.cs new file mode 100644 index 0000000..366e863 --- /dev/null +++ b/KTUSAPS/Controllers/PublishedProblemsController.cs @@ -0,0 +1,163 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using KTUSAPS.Data; +using KTUSAPS.Data.Model; +using KTUSAPS.Extensions; + +namespace KTUSAPS.Controllers +{ + [Route("api/[controller]")] + [ApiController] + public class PublishedProblemsController : ControllerBase + { + private readonly SAPSDataContext _context; + + public PublishedProblemsController(SAPSDataContext context) + { + _context = context; + } + + [HttpGet] + [ProducesResponseType(StatusCodes.Status200OK)] + public async Task>> GetPublishedProblems() + { + return await _context.PublishedProblems.ToListAsync(); + } + + [HttpPost] + [ProducesResponseType(StatusCodes.Status201Created)] + [ProducesResponseType(StatusCodes.Status400BadRequest)] + public async Task> CreatePublishedProblem([FromBody] PublishedProblem publishedProblem) + { + if (publishedProblem == null) + return BadRequest("No data provided for object to be created."); + if (publishedProblem.Id != default) + return BadRequest("Id has been set on create request, please do not do that, set id to 0 or ommit it."); + if (publishedProblem.Issue != null || publishedProblem.Solution != null || publishedProblem.Votes != null) + return BadRequest("Do not privide navigation property values."); + + _context.PublishedProblems.Add(publishedProblem); + await _context.SaveChangesAsync(); + + return CreatedAtAction(nameof(GetPublishedProblem), new { id = publishedProblem.Id }, publishedProblem); + } + + [HttpGet("{id}")] + [ProducesResponseType(StatusCodes.Status200OK)] + [ProducesResponseType(StatusCodes.Status404NotFound)] + public async Task> GetPublishedProblem(int id) + { + var publishedProblem = await _context.PublishedProblems.FindAsync(id); + + if (publishedProblem == null) + return NotFound(); + + return publishedProblem; + } + + [HttpPatch("{id}")] + [ProducesResponseType(StatusCodes.Status204NoContent)] + [ProducesResponseType(StatusCodes.Status404NotFound)] + public async Task UpdatePublishedProblem(int id, PublishedProblem publishedProblem) + { + var databasePublishedProblem = await _context.PublishedProblems.FindAsync(id); + if (databasePublishedProblem == default) + return NotFound(); + + var ePublishedProblem = _context.Attach(databasePublishedProblem); + + ePublishedProblem.MovePropertyDataWhiteList(publishedProblem, new string[] + { + nameof(databasePublishedProblem.ProblemLt), + nameof(databasePublishedProblem.ProblemEn), + nameof(databasePublishedProblem.Created), + nameof(databasePublishedProblem.IssueId), + nameof(databasePublishedProblem.SolutionId), + }); + + await _context.SaveChangesAsync(); + + return NoContent(); + } + + + + [HttpDelete("{id}")] + [ProducesResponseType(StatusCodes.Status204NoContent)] + [ProducesResponseType(StatusCodes.Status404NotFound)] + public async Task DeletePublishedProblem(int id) + { + var publishedProblem = await _context.PublishedProblems.FindAsync(id); + if (publishedProblem == null) + return NotFound(); + + _context.PublishedProblems.Remove(publishedProblem); + await _context.SaveChangesAsync(); + + return NoContent(); + } + + [HttpGet("{id}/Votes")] + [ProducesResponseType(StatusCodes.Status200OK)] + [ProducesResponseType(StatusCodes.Status404NotFound)] + public async Task> GetVoteCount(int id) + { + var publishedProblem = await _context.PublishedProblems.FindAsync(id); + if (publishedProblem == null) + return NotFound(); + + return (await _context.Votes + .Where(v => v.ProblemId == publishedProblem.Id) + .ToListAsync()) + .Count(); + } + + [HttpPost("{id}/Votes")] + [ProducesResponseType(StatusCodes.Status200OK)] + [ProducesResponseType(StatusCodes.Status400BadRequest)] + [ProducesResponseType(StatusCodes.Status404NotFound)] + public async Task> Vote(int id, Vote vote) + { + var publishedProblem = await _context.PublishedProblems.FindAsync(id); + if (publishedProblem == null) + return NotFound(); + + // TODO: Get user id from auth claims + if (vote.UserId == default) + return BadRequest("Please provide user id"); + + vote.Problem = publishedProblem; + + _context.Votes.Add(vote); + await _context.SaveChangesAsync(); + + return CreatedAtAction(nameof(GetVote), new { id = id, userId = vote.UserId }, vote); + } + + [HttpPost("{id}/Votes/{userId}")] + [ProducesResponseType(StatusCodes.Status200OK)] + [ProducesResponseType(StatusCodes.Status404NotFound)] + public async Task> GetVote(int id, string userId) + { + var publishedProblem = await _context.PublishedProblems.FindAsync(id); + if (publishedProblem == null) + return NotFound(); + + var vote = await _context.Votes + .Where(v => v.ProblemId == publishedProblem.Id && v.UserId == userId) + .FirstOrDefaultAsync(); + + if (vote == default) + return NotFound(); + + return vote; + } + + + } +} \ No newline at end of file diff --git a/KTUSAPS/KTUSAPS.csproj b/KTUSAPS/KTUSAPS.csproj index ddd326c..2138b67 100644 --- a/KTUSAPS/KTUSAPS.csproj +++ b/KTUSAPS/KTUSAPS.csproj @@ -12,6 +12,16 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/KTUSAPS/Startup.cs b/KTUSAPS/Startup.cs index f658c02..c088d22 100644 --- a/KTUSAPS/Startup.cs +++ b/KTUSAPS/Startup.cs @@ -32,8 +32,8 @@ namespace KTUSAPS services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) .AddJwtBearer(options => { - options.Audience = "5931fda0-e9e0-4754-80c2-18bcb9d9561a"; - options.Authority = "https://login.microsoftonline.com/3415f2f7-f5a8-4092-b52a-003aaf844853/v2.0"; + options.Audience = Configuration["ClientId"]; + options.Authority = Configuration["Authority"]; }); services.AddAuthorization((configure) => diff --git a/KTUSAPS/appsettings.Development.json b/KTUSAPS/appsettings.Development.json index b53a0da..d48af35 100644 --- a/KTUSAPS/appsettings.Development.json +++ b/KTUSAPS/appsettings.Development.json @@ -9,7 +9,7 @@ "Microsoft.Hosting.Lifetime": "Information" } }, - "ClientId": "5931fda0-e9e0-4754-80c2-18bcb9d9561a", + "ClientId": "411a8715-3d63-4a03-9be8-9370d920e36f", "Authority": "https://login.microsoftonline.com/3415f2f7-f5a8-4092-b52a-003aaf844853/v2.0", "Tenant": "3415f2f7-f5a8-4092-b52a-003aaf844853" } diff --git a/KTUSAPS/appsettings.json b/KTUSAPS/appsettings.json index 7555ad8..bb80c6b 100644 --- a/KTUSAPS/appsettings.json +++ b/KTUSAPS/appsettings.json @@ -10,7 +10,7 @@ } }, "AllowedHosts": "*", - "ClientId": "5931fda0-e9e0-4754-80c2-18bcb9d9561a", + "ClientId": "411a8715-3d63-4a03-9be8-9370d920e36f", "Authority": "https://login.microsoftonline.com/3415f2f7-f5a8-4092-b52a-003aaf844853/v2.0", "Tenant": "3415f2f7-f5a8-4092-b52a-003aaf844853" }