Merge pull request #13093 from abpframework/openid-logout

Remove `Logout` page.

modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20220425082215_Initial.Designer.cs → modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20220623064459_Initial.Designer.cs

@@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore;
 namespace OpenIddict.Demo.Server.Migrations
 {
     [DbContext(typeof(ServerDbContext))]
-    [Migration("20220425082215_Initial")]
+    [Migration("20220623064459_Initial")]
     partial class Initial
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -21,7 +21,7 @@ namespace OpenIddict.Demo.Server.Migrations
 #pragma warning disable 612, 618
             modelBuilder
                 .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
-                .HasAnnotation("ProductVersion", "6.0.0")
+                .HasAnnotation("ProductVersion", "6.0.5")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
@@ -336,7 +336,8 @@ namespace OpenIddict.Demo.Server.Migrations
                         .HasColumnName("ExtraProperties");
 
                     b.Property<bool>("IsActive")
-                        .HasColumnType("bit");
+                        .HasColumnType("bit")
+                        .HasColumnName("IsActive");
 
                     b.Property<bool>("IsDeleted")
                         .ValueGeneratedOnAdd()
@@ -682,6 +683,9 @@ namespace OpenIddict.Demo.Server.Migrations
                     b.Property<string>("ClientSecret")
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<string>("ClientUri")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
                         .HasMaxLength(40)
@@ -732,6 +736,9 @@ namespace OpenIddict.Demo.Server.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("LastModifierId");
 
+                    b.Property<string>("LogoUri")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("Permissions")
                         .HasColumnType("nvarchar(max)");
 

modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20220425082215_Initial.cs → modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20220623064459_Initial.cs

@@ -237,6 +237,8 @@ namespace OpenIddict.Demo.Server.Migrations
                     RedirectUris = table.Column<string>(type: "nvarchar(max)", nullable: true),
                     Requirements = table.Column<string>(type: "nvarchar(max)", nullable: true),
                     Type = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
+                    ClientUri = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    LogoUri = table.Column<string>(type: "nvarchar(max)", nullable: true),
                     ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
                     ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
                     CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),

modules/openiddict/app/OpenIddict.Demo.Server/Migrations/ServerDbContextModelSnapshot.cs

@@ -19,7 +19,7 @@ namespace OpenIddict.Demo.Server.Migrations
 #pragma warning disable 612, 618
             modelBuilder
                 .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
-                .HasAnnotation("ProductVersion", "6.0.0")
+                .HasAnnotation("ProductVersion", "6.0.5")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
@@ -334,7 +334,8 @@ namespace OpenIddict.Demo.Server.Migrations
                         .HasColumnName("ExtraProperties");
 
                     b.Property<bool>("IsActive")
-                        .HasColumnType("bit");
+                        .HasColumnType("bit")
+                        .HasColumnName("IsActive");
 
                     b.Property<bool>("IsDeleted")
                         .ValueGeneratedOnAdd()
@@ -680,6 +681,9 @@ namespace OpenIddict.Demo.Server.Migrations
                     b.Property<string>("ClientSecret")
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<string>("ClientUri")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
                         .HasMaxLength(40)
@@ -730,6 +734,9 @@ namespace OpenIddict.Demo.Server.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("LastModifierId");
 
+                    b.Property<string>("LogoUri")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("Permissions")
                         .HasColumnType("nvarchar(max)");
 

modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/LogoutController.cs

@@ -10,21 +10,12 @@ namespace Volo.Abp.OpenIddict.Controllers;
 public class LogoutController : AbpOpenIdDictControllerBase
 {
     [HttpGet]
-    public virtual Task<IActionResult> GetAsync()
+    public virtual async Task<IActionResult> GetAsync()
     {
-        return Task.FromResult<IActionResult>(View("Logout"));
+        // Ask ASP.NET Core Identity to delete the local and external cookies created
-    }
+        // when the user agent is redirected from the external identity provider
-
+        // after a successful authentication flow (e.g Google or Facebook).
-    [HttpPost]
+        await SignInManager.SignOutAsync();
-    public virtual async Task<IActionResult> PostAsync()
-    {
-        if (await HasFormValueAsync("accept"))
-        {
-            // Ask ASP.NET Core Identity to delete the local and external cookies created
-            // when the user agent is redirected from the external identity provider
-            // after a successful authentication flow (e.g Google or Facebook).
-            await SignInManager.SignOutAsync();
-        }
 
         // Returning a SignOutResult will ask OpenIddict to redirect the user agent
         // to the post_logout_redirect_uri specified by the client application or to

modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Views/Logout/Logout.cshtml

@@ -1,22 +0,0 @@
-@using Microsoft.Extensions.Primitives
-@using Volo.Abp.OpenIddict.Localization
-@using Microsoft.AspNetCore.Mvc.Localization
-@model AuthorizeViewModel
-@inject IHtmlLocalizer<AbpOpenIddictResource> L
-
-<div class="jumbotron">
-    <h1>@L["LogOut"]</h1>
-    <p class="lead text-left">@L["AreYouSureYouWantToSignOut"]</p>
-
-    <form method="post" action="~/connect/logout">
-        @Html.AntiForgeryToken()
-        @* Flow the request parameters so they can be received by the LogoutPost action: *@
-        @foreach (var parameter in Context.Request.HasFormContentType ? (IEnumerable<KeyValuePair<string, StringValues>>) Context.Request.Form : Context.Request.Query)
-        {
-            <input type="hidden" name="@parameter.Key" value="@parameter.Value"/>
-        }
-
-        <input class="btn btn-primary" name="accept" type="submit" value="@L["Accept"]"/>
-        <input class="btn btn-danger ms-1" name="deny" type="submit" value="@L["Deny"]"/>
-    </form>
-</div>

modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo/Abp/OpenIddict/Localization/OpenIddict/el.json

@@ -10,8 +10,6 @@
     "DoYouWantToGrantAccessToYourData": "Θέλετε να παραχωρήσετε στον χρήστη {0} πρόσβαση στα δεδομένα σας;",
     "ScopesRequested": "Ζητούνται πεδία εφαρμογής",
     "Accept": "Αποδοχή",
-    "Deny": "Άρνηση",
+    "Deny": "Άρνηση"
-    "LogOut": "Αποσύνδεση",
-    "AreYouSureYouWantToSignOut": "Είστε βέβαιοι ότι θέλετε να αποσυνδεθείτε;"
   }
-}
+}

modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo/Abp/OpenIddict/Localization/OpenIddict/en.json

@@ -10,8 +10,6 @@
     "DoYouWantToGrantAccessToYourData": "Do you want to grant {0} access to your data?",
     "ScopesRequested": "Scopes requested",
     "Accept": "Accept",
-    "Deny": "Deny",
+    "Deny": "Deny"
-    "LogOut": "Log out",
-    "AreYouSureYouWantToSignOut": "Are you sure you want to sign out?"
   }
 }

modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo/Abp/OpenIddict/Localization/OpenIddict/pt-BR.json

@@ -10,8 +10,6 @@
     "DoYouWantToGrantAccessToYourData": "Deseja permitir {0} acesse seus dados?",
     "ScopesRequested": "Escopo solicitado",
     "Accept": "Aceitar",
-    "Deny": "Negar",
+    "Deny": "Negar"
-    "LogOut": "Sair",
-    "AreYouSureYouWantToSignOut": "Tem certeza que deseja sair?"
   }
-}
+}

modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo/Abp/OpenIddict/Localization/OpenIddict/tr.json

@@ -10,8 +10,6 @@
     "DoYouWantToGrantAccessToYourData": "Do you want to grant {0} access to your data?",
     "ScopesRequested": "İstenen kapsamlar",
     "Accept": "Kabul etmek",
-    "Deny": "Reddetmek",
+    "Deny": "Reddetmek"
-    "LogOut": "Çıkış Yap",
-    "AreYouSureYouWantToSignOut": "Çıkış yapmak istediğinden emin misin?"
   }
 }

modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo/Abp/OpenIddict/Localization/OpenIddict/zh-Hans.json

@@ -10,8 +10,6 @@
     "DoYouWantToGrantAccessToYourData": "是否要授予 {0} 访问你的数据的权限?",
     "ScopesRequested": "要求的Scope",
     "Accept": "同意",
-    "Deny": "拒绝",
+    "Deny": "拒绝"
-    "LogOut": "注销",
-    "AreYouSureYouWantToSignOut": "你确定要退出吗?"
   }
 }

modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo/Abp/OpenIddict/Localization/OpenIddict/zh-Hant.json

@@ -11,8 +11,6 @@
     "DoYouWantToGrantAccessToYourData": "是否要授予 {0} 訪問你的數據的權限?",
     "ScopesRequested": "要求的Scope",
     "Accept": "接受",
-    "Deny": "拒絕",
+    "Deny": "拒絕"
-    "LogOut": "註銷",
-    "AreYouSureYouWantToSignOut": "你確定要退出嗎?"
   }
 }