misc changes

rahul-atharva · rahul-atharva · commit ec83398de2f4 · 2023-05-02T14:54:09.000+05:30
diff --git a/src/BlazorEcommerce.Identity/Service/AuthService.cs b/src/BlazorEcommerce.Identity/Service/AuthService.cs
@@ -1,5 +1,4 @@
-﻿using Ardalis.GuardClauses;
-using BlazorEcommerce.Application.Contracts.Identity;
+﻿using BlazorEcommerce.Application.Contracts.Identity;
 using BlazorEcommerce.Application.Model;
 using BlazorEcommerce.Shared.Auth;
 using BlazorEcommerce.Shared.Constant;
@@ -13,7 +12,6 @@
 using System.Security.Claims;
 using System.Security.Cryptography;
 using System.Text;
-using System.Threading;
 
 namespace BlazorEcommerce.Identity.Service
 {
@@ -56,6 +54,8 @@ public async Task<IResponse> Login(UserLogin request)
 
                 string refreshToken = CreateRefreshToken();
 
+                await _userManager.RemoveLoginAsync(user, AuthenticatorStoreLoginProvider, refreshToken);
+
                 await _userManager.AddLoginAsync(user, new UserLoginInfo(AuthenticatorStoreLoginProvider, refreshToken, user.UserName));
 
                 await _userManager.SetAuthenticationTokenAsync(user, AuthenticatorStoreLoginProvider, AuthenticatorKeyTokenName, jwtToken);
@@ -91,6 +91,8 @@ public async Task<IResponse> RefreshToken(RefreshTokenRequest request)
 
             string refreshToken = CreateRefreshToken();
 
+            await _userManager.RemoveLoginAsync(user, AuthenticatorStoreLoginProvider, refreshToken);
+
             await _userManager.AddLoginAsync(user, new UserLoginInfo(AuthenticatorStoreLoginProvider, refreshToken, user.UserName));
 
             await _userManager.SetAuthenticationTokenAsync(user, AuthenticatorStoreLoginProvider, AuthenticatorKeyTokenName, jwtToken);
diff --git a/src/BlazorEcommerce.Infrastructure/Service/PaymentService.cs b/src/BlazorEcommerce.Infrastructure/Service/PaymentService.cs
@@ -30,13 +30,6 @@ public PaymentService(ICurrentUser currentUser, IOptions<StripeConfig> stripeCon
         }
 
 
-        //public PaymentService(ICurrentUser currentUser)
-        //{
-        //    StripeConfiguration.ApiKey = "sk_test_51KeFeXSJN18oZA5qDkeNlClNnS5A8xklAv5cvMUJHDRTZTQegBEO36BSpzpBp7gEHGgDUZKNlzmEvHDnhL1CmiRs00bfrcT737";
-
-        //    _currentUser = currentUser;
-        //}
-
         public async Task<IResponse> CreateCheckoutSession(List<CartProductResponse> products)
         {
             var lineItems = new List<SessionLineItemOptions>();
diff --git a/src/Presentation/Client/wwwroot/favicon.png b/src/Presentation/Client/wwwroot/favicon.png
diff --git a/src/Presentation/Client/wwwroot/icon-512.png b/src/Presentation/Client/wwwroot/icon-512.png
diff --git a/src/Presentation/Client/wwwroot/index.html b/src/Presentation/Client/wwwroot/index.html
@@ -8,13 +8,20 @@
     <base href="/" />
     <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
     <link href="css/app.css" rel="stylesheet" />
+    <link rel="icon" type="image/png" href="favicon.png" />
     <link href="BlazorEcommerce.Client.styles.css" rel="stylesheet" />
     <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
     <link href="_content/MudBlazor/MudBlazor.min.css" rel="stylesheet" />
 </head>
 
 <body>
-    <div id="app">Loading...</div>
+    <div id="app">
+        <svg class="loading-progress">
+            <circle r="40%" cx="50%" cy="50%" />
+            <circle r="40%" cx="50%" cy="50%" />
+        </svg>
+        <div class="loading-progress-text"></div>
+    </div>
 
     <!--<div id="blazor-error-ui">
         An unhandled error has occurred.
diff --git a/src/Presentation/Server/appsettings.json b/src/Presentation/Server/appsettings.json
@@ -6,7 +6,7 @@
     "Key": "kXpCDfN3E9+7pIoOO0d14BFoBeN8bcROxwdPrCCsfeY=",
     "Issuer": "BlazorEcommerce.Api",
     "Audience": "BlazorEcommerceUser",
-    "DurationInMinutes": 15
+    "DurationInMinutes": 60
   },
   "StripeSettings": {
     "Secret": "whsec_97ffacb1f4861c5c1d3b471259cea7c26ba8aaa6b103df80ccd9671e5794ce36",

Original file line number	Diff line number	Diff line change
`@@ -30,13 +30,6 @@ public PaymentService(ICurrentUser currentUser, IOptions<StripeConfig> stripeCon`
`30`	`30`	`}`
`31`	`31`
`32`	`32`
`33`		`- //public PaymentService(ICurrentUser currentUser)`
`34`		`- //{`
`35`		`- // StripeConfiguration.ApiKey = "sk_test_51KeFeXSJN18oZA5qDkeNlClNnS5A8xklAv5cvMUJHDRTZTQegBEO36BSpzpBp7gEHGgDUZKNlzmEvHDnhL1CmiRs00bfrcT737";`
`36`		`-`
`37`		`- // _currentUser = currentUser;`
`38`		`- //}`
`39`		`-`
`40`	`33`	`public async Task<IResponse> CreateCheckoutSession(List<CartProductResponse> products)`
`41`	`34`	`{`
`42`	`35`	`var lineItems = new List<SessionLineItemOptions>();`