correcao deps

Author: brunobritodev

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v1.4.5
+
+1. Updated for IdentityServer4 dependencies for 2.5.
+
 # v1.4.0
 1. Added Translations (auto-generate)
    * Spanish

src/Backend/Jp.Domain/Jp.Domain.csproj

@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentValidation" Version="8.4.0" />
-    <PackageReference Include="IdentityServer4.EntityFramework" Version="2.4.0" />
+    <PackageReference Include="IdentityServer4.EntityFramework" Version="2.5.0" />
   </ItemGroup>
 
 </Project>

src/Backend/Jp.Infra.CrossCutting.IdentityServer/Jp.Infra.CrossCutting.IdentityServer.csproj

@@ -13,7 +13,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.4.0" />
+    <PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.5.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
   </ItemGroup>
 

src/Backend/Jp.UserManagement/Jp.Management.csproj

@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="IdentityServer4" Version="2.4.0" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="6.1.1" />
+    <PackageReference Include="IdentityServer4" Version="2.5.0" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.7.0" />
     <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.7.1" />

src/Backend/Jp.UserManagement/appsettings.json

@@ -1,9 +1,9 @@
 {
   "ConnectionStrings": {
     // Postgre Connection
-    //"SSOConnection": "Server=localhost;Port=5432;Database=jpproject;User Id=postgres;Password=@Password1;"
+    "SSOConnection": "Server=localhost;Port=5432;Database=jpproject;User Id=postgres;Password=@Password1;"
     // Sql Server connection
-     "SSOConnection": "Server=.;Initial Catalog=JpProject;Persist Security Info=False;User ID=sa;Password=@Password1;MultipleActiveResultSets=False;Connection Timeout=30;"
+     //"SSOConnection": "Server=.;Initial Catalog=JpProject;Persist Security Info=False;User ID=sa;Password=@Password1;MultipleActiveResultSets=False;Connection Timeout=30;"
     // MySql connection
     // "SSOConnection": "server=localhost,port=3306;database=jpproject;user=bruno;password=10203040"
   },
@@ -30,7 +30,7 @@
     "SendEmail": "false"
   },
   "ApplicationSettings": {
-    "DatabaseType": "MySql",
+    "DatabaseType": "PostgreSQL",
     "Authority": "https://localhost:5001"
   }
 }

src/Frontend/Jp.AdminUI/package-lock.json

@@ -82,6 +82,7 @@
     "spinkit": "1.2.5",
     "summernote": "^0.8.11",
     "sweetalert": "2.1.2",
+    "sweetalert2": "^8.14.0",
     "weather-icons": "1.3.2",
     "web-animations-js": "^2.3.1",
     "zone.js": "^0.9.1"
@@ -111,7 +112,7 @@
     "protractor": "5.4.2",
     "ts-node": "^8.3.0",
     "tslint": "^5.14.0",
-    "typescript": "3.5.3",
+    "typescript": ">=3.4.0 <3.5.0",
     "webdriver-manager": "12.1.5"
   }
 }

src/Frontend/Jp.AdminUI/package.json

@@ -10,4 +10,5 @@ export const authProdConfig: AuthConfig = {
     scope: "openid profile email jp_api.is4",
     sessionChecksEnabled: true,
     clearHashAfterLogin: false, // https://github.com/manfredsteyer/angular-oauth2-oidc/issues/457#issuecomment-431807040
+    waitForTokenInMsec: 5000
 };

src/Frontend/Jp.AdminUI/src/app/core/auth/auth-config.prod.ts

@@ -13,4 +13,5 @@ export const authConfig: AuthConfig = {
     sessionChecksEnabled: true,
     showDebugInformation: true, // Also requires enabling "Verbose" level in devtools
     clearHashAfterLogin: false, // https://github.com/manfredsteyer/angular-oauth2-oidc/issues/457#issuecomment-431807040
+    waitForTokenInMsec: 5000
 };

src/Frontend/Jp.AdminUI/src/app/core/auth/auth-config.ts

@@ -3,7 +3,7 @@ import { TranslatorService } from "@core/translator/translator.service";
 import { ApiResourceService } from "../api-resource.service";
 import { ApiResource } from "@shared/viewModel/api-resource.model";
 import { DefaultResponse } from "@shared/viewModel/default-response.model";
-const swal = require('sweetalert');
+import Swal from 'sweetalert2'
 
 @Component({
     selector: "app-api-resources-list",
@@ -29,35 +29,33 @@ export class ApiResourceListComponent implements OnInit {
 
     public remove(name: string) {
         this.translator.translate.get('apiResource.remove').subscribe(m => {
-            swal({
+            Swal.fire({
                 title: m['title'],
                 text: m["text"],
                 type: 'warning',
                 showCancelButton: true,
                 confirmButtonColor: '#DD6B55',
                 confirmButtonText: m["confirmButtonText"],
-                cancelButtonText: m["cancelButtonText"],
-                closeOnConfirm: false,
-                closeOnCancel: false
-            }, (isConfirm) => {
-                if (isConfirm) {
+                cancelButtonText: m["cancelButtonText"]
+            }).then(isConfirm => {
+                if (isConfirm.value) {
 
                     this.apiResourceservice.remove(name).subscribe(
                         registerResult => {
                             if (registerResult.data) {
                                 this.loadResources();
-                                swal("Deleted!", m["deleted"], 'success');
+                                Swal.fire("Deleted!", m["deleted"], 'success');
                             }
                         },
                         err => {
                             let errors = DefaultResponse.GetErrors(err).map(a => a.value);
-                            swal("Error!", errors[0], 'error');
+                            Swal.fire("Error!", errors[0], 'error');
                         }
                     );
 
 
                 } else {
-                    swal("Cancelled", m["cancelled"], 'error');
+                    Swal.fire("Cancelled", m["cancelled"], 'error');
                 }
             });
         });