mirror of
https://github.com/Shchoholiev/shopping-assistant-web-client.git
synced 2025-04-04 16:49:36 +00:00
SA-65 authorization updated
This commit is contained in:
Mykhailo Bilodid
parent
0e57411ace
commit
1a6a7e3fa8
@ -30,9 +30,8 @@ public class GlobalUserMiddleware
|
|||||||
catch (AuthenticationException ex)
|
catch (AuthenticationException ex)
|
||||||
{
|
{
|
||||||
httpContext.Response.Cookies.Delete("accessToken");
|
httpContext.Response.Cookies.Delete("accessToken");
|
||||||
httpContext.Response.Redirect("");
|
httpContext.Response.Redirect("/login");
|
||||||
}
|
}
|
||||||
|
|
||||||
await _next(httpContext);
|
await _next(httpContext);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -171,8 +171,8 @@ public class AuthenticationService
|
|||||||
var request = new GraphQLRequest
|
var request = new GraphQLRequest
|
||||||
{
|
{
|
||||||
Query = @"
|
Query = @"
|
||||||
mutation RefreshToken($model: TokensModelInput!) {
|
mutation RefreshAccessToken($model: TokensModelInput!) {
|
||||||
refreshUserToken(model: $model) {
|
refreshAccessToken(model: $model) {
|
||||||
accessToken
|
accessToken
|
||||||
refreshToken
|
refreshToken
|
||||||
}
|
}
|
||||||
@ -180,7 +180,7 @@ public class AuthenticationService
|
|||||||
Variables = new { model = new { accessToken = accessToken, refreshToken = refreshToken } }
|
Variables = new { model = new { accessToken = accessToken, refreshToken = refreshToken } }
|
||||||
};
|
};
|
||||||
var response = await _graphQLClient.SendMutationAsync<dynamic>(request);
|
var response = await _graphQLClient.SendMutationAsync<dynamic>(request);
|
||||||
var jsonResponse = JsonConvert.SerializeObject(response.Data.refreshUserToken);
|
var jsonResponse = JsonConvert.SerializeObject(response.Data.refreshAccessToken);
|
||||||
var tokens = JsonConvert.DeserializeObject<TokensModel>(jsonResponse);
|
var tokens = JsonConvert.DeserializeObject<TokensModel>(jsonResponse);
|
||||||
_httpContext.Response.Cookies.Append("accessToken", tokens.AccessToken, new CookieOptions { Expires = DateTime.UtcNow.AddDays(180) });
|
_httpContext.Response.Cookies.Append("accessToken", tokens.AccessToken, new CookieOptions { Expires = DateTime.UtcNow.AddDays(180) });
|
||||||
_httpContext.Response.Cookies.Append("refreshToken", tokens.RefreshToken, new CookieOptions { Expires = DateTime.UtcNow.AddDays(180) });
|
_httpContext.Response.Cookies.Append("refreshToken", tokens.RefreshToken, new CookieOptions { Expires = DateTime.UtcNow.AddDays(180) });
|
||||||
|
|||||||
@ -1,227 +0,0 @@
|
|||||||
@page "/chat/1"
|
|
||||||
@model ShoppingAssistantWebClient.Web.Pages.ChatModel
|
|
||||||
@{
|
|
||||||
ViewData["Title"] = "Gift for Jessica";
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
<div class="container-fluid">
|
|
||||||
|
|
||||||
<div class="left_frame" id="leftFrame">
|
|
||||||
|
|
||||||
|
|
||||||
<div class="logo">
|
|
||||||
<img src="/images/logo.png" alt="Logo site">
|
|
||||||
<span class="logo_name">CARTAID</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="menu">
|
|
||||||
|
|
||||||
<div class="elements_wishlisht">
|
|
||||||
|
|
||||||
<div class="close_menu">
|
|
||||||
<span >Wishlists</span>
|
|
||||||
<a class="button_close_menu" >
|
|
||||||
<span></span>
|
|
||||||
<span></span>
|
|
||||||
<span></span>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="add_chat">
|
|
||||||
<a href="/">
|
|
||||||
<span >Add chat +</span>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="wishlist_names">
|
|
||||||
<section>
|
|
||||||
<span id ="wishlist_id_1" class="wishlist_name">Gift for Jessica</span>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section>
|
|
||||||
<span id ="wishlist_id_2" class="wishlist_name">Secret Santa</span>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section>
|
|
||||||
<span id ="wishlist_id_3" class="wishlist_name">Phone charger</span>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section>
|
|
||||||
<span class="wishlist_name">Phone</span>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section>
|
|
||||||
<span class="wishlist_name">Printer</span>
|
|
||||||
<section>
|
|
||||||
|
|
||||||
<span class="wishlist_name">Books</span>
|
|
||||||
</section>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<div class="line"></div>
|
|
||||||
<div class="elements">
|
|
||||||
<div class="info_user">
|
|
||||||
<img src="/images/avatar.jpg" alt="Avatar user">
|
|
||||||
<span class="user_name">Username</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="right_frame" id="rightFrame">
|
|
||||||
|
|
||||||
<div class="open_menu">
|
|
||||||
<a class="button_open_menu" >
|
|
||||||
<span></span>
|
|
||||||
<span></span>
|
|
||||||
<span></span>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="chat_frame">
|
|
||||||
|
|
||||||
<div class="new_chat">
|
|
||||||
|
|
||||||
<div class="title_one_frame">Gift for Jessica</div>
|
|
||||||
|
|
||||||
<ul class="chat_box">
|
|
||||||
|
|
||||||
<li class="chat_outgoing">
|
|
||||||
<p>Give me product recommendation. Ask me questions if you need more directions. I am looking for: hub for my macbook to connect external monitors</p>
|
|
||||||
</li>
|
|
||||||
<li class=" chat_incoming">
|
|
||||||
<p>Sure! I can help you with that. I will ask you some leading questions. This is the first:
|
|
||||||
<br>
|
|
||||||
How many external monitors do you want to connect to your MacBook?</p>
|
|
||||||
</li>
|
|
||||||
<li class="chat_outgoing">
|
|
||||||
<p>7</p>
|
|
||||||
</li>
|
|
||||||
<li class=" chat_incoming">
|
|
||||||
<p>Thank you. Here is the next question:
|
|
||||||
<br>
|
|
||||||
What type of external monitors do you have? (e.g., HDMI, DisplayPort, VGA)</p>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="chat_input">
|
|
||||||
|
|
||||||
<input type="text" id="chatInput" placeholder="Describe what you are looking for....">
|
|
||||||
|
|
||||||
<a class="button_sende">
|
|
||||||
<img src="/images/send.png" alt="Send message">
|
|
||||||
</a>
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<script>
|
|
||||||
const leftFrame = document.getElementById("leftFrame");
|
|
||||||
const rightFrame = document.getElementById("rightFrame");
|
|
||||||
const openMenuButton = document.querySelector(".button_open_menu");
|
|
||||||
const closeMenuButton = document.querySelector(".button_close_menu");
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const choose_gift = document.getElementById("choose_gift");
|
|
||||||
const choose_product = document.getElementById("choose_product");
|
|
||||||
const switchGift = document.querySelector(".switch_gift");
|
|
||||||
const switchProduct = document.querySelector(".switch_product");
|
|
||||||
|
|
||||||
|
|
||||||
const isLeftFrameOpen = localStorage.getItem('leftFrameOpen');
|
|
||||||
|
|
||||||
if (isLeftFrameOpen) {
|
|
||||||
requestAnimationFrame(() => {
|
|
||||||
leftFrame.style.transform = "translateX(0%)";
|
|
||||||
rightFrame.style.transform = "translateX(calc(30% - 40px))";
|
|
||||||
rightFrame.style.width = "calc(80% - 60px)";
|
|
||||||
});
|
|
||||||
openMenuButton.style.visibility = "hidden";
|
|
||||||
closeMenuButton.style.visibility = "visible";
|
|
||||||
} else {
|
|
||||||
requestAnimationFrame(() => {
|
|
||||||
leftFrame.style.transform = "translateX(-100%)";
|
|
||||||
rightFrame.style.transform = "translateX(0%)";
|
|
||||||
rightFrame.style.width = "calc(100% - 40px)";
|
|
||||||
});
|
|
||||||
closeMenuButton.style.visibility = "hidden";
|
|
||||||
openMenuButton.style.visibility = "visible";
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
openMenuButton.addEventListener("click", function () {
|
|
||||||
requestAnimationFrame(() => {
|
|
||||||
leftFrame.style.transform = "translateX(0%)";
|
|
||||||
rightFrame.style.transform = "translateX(calc(30% - 40px))";
|
|
||||||
rightFrame.style.width = "calc(80% - 60px)";
|
|
||||||
});
|
|
||||||
openMenuButton.style.visibility = "hidden";
|
|
||||||
closeMenuButton.style.visibility = "visible";
|
|
||||||
});
|
|
||||||
|
|
||||||
closeMenuButton.addEventListener("click", function () {
|
|
||||||
requestAnimationFrame(() => {
|
|
||||||
leftFrame.style.transform = "translateX(-100%)";
|
|
||||||
rightFrame.style.transform = "translateX(0%)";
|
|
||||||
rightFrame.style.width = "calc(100% - 40px)";
|
|
||||||
});
|
|
||||||
closeMenuButton.style.visibility = "hidden";
|
|
||||||
openMenuButton.style.visibility = "visible";
|
|
||||||
});
|
|
||||||
|
|
||||||
switchGift.addEventListener("click", function () {
|
|
||||||
requestAnimationFrame(() => {
|
|
||||||
choose_gift.style.backgroundColor = "#0052CC";
|
|
||||||
choose_product.style.backgroundColor = "transparent";
|
|
||||||
switchGift.style.color = "white";
|
|
||||||
switchProduct.style.color = "#202124";
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
switchProduct.addEventListener("click", function () {
|
|
||||||
requestAnimationFrame(() => {
|
|
||||||
choose_product.style.backgroundColor = "#0052CC";
|
|
||||||
choose_gift.style.backgroundColor = "transparent";
|
|
||||||
switchProduct.style.color = "white";
|
|
||||||
switchGift.style.color = "#202124";
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const new_chat = document.querySelector(".button_add_chat");
|
|
||||||
new_chat.addEventListener("click", function () {
|
|
||||||
alert(3)
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</script>
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
using Microsoft.AspNetCore.Mvc;
|
|
||||||
using Microsoft.AspNetCore.Mvc.RazorPages;
|
|
||||||
using ShoppingAssistantWebClient.Web.Network;
|
|
||||||
|
|
||||||
namespace ShoppingAssistantWebClient.Web.Pages;
|
|
||||||
public class ChatModel : PageModel
|
|
||||||
{
|
|
||||||
private readonly ILogger<ChatModel> _logger;
|
|
||||||
|
|
||||||
private readonly AuthenticationService _authenticationService;
|
|
||||||
|
|
||||||
public ChatModel(ILogger<ChatModel> logger, AuthenticationService authenticationService)
|
|
||||||
{
|
|
||||||
_authenticationService = authenticationService;
|
|
||||||
_logger = logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OnGet()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
8
ShoppingAssistantWebClient.Web/Pages/Login.cshtml
Normal file
8
ShoppingAssistantWebClient.Web/Pages/Login.cshtml
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
@page "/login"
|
||||||
|
@model ShoppingAssistantWebClient.Web.Pages.LoginModel
|
||||||
|
|
||||||
|
<h1>Login</h1>
|
||||||
|
|
||||||
|
@{
|
||||||
|
|
||||||
|
}
|
||||||
12
ShoppingAssistantWebClient.Web/Pages/Login.cshtml.cs
Normal file
12
ShoppingAssistantWebClient.Web/Pages/Login.cshtml.cs
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||||
|
|
||||||
|
namespace ShoppingAssistantWebClient.Web.Pages
|
||||||
|
{
|
||||||
|
public class LoginModel : PageModel
|
||||||
|
{
|
||||||
|
public void OnGet()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,75 +0,0 @@
|
|||||||
@page
|
|
||||||
@model ShoppingAssistantWebClient.Web.Pages.WishlistModel
|
|
||||||
@{
|
|
||||||
//Layout = null;
|
|
||||||
}
|
|
||||||
<style>
|
|
||||||
.table-container {
|
|
||||||
width: 95%;
|
|
||||||
height: 95%;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
margin: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.styled-table {
|
|
||||||
border-collapse: collapse;
|
|
||||||
width: 100%;
|
|
||||||
max-width: 100%;
|
|
||||||
}
|
|
||||||
.styled-table th {
|
|
||||||
border-bottom: 1px solid #ddd;
|
|
||||||
text-align: center;
|
|
||||||
font-size: larger;
|
|
||||||
background-color: rgba(0, 159, 255, 0.1);
|
|
||||||
}
|
|
||||||
.styled-table td {
|
|
||||||
border-bottom: 5px solid #FFF;
|
|
||||||
border-top: 5px solid #FFF;
|
|
||||||
text-align: center;
|
|
||||||
font-size: large;
|
|
||||||
padding: 20px;
|
|
||||||
background-color: rgba(248, 248, 255, 1);
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<h1 style="text-align: center; margin-bottom: 50px">My Wishlist</h1>
|
|
||||||
|
|
||||||
<div class="table-container">
|
|
||||||
|
|
||||||
@if(!(Model.wishlist is null))
|
|
||||||
{
|
|
||||||
<table class="styled-table">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th> </th>
|
|
||||||
<th style="text-align: left;">Chat name</th>
|
|
||||||
<th>Type</th>
|
|
||||||
<th>CreatedById</th>
|
|
||||||
<th></th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
@foreach (var item in Model.wishlist)
|
|
||||||
{
|
|
||||||
<tr>
|
|
||||||
<form method="post" asp-page-handler="Delete" asp-route-id="@item.Id">
|
|
||||||
<td><input type="image" src="~/assets/x-button.png"></td>
|
|
||||||
</form>
|
|
||||||
<td style="text-align: left">@Html.DisplayFor(modelItem => item.Name)</td>
|
|
||||||
<td>@Html.DisplayFor(modelItem => item.Type)</td>
|
|
||||||
<td>@Html.DisplayFor(modelItem => item.CreateById)</td>
|
|
||||||
<form method="post" asp-page="Wishlist">
|
|
||||||
<td><input type="image" src="~/assets/shopping-cart.png" asp-page-handler="MoveToChat"></td>
|
|
||||||
</form>
|
|
||||||
</tr>
|
|
||||||
}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
<h3>You don't have a wishlist</h3>
|
|
||||||
}
|
|
||||||
|
|
||||||
</div>
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
using Microsoft.AspNetCore.Mvc;
|
|
||||||
using Microsoft.AspNetCore.Mvc.RazorPages;
|
|
||||||
using ShoppingAssistantWebClient.Web.Models;
|
|
||||||
|
|
||||||
namespace ShoppingAssistantWebClient.Web.Pages
|
|
||||||
{
|
|
||||||
public class WishlistModel : PageModel
|
|
||||||
{
|
|
||||||
public List<Models.Wishlist> wishlist = new List<Models.Wishlist>{
|
|
||||||
new Models.Wishlist {Id = "0", Name = "Chat1", Type="product", CreateById="0"},
|
|
||||||
new Models.Wishlist {Id = "1", Name = "Chat2", Type="gift", CreateById="1"},
|
|
||||||
new Models.Wishlist {Id = "2", Name = "Chat3", Type="product", CreateById="2"}
|
|
||||||
};
|
|
||||||
public void OnGet()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OnPostDelete(string id) {
|
|
||||||
var item = wishlist.FirstOrDefault(wishlist => wishlist.Id == id);
|
|
||||||
wishlist.RemoveAt(Int32.Parse(id));
|
|
||||||
}
|
|
||||||
|
|
||||||
public IActionResult OnPostMoveToChat() {
|
|
||||||
return RedirectToPage("Index");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -28,6 +28,6 @@ app.UseRouting();
|
|||||||
app.MapBlazorHub();
|
app.MapBlazorHub();
|
||||||
app.MapFallbackToPage("/_Host");
|
app.MapFallbackToPage("/_Host");
|
||||||
|
|
||||||
// app.ConfigureGlobalUserMiddleware();
|
app.ConfigureGlobalUserMiddleware();
|
||||||
|
|
||||||
app.Run();
|
app.Run();
|
||||||
|
|||||||
@ -1,10 +1,3 @@
|
|||||||
{
|
{
|
||||||
"DetailedErrors": true,
|
"ApiUrl": "https://shopping-assistant-api-dev.azurewebsites.net/"
|
||||||
"Logging": {
|
|
||||||
"LogLevel": {
|
|
||||||
"Default": "Information",
|
|
||||||
"Microsoft.AspNetCore": "Warning"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ApiUrl": "https://localhost:7268/"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,9 +1,8 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 17
|
# Visual Studio Version 17
|
||||||
VisualStudioVersion = 17.7.34003.232
|
VisualStudioVersion = 17.7.34003.232
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShoppingAssistantWebClient.Web.Old", "ShoppingAssistantWebClient.Web\ShoppingAssistantWebClient.Web.csproj", "{7D1CD0CD-916A-4007-A4BB-15EA99357992}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShoppingAssistantWebClient.Web", "ShoppingAssistantWebClient.Web\ShoppingAssistantWebClient.Web.csproj", "{7D1CD0CD-916A-4007-A4BB-15EA99357992}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user