NSwag upgraded

.nuget/nuget.config

@@ -1,5 +0,0 @@
-<configuration>
-  <packageSources>
-    <add key="Qooroo" value="https://www.myget.org/F/qooroo/api/v2" />
-  </packageSources>
-</configuration>

src/Squidex.Core/project.json

@@ -1,9 +1,9 @@
 {
   "dependencies": {
-    "NETStandard.Library": "1.6.0",
     "NodaTime": "2.0.0-alpha20160729",
     "Squidex.Infrastructure": "1.0.0-*",
-    "protobuf-net": "2.1.0"
+    "protobuf-net": "2.1.0",
+    "NETStandard.Library": "1.6.1"
   },
   "frameworks": {
     "netcoreapp1.0": {

src/Squidex.Events/project.json

@@ -2,7 +2,7 @@
   "version": "1.0.0-*",
 
   "dependencies": {
-    "NETStandard.Library": "1.6.0",
+    "NETStandard.Library": "1.6.1",
     "NodaTime": "2.0.0-alpha20160729",
     "Squidex.Core": "1.0.0-*",
     "Squidex.Infrastructure": "1.0.0-*"

src/Squidex.Infrastructure/project.json

@@ -4,7 +4,7 @@
     "Autofac": "4.2.1",
     "EventStore.ClientAPI.NetCore": "0.0.1-alpha",
     "Microsoft.Extensions.Logging": "1.1.0",
-    "NETStandard.Library": "1.6.0",
+    "NETStandard.Library": "1.6.1",
     "Newtonsoft.Json": "9.0.2-beta1",
     "NodaTime": "2.0.0-alpha20160729",
     "protobuf-net": "2.1.0",

src/Squidex.Read/project.json

@@ -4,7 +4,7 @@
   "dependencies": {
     "Microsoft.Extensions.Caching.Memory": "1.1.0",
     "MongoDB.Driver": "2.4.0",
-    "NETStandard.Library": "1.6.0",
+    "NETStandard.Library": "1.6.1",
     "NodaTime": "2.0.0-alpha20160729",
     "Squidex.Core": "1.0.0-*",
     "Squidex.Events": "1.0.0-*",

src/Squidex.Store.MongoDb/project.json

@@ -5,7 +5,7 @@
     "Microsoft.AspNetCore.Identity": "1.1.0",
     "Microsoft.AspNetCore.Identity.MongoDB": "1.0.2",
     "MongoDB.Driver": "2.4.0",
-    "NETStandard.Library": "1.6.0",
+    "NETStandard.Library": "1.6.1",
     "Squidex.Core": "1.0.0-*",
     "Squidex.Events": "1.0.0-*",
     "Squidex.Infrastructure": "1.0.0-*",

src/Squidex.Write/project.json

@@ -3,7 +3,7 @@
 
   "dependencies": {
     "Microsoft.AspNetCore.Identity": "1.1.0",
-    "NETStandard.Library": "1.6.0",
+    "NETStandard.Library": "1.6.1",
     "NodaTime": "2.0.0-alpha20160729",
     "Squidex.Core": "1.0.0-*",
     "Squidex.Events": "1.0.0-*",

src/Squidex/Config/Identity/IdentityServices.cs

@@ -40,17 +40,21 @@ namespace Squidex.Config.Identity
             }
 
             services.AddSingleton(
-                GetScopes());
+                GetApiResources());
+            services.AddSingleton(
+                GetIdentityResources());
             services.AddSingleton<IClientStore,
                 LazyClientStore>();
-            services.AddSingleton<IScopeStore,
+            services.AddSingleton<IResourceStore,
-                InMemoryScopeStore>();
+                InMemoryResourcesStore>();
 
             services.AddIdentityServer(options =>
                 {
                     options.UserInteractionOptions.ErrorUrl = "/account/error/";
                 })
-                .SetSigningCredential(certificate)
+                .AddInMemoryApiResources(GetApiResources())
+                .AddInMemoryIdentityResources(GetIdentityResources())
+                .AddSigningCredential(certificate)
                 .AddAspNetIdentity<IdentityUser>();
 
             return services;
@@ -64,26 +68,21 @@ namespace Squidex.Config.Identity
             return services;
         }
 
-        public static IEnumerable<Scope> GetScopes()
+        private static IEnumerable<ApiResource> GetApiResources()
-        {
-            return new List<Scope>
-            {
-                StandardScopes.OpenId,
-                StandardScopes.Profile,
-                new Scope
-                {
-                    Name = Constants.ProfileScope, Type = ScopeType.Identity,
-                    Claims = new List<ScopeClaim>
         {
-                        new ScopeClaim(ExtendedClaimTypes.SquidexDisplayName, true),
+            yield return new ApiResource(Constants.ApiScope);
-                        new ScopeClaim(ExtendedClaimTypes.SquidexPictureUrl, true)
         }
-                },
+
-                new Scope
+        private static IEnumerable<IdentityResource> GetIdentityResources()
         {
-                    Name = Constants.ApiScope, Type = ScopeType.Resource
+            yield return new IdentityResources.OpenId();
-                }
+            yield return new IdentityResources.Profile();
-            };
+            yield return new IdentityResource(Constants.ProfileScope,
+                new[]
+                {
+                    ExtendedClaimTypes.SquidexDisplayName,
+                    ExtendedClaimTypes.SquidexPictureUrl
+                });
         }
     }
 }

src/Squidex/Config/Identity/IdentityUsage.cs

@@ -100,8 +100,8 @@ namespace Squidex.Config.Identity
                 app.UseIdentityServerAuthentication(new IdentityServerAuthenticationOptions
                 {
                     Authority = apiAuthorityUrl,
-                    ScopeName = apiScope,
+                    ApiName = apiScope,
-                    ScopeSecret = null,
+                    ApiSecret = null,
                     RequireHttpsMetadata = identityOptions.RequiresHttps
                 });
             }

src/Squidex/Config/Identity/LazyClientStore.cs

@@ -10,6 +10,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using IdentityServer4;
 using IdentityServer4.Models;
 using IdentityServer4.Stores;
 using Microsoft.Extensions.Options;
@@ -111,8 +112,8 @@ namespace Squidex.Config.Identity
                 AllowedGrantTypes = GrantTypes.Implicit,
                 AllowedScopes = new List<string>
                 {
-                    StandardScopes.OpenId.Name,
+                    IdentityServerConstants.StandardScopes.OpenId,
-                    StandardScopes.Profile.Name,
+                    IdentityServerConstants.StandardScopes.Profile,
                     Constants.ApiScope,
                     Constants.ProfileScope
                 },

src/Squidex/Controllers/Api/Schemas/Models/Fields/NumberField.cs

@@ -6,11 +6,13 @@
 //  All rights reserved.
 // ==========================================================================
 
+using NJsonSchema.Annotations;
 using Squidex.Core.Schemas;
 using Squidex.Infrastructure.Reflection;
 
 namespace Squidex.Controllers.Api.Schemas.Models.Fields
 {
+    [JsonSchema("Number")]
     public sealed class NumberField : FieldPropertiesDto
     {
         /// <summary>

src/Squidex/Controllers/Api/Schemas/Models/Fields/StringField.cs

@@ -6,11 +6,13 @@
 //  All rights reserved.
 // ==========================================================================
 
+using NJsonSchema.Annotations;
 using Squidex.Core.Schemas;
 using Squidex.Infrastructure.Reflection;
 
 namespace Squidex.Controllers.Api.Schemas.Models.Fields
 {
+    [JsonSchema("String")]
     public sealed class StringField : FieldPropertiesDto
     {
         /// <summary>

src/Squidex/project.json

@@ -27,7 +27,7 @@
       "type": "platform"
     },
     "MongoDB.Driver": "2.4.0",
-"NJsonSchema": "6.5.6190.16910",
+    "NJsonSchema": "6.3.6185.19861",
     "NSwag.AspNetCore": "8.0.0",
     "OpenCover": "4.6.519",
     "ReportGenerator": "2.5.2-beta2",

tests/Squidex.Infrastructure.Tests/TypeNameAttributeTest.cs

@@ -1,7 +1,11 @@
-using System;
+// ==========================================================================
-using System.Collections.Generic;
+//  TypeNameAttributeTest.cs
-using System.Linq;
+//  Squidex Headless CMS
-using System.Threading.Tasks;
+// ==========================================================================
+//  Copyright (c) Squidex Group
+//  All rights reserved.
+// ==========================================================================
+
 using Xunit;
 
 namespace Squidex.Infrastructure