[PM-5294][deps]: Update Duende.IdentityServer to v6.3.7 (#3499)

* [deps]: Update Duende.IdentityServer to v6.3.6

* Fix test

* Grant table changes

* Reassert view

* EF migrations

* Restore non-null key and simpler index

* Master SQL sync

* Lint

* Fix ID setting since the property isn't exposed

* Bump to .7

* Point to new Duende package

* Drop unused indexes first

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Matt Bishop <mbishop@bitwarden.com>

util/MySqlMigrations/Migrations/20231214162533_GrantIdWithIndexes.cs

@@ -0,0 +1,150 @@
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Bit.MySqlMigrations.Migrations;
+
+/// <inheritdoc />
+public partial class GrantIdWithIndexes : Migration
+{
+    /// <inheritdoc />
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropPrimaryKey(
+            name: "PK_Grant",
+            table: "Grant");
+
+        migrationBuilder.UpdateData(
+            table: "Grant",
+            keyColumn: "Type",
+            keyValue: null,
+            column: "Type",
+            value: "");
+
+        migrationBuilder.AlterColumn<string>(
+            name: "Type",
+            table: "Grant",
+            type: "varchar(50)",
+            maxLength: 50,
+            nullable: false,
+            oldClrType: typeof(string),
+            oldType: "varchar(50)",
+            oldMaxLength: 50,
+            oldNullable: true)
+            .Annotation("MySql:CharSet", "utf8mb4")
+            .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+        migrationBuilder.UpdateData(
+            table: "Grant",
+            keyColumn: "Data",
+            keyValue: null,
+            column: "Data",
+            value: "");
+
+        migrationBuilder.AlterColumn<string>(
+            name: "Data",
+            table: "Grant",
+            type: "longtext",
+            nullable: false,
+            oldClrType: typeof(string),
+            oldType: "longtext",
+            oldNullable: true)
+            .Annotation("MySql:CharSet", "utf8mb4")
+            .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+        migrationBuilder.UpdateData(
+            table: "Grant",
+            keyColumn: "ClientId",
+            keyValue: null,
+            column: "ClientId",
+            value: "");
+
+        migrationBuilder.AlterColumn<string>(
+            name: "ClientId",
+            table: "Grant",
+            type: "varchar(200)",
+            maxLength: 200,
+            nullable: false,
+            oldClrType: typeof(string),
+            oldType: "varchar(200)",
+            oldMaxLength: 200,
+            oldNullable: true)
+            .Annotation("MySql:CharSet", "utf8mb4")
+            .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+        migrationBuilder.AddColumn<int>(
+            name: "Id",
+            table: "Grant",
+            type: "int",
+            nullable: false,
+            defaultValue: 0)
+            .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+        migrationBuilder.AddPrimaryKey(
+            name: "PK_Grant",
+            table: "Grant",
+            column: "Id");
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Grant_Key",
+            table: "Grant",
+            column: "Key",
+            unique: true);
+    }
+
+    /// <inheritdoc />
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropPrimaryKey(
+            name: "PK_Grant",
+            table: "Grant");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Grant_Key",
+            table: "Grant");
+
+        migrationBuilder.DropColumn(
+            name: "Id",
+            table: "Grant");
+
+        migrationBuilder.AlterColumn<string>(
+            name: "Type",
+            table: "Grant",
+            type: "varchar(50)",
+            maxLength: 50,
+            nullable: true,
+            oldClrType: typeof(string),
+            oldType: "varchar(50)",
+            oldMaxLength: 50)
+            .Annotation("MySql:CharSet", "utf8mb4")
+            .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+        migrationBuilder.AlterColumn<string>(
+            name: "Data",
+            table: "Grant",
+            type: "longtext",
+            nullable: true,
+            oldClrType: typeof(string),
+            oldType: "longtext")
+            .Annotation("MySql:CharSet", "utf8mb4")
+            .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+        migrationBuilder.AlterColumn<string>(
+            name: "ClientId",
+            table: "Grant",
+            type: "varchar(200)",
+            maxLength: 200,
+            nullable: true,
+            oldClrType: typeof(string),
+            oldType: "varchar(200)",
+            oldMaxLength: 200)
+            .Annotation("MySql:CharSet", "utf8mb4")
+            .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+        migrationBuilder.AddPrimaryKey(
+            name: "PK_Grant",
+            table: "Grant",
+            column: "Key");
+    }
+}

util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs

@@ -475,11 +475,12 @@ namespace Bit.MySqlMigrations.Migrations
 
             modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.Grant", b =>
                 {
-                    b.Property<string>("Key")
-                        .HasMaxLength(200)
-                        .HasColumnType("varchar(200)");
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
 
                     b.Property<string>("ClientId")
+                        .IsRequired()
                         .HasMaxLength(200)
                         .HasColumnType("varchar(200)");
 
@@ -490,6 +491,7 @@ namespace Bit.MySqlMigrations.Migrations
                         .HasColumnType("datetime(6)");
 
                     b.Property<string>("Data")
+                        .IsRequired()
                         .HasColumnType("longtext");
 
                     b.Property<string>("Description")
@@ -499,6 +501,11 @@ namespace Bit.MySqlMigrations.Migrations
                     b.Property<DateTime?>("ExpirationDate")
                         .HasColumnType("datetime(6)");
 
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
                     b.Property<string>("SessionId")
                         .HasMaxLength(100)
                         .HasColumnType("varchar(100)");
@@ -508,10 +515,15 @@ namespace Bit.MySqlMigrations.Migrations
                         .HasColumnType("varchar(200)");
 
                     b.Property<string>("Type")
+                        .IsRequired()
                         .HasMaxLength(50)
                         .HasColumnType("varchar(50)");
 
-                    b.HasKey("Key");
+                    b.HasKey("Id")
+                        .HasAnnotation("SqlServer:Clustered", true);
+
+                    b.HasIndex("Key")
+                        .IsUnique();
 
                     b.ToTable("Grant", (string)null);
                 });