/// Models loading the HTML for a view.
diff --git a/source/Core/Services/DefaultViewService/PageAssets/welcome.html b/source/Core/Services/DefaultViewService/PageAssets/welcome.html
index 75aba6eef..b650816f8 100644
--- a/source/Core/Services/DefaultViewService/PageAssets/welcome.html
+++ b/source/Core/Services/DefaultViewService/PageAssets/welcome.html
@@ -49,7 +49,7 @@
Here are links to the
documentation,
- and ready to use samples.
+ and ready to use samples.
diff --git a/source/Core/Services/DefaultViewService/ResourceCache.cs b/source/Core/Services/DefaultViewService/ResourceCache.cs
index d613e4fca..dcb904978 100644
--- a/source/Core/Services/DefaultViewService/ResourceCache.cs
+++ b/source/Core/Services/DefaultViewService/ResourceCache.cs
@@ -19,7 +19,7 @@
using System.Collections.Concurrent;
using System.ComponentModel;
-namespace Thinktecture.IdentityServer.Core.Services.Default
+namespace IdentityServer3.Core.Services.Default
{
///
/// In-memory cache used by the view service
diff --git a/source/Core/Services/ExternalClaimsFilter/AggregateExternalClaimsFilter.cs b/source/Core/Services/ExternalClaimsFilter/AggregateExternalClaimsFilter.cs
index b2176a733..a36496870 100644
--- a/source/Core/Services/ExternalClaimsFilter/AggregateExternalClaimsFilter.cs
+++ b/source/Core/Services/ExternalClaimsFilter/AggregateExternalClaimsFilter.cs
@@ -17,7 +17,7 @@
using System.Collections.Generic;
using System.Security.Claims;
-namespace Thinktecture.IdentityServer.Core.Services.Default
+namespace IdentityServer3.Core.Services.Default
{
///
/// Claims filter to aggregate other claims filters.
diff --git a/source/Core/Services/ExternalClaimsFilter/ClaimsFilterBase.cs b/source/Core/Services/ExternalClaimsFilter/ClaimsFilterBase.cs
index 5476723b9..c5be9a7f0 100644
--- a/source/Core/Services/ExternalClaimsFilter/ClaimsFilterBase.cs
+++ b/source/Core/Services/ExternalClaimsFilter/ClaimsFilterBase.cs
@@ -17,7 +17,7 @@
using System.Collections.Generic;
using System.Security.Claims;
-namespace Thinktecture.IdentityServer.Core.Services.Default
+namespace IdentityServer3.Core.Services.Default
{
///
/// Base external claims filter implementation. Will only execute for the configured provider and
diff --git a/source/Core/Services/ExternalClaimsFilter/ExternalClaimsFilterUserService.cs b/source/Core/Services/ExternalClaimsFilter/ExternalClaimsFilterUserService.cs
index f66aa1d47..75749b17e 100644
--- a/source/Core/Services/ExternalClaimsFilter/ExternalClaimsFilterUserService.cs
+++ b/source/Core/Services/ExternalClaimsFilter/ExternalClaimsFilterUserService.cs
@@ -14,13 +14,13 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System;
using System.Collections.Generic;
using System.Security.Claims;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services.Default
+namespace IdentityServer3.Core.Services.Default
{
internal class ExternalClaimsFilterUserService : IUserService
{
diff --git a/source/Core/Services/ExternalClaimsFilter/FacebookClaimsFilter.cs b/source/Core/Services/ExternalClaimsFilter/FacebookClaimsFilter.cs
index 03751319a..24258ffdf 100644
--- a/source/Core/Services/ExternalClaimsFilter/FacebookClaimsFilter.cs
+++ b/source/Core/Services/ExternalClaimsFilter/FacebookClaimsFilter.cs
@@ -18,7 +18,7 @@
using System.Linq;
using System.Security.Claims;
-namespace Thinktecture.IdentityServer.Core.Services.Default
+namespace IdentityServer3.Core.Services.Default
{
///
/// Claims filter for facebook. Converts the "urn:facebook:name" claim to the "name" claim.
diff --git a/source/Core/Services/ExternalClaimsFilter/IgnoreClaimsFilter.cs b/source/Core/Services/ExternalClaimsFilter/IgnoreClaimsFilter.cs
index f833a7d2c..78bdbbb9b 100644
--- a/source/Core/Services/ExternalClaimsFilter/IgnoreClaimsFilter.cs
+++ b/source/Core/Services/ExternalClaimsFilter/IgnoreClaimsFilter.cs
@@ -18,7 +18,7 @@
using System.Linq;
using System.Security.Claims;
-namespace Thinktecture.IdentityServer.Core.Services.Default
+namespace IdentityServer3.Core.Services.Default
{
///
/// Implementation of claims filter that filters out the claim types indicated.
diff --git a/source/Core/Services/ExternalClaimsFilter/NopClaimsFilter.cs b/source/Core/Services/ExternalClaimsFilter/NopClaimsFilter.cs
index 827b40c89..36515be4b 100644
--- a/source/Core/Services/ExternalClaimsFilter/NopClaimsFilter.cs
+++ b/source/Core/Services/ExternalClaimsFilter/NopClaimsFilter.cs
@@ -17,7 +17,7 @@
using System.Collections.Generic;
using System.Security.Claims;
-namespace Thinktecture.IdentityServer.Core.Services.Default
+namespace IdentityServer3.Core.Services.Default
{
internal class NopClaimsFilter : IExternalClaimsFilter
{
diff --git a/source/Core/Services/ExternalClaimsFilter/NormalizingClaimsFilter.cs b/source/Core/Services/ExternalClaimsFilter/NormalizingClaimsFilter.cs
index f303e94a9..bfcd797eb 100644
--- a/source/Core/Services/ExternalClaimsFilter/NormalizingClaimsFilter.cs
+++ b/source/Core/Services/ExternalClaimsFilter/NormalizingClaimsFilter.cs
@@ -14,11 +14,11 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Configuration.Hosting;
using System.Collections.Generic;
using System.Security.Claims;
-using Thinktecture.IdentityServer.Core.Configuration.Hosting;
-namespace Thinktecture.IdentityServer.Core.Services.Default
+namespace IdentityServer3.Core.Services.Default
{
///
/// Claims filter to convert from WIF claim types to OpenID Connect claim types.
diff --git a/source/Core/Services/ExternalClaimsFilter/TwitterClaimsFilter.cs b/source/Core/Services/ExternalClaimsFilter/TwitterClaimsFilter.cs
index 9993485de..945aebcb8 100644
--- a/source/Core/Services/ExternalClaimsFilter/TwitterClaimsFilter.cs
+++ b/source/Core/Services/ExternalClaimsFilter/TwitterClaimsFilter.cs
@@ -18,7 +18,7 @@
using System.Linq;
using System.Security.Claims;
-namespace Thinktecture.IdentityServer.Core.Services.Default
+namespace IdentityServer3.Core.Services.Default
{
///
/// Claims filter for twitter. Filters out the "urn:twitter:userid" claim.
diff --git a/source/Core/Services/IAuthorizationCodeStore.cs b/source/Core/Services/IAuthorizationCodeStore.cs
index 72a913f36..6f208f98b 100644
--- a/source/Core/Services/IAuthorizationCodeStore.cs
+++ b/source/Core/Services/IAuthorizationCodeStore.cs
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-using Thinktecture.IdentityServer.Core.Models;
+using IdentityServer3.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Abstraction for storing authorization codes
diff --git a/source/Core/Services/ICache.cs b/source/Core/Services/ICache.cs
index ff6f648cb..abb22dc14 100644
--- a/source/Core/Services/ICache.cs
+++ b/source/Core/Services/ICache.cs
@@ -16,7 +16,7 @@
using System.Threading.Tasks;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Abstract interface to model data caching
diff --git a/source/Core/Services/IClaimsProvider.cs b/source/Core/Services/IClaimsProvider.cs
index 3850811c9..d79b6d8e4 100644
--- a/source/Core/Services/IClaimsProvider.cs
+++ b/source/Core/Services/IClaimsProvider.cs
@@ -14,13 +14,13 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
+using IdentityServer3.Core.Validation;
using System.Collections.Generic;
using System.Security.Claims;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-using Thinktecture.IdentityServer.Core.Validation;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// The claims provider is responsible for determining which claims to include in tokens
diff --git a/source/Core/Services/IClientPermissionsService.cs b/source/Core/Services/IClientPermissionsService.cs
index c7dba444a..cee0dc3da 100644
--- a/source/Core/Services/IClientPermissionsService.cs
+++ b/source/Core/Services/IClientPermissionsService.cs
@@ -14,11 +14,11 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Collections.Generic;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Service to allow a subject to query and revoke client permissions.
diff --git a/source/Core/Services/IClientSecretValidator.cs b/source/Core/Services/IClientSecretValidator.cs
index 32bdf1b27..4c865f7de 100644
--- a/source/Core/Services/IClientSecretValidator.cs
+++ b/source/Core/Services/IClientSecretValidator.cs
@@ -14,10 +14,10 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Abstraction for client secret validation
diff --git a/source/Core/Services/IClientStore.cs b/source/Core/Services/IClientStore.cs
index 930a442e5..d2f27b83d 100644
--- a/source/Core/Services/IClientStore.cs
+++ b/source/Core/Services/IClientStore.cs
@@ -14,10 +14,10 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Retrieval of client configuration
diff --git a/source/Core/Services/IClientValidator.cs b/source/Core/Services/IClientValidator.cs
index 935834aa7..0929c6856 100644
--- a/source/Core/Services/IClientValidator.cs
+++ b/source/Core/Services/IClientValidator.cs
@@ -14,11 +14,11 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Validation;
using System.Collections.Generic;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Validation;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// The client validator turn some credential on an incoming HTTP request into a Client
diff --git a/source/Core/Services/IConsentService.cs b/source/Core/Services/IConsentService.cs
index b12830c69..55d095674 100644
--- a/source/Core/Services/IConsentService.cs
+++ b/source/Core/Services/IConsentService.cs
@@ -14,12 +14,12 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Collections.Generic;
using System.Security.Claims;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Service to retrieve and update consent.
diff --git a/source/Core/Services/IConsentStore.cs b/source/Core/Services/IConsentStore.cs
index bc8fcb86f..f9611362e 100644
--- a/source/Core/Services/IConsentStore.cs
+++ b/source/Core/Services/IConsentStore.cs
@@ -14,10 +14,10 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Models persisting user consent
diff --git a/source/Core/Services/ICorsPolicyService.cs b/source/Core/Services/ICorsPolicyService.cs
index 2fb585b73..db2e6fc46 100644
--- a/source/Core/Services/ICorsPolicyService.cs
+++ b/source/Core/Services/ICorsPolicyService.cs
@@ -15,7 +15,7 @@
*/
using System.Threading.Tasks;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Service that determines if CORS is allowed.
diff --git a/source/Core/Services/ICustomGrantValidator.cs b/source/Core/Services/ICustomGrantValidator.cs
index 87c2d43b6..a9f5c3640 100644
--- a/source/Core/Services/ICustomGrantValidator.cs
+++ b/source/Core/Services/ICustomGrantValidator.cs
@@ -14,10 +14,10 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Validation;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Validation;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Handles validation of token requests using custom grant types
diff --git a/source/Core/Services/ICustomRequestValidator.cs b/source/Core/Services/ICustomRequestValidator.cs
index e5e787670..274efe9c3 100644
--- a/source/Core/Services/ICustomRequestValidator.cs
+++ b/source/Core/Services/ICustomRequestValidator.cs
@@ -14,10 +14,10 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Validation;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Validation;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Allows inserting custom validation logic into authorize and token requests
diff --git a/source/Core/Services/ICustomTokenValidator.cs b/source/Core/Services/ICustomTokenValidator.cs
index 422619607..595254426 100644
--- a/source/Core/Services/ICustomTokenValidator.cs
+++ b/source/Core/Services/ICustomTokenValidator.cs
@@ -14,10 +14,10 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Validation;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Validation;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Allows inserting custom token validation logic
diff --git a/source/Core/Services/IDependencyResolver.cs b/source/Core/Services/IDependencyResolver.cs
index b09de3c99..e24918ab9 100644
--- a/source/Core/Services/IDependencyResolver.cs
+++ b/source/Core/Services/IDependencyResolver.cs
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Allows resolving dependencies from the dependency injection system.
diff --git a/source/Core/Services/IEventService.cs b/source/Core/Services/IEventService.cs
index fb9170fe0..835c1aba6 100644
--- a/source/Core/Services/IEventService.cs
+++ b/source/Core/Services/IEventService.cs
@@ -14,10 +14,10 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Events;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Events;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Models a recipient of notification of events
diff --git a/source/Core/Services/IExternalClaimsFilter.cs b/source/Core/Services/IExternalClaimsFilter.cs
index 3f244d449..15ea511d0 100644
--- a/source/Core/Services/IExternalClaimsFilter.cs
+++ b/source/Core/Services/IExternalClaimsFilter.cs
@@ -17,7 +17,7 @@
using System.Collections.Generic;
using System.Security.Claims;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Models a mechanism for claims transformation for claims provided from external identity providers.
diff --git a/source/Core/Services/ILocalizationService.cs b/source/Core/Services/ILocalizationService.cs
index e8e848709..f616bc5cd 100644
--- a/source/Core/Services/ILocalizationService.cs
+++ b/source/Core/Services/ILocalizationService.cs
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Models loading localizable strings.
diff --git a/source/Core/Services/IPermissionStore.cs b/source/Core/Services/IPermissionStore.cs
index d7890b636..a39d8666d 100644
--- a/source/Core/Services/IPermissionStore.cs
+++ b/source/Core/Services/IPermissionStore.cs
@@ -14,11 +14,11 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Collections.Generic;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Models storage of a subject's permissions for clients.
diff --git a/source/Core/Services/IRedirectUriValidator.cs b/source/Core/Services/IRedirectUriValidator.cs
index bfcf06325..c462c52f2 100644
--- a/source/Core/Services/IRedirectUriValidator.cs
+++ b/source/Core/Services/IRedirectUriValidator.cs
@@ -14,10 +14,10 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Models the logic when validating redirect and post logout redirect URIs.
diff --git a/source/Core/Services/IRefreshTokenService.cs b/source/Core/Services/IRefreshTokenService.cs
index 4936db938..ef70822e9 100644
--- a/source/Core/Services/IRefreshTokenService.cs
+++ b/source/Core/Services/IRefreshTokenService.cs
@@ -14,10 +14,10 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Implements refresh token creation and validation
diff --git a/source/Core/Services/IRefreshTokenStore.cs b/source/Core/Services/IRefreshTokenStore.cs
index 2ee65a4ae..450ef69c1 100644
--- a/source/Core/Services/IRefreshTokenStore.cs
+++ b/source/Core/Services/IRefreshTokenStore.cs
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-using Thinktecture.IdentityServer.Core.Models;
+using IdentityServer3.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Refresh token storage
diff --git a/source/Core/Services/IScopeStore.cs b/source/Core/Services/IScopeStore.cs
index 0fb74a9c5..3ea89d922 100644
--- a/source/Core/Services/IScopeStore.cs
+++ b/source/Core/Services/IScopeStore.cs
@@ -14,11 +14,11 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Collections.Generic;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Scope retrieval
diff --git a/source/Core/Services/ITokenHandleStore.cs b/source/Core/Services/ITokenHandleStore.cs
index 8eabee422..d5808f258 100644
--- a/source/Core/Services/ITokenHandleStore.cs
+++ b/source/Core/Services/ITokenHandleStore.cs
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-using Thinktecture.IdentityServer.Core.Models;
+using IdentityServer3.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Token handle storage
diff --git a/source/Core/Services/ITokenService.cs b/source/Core/Services/ITokenService.cs
index 3b0050253..02f91346b 100644
--- a/source/Core/Services/ITokenService.cs
+++ b/source/Core/Services/ITokenService.cs
@@ -14,10 +14,10 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Logic for creating security tokens
diff --git a/source/Core/Services/ITokenSigningService.cs b/source/Core/Services/ITokenSigningService.cs
index 1d9bb2029..9ecd76ead 100644
--- a/source/Core/Services/ITokenSigningService.cs
+++ b/source/Core/Services/ITokenSigningService.cs
@@ -14,10 +14,10 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Logic for signing security tokens
diff --git a/source/Core/Services/ITransientDataRepository.cs b/source/Core/Services/ITransientDataRepository.cs
index 275ce92d4..521737fe7 100644
--- a/source/Core/Services/ITransientDataRepository.cs
+++ b/source/Core/Services/ITransientDataRepository.cs
@@ -14,11 +14,11 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Collections.Generic;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Abstraction for storing transient data (e.g. authorization codes, refresh and reference tokens)
diff --git a/source/Core/Services/IUserService.cs b/source/Core/Services/IUserService.cs
index f26c940aa..2a467d55c 100644
--- a/source/Core/Services/IUserService.cs
+++ b/source/Core/Services/IUserService.cs
@@ -14,12 +14,12 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Collections.Generic;
using System.Security.Claims;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// This interface allows IdentityServer to connect to your user and profile store.
diff --git a/source/Core/Services/IViewService.cs b/source/Core/Services/IViewService.cs
index f8e434786..2f53fd31f 100644
--- a/source/Core/Services/IViewService.cs
+++ b/source/Core/Services/IViewService.cs
@@ -14,12 +14,12 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
+using IdentityServer3.Core.ViewModels;
using System.IO;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-using Thinktecture.IdentityServer.Core.ViewModels;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Models loading the necessary HTML pages displayed by IdentityServer.
diff --git a/source/Core/Services/InMemory/InMemoryAuthorizationCodeStore.cs b/source/Core/Services/InMemory/InMemoryAuthorizationCodeStore.cs
index d4683e240..26ff2cb76 100644
--- a/source/Core/Services/InMemory/InMemoryAuthorizationCodeStore.cs
+++ b/source/Core/Services/InMemory/InMemoryAuthorizationCodeStore.cs
@@ -14,14 +14,14 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Extensions;
+using IdentityServer3.Core.Models;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Extensions;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services.InMemory
+namespace IdentityServer3.Core.Services.InMemory
{
///
/// In-memory authorization code store
diff --git a/source/Core/Services/InMemory/InMemoryClientStore.cs b/source/Core/Services/InMemory/InMemoryClientStore.cs
index 864ac03e6..b56eab461 100644
--- a/source/Core/Services/InMemory/InMemoryClientStore.cs
+++ b/source/Core/Services/InMemory/InMemoryClientStore.cs
@@ -14,12 +14,12 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services.InMemory
+namespace IdentityServer3.Core.Services.InMemory
{
///
/// In-memory client store
diff --git a/source/Core/Services/InMemory/InMemoryConsentStore.cs b/source/Core/Services/InMemory/InMemoryConsentStore.cs
index 95fc4c860..c48a6e5f9 100644
--- a/source/Core/Services/InMemory/InMemoryConsentStore.cs
+++ b/source/Core/Services/InMemory/InMemoryConsentStore.cs
@@ -14,12 +14,12 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services.InMemory
+namespace IdentityServer3.Core.Services.InMemory
{
///
/// In-memory consent store
diff --git a/source/Core/Services/InMemory/InMemoryCorsPolicyService.cs b/source/Core/Services/InMemory/InMemoryCorsPolicyService.cs
index 31aa9806d..91f9373e4 100644
--- a/source/Core/Services/InMemory/InMemoryCorsPolicyService.cs
+++ b/source/Core/Services/InMemory/InMemoryCorsPolicyService.cs
@@ -1,4 +1,7 @@
-/*
+using IdentityServer3.Core.Extensions;
+using IdentityServer3.Core.Logging;
+using IdentityServer3.Core.Models;
+/*
* Copyright 2014, 2015 Dominick Baier, Brock Allen
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,11 +20,8 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Extensions;
-using Thinktecture.IdentityServer.Core.Logging;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services.InMemory
+namespace IdentityServer3.Core.Services.InMemory
{
///
/// CORS policy service that configures the allowed origins from a list of clients' redirect URLs.
diff --git a/source/Core/Services/InMemory/InMemoryRefreshTokenStore.cs b/source/Core/Services/InMemory/InMemoryRefreshTokenStore.cs
index 014a545cf..681671e9d 100644
--- a/source/Core/Services/InMemory/InMemoryRefreshTokenStore.cs
+++ b/source/Core/Services/InMemory/InMemoryRefreshTokenStore.cs
@@ -14,13 +14,13 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services.InMemory
+namespace IdentityServer3.Core.Services.InMemory
{
///
/// In-memory refresh token store
diff --git a/source/Core/Services/InMemory/InMemoryScopeStore.cs b/source/Core/Services/InMemory/InMemoryScopeStore.cs
index 674617026..ed5273a6c 100644
--- a/source/Core/Services/InMemory/InMemoryScopeStore.cs
+++ b/source/Core/Services/InMemory/InMemoryScopeStore.cs
@@ -14,13 +14,13 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services.InMemory
+namespace IdentityServer3.Core.Services.InMemory
{
///
/// In-memory scope store
diff --git a/source/Core/Services/InMemory/InMemoryTokenHandleStore.cs b/source/Core/Services/InMemory/InMemoryTokenHandleStore.cs
index c36e3ccde..a9321b59a 100644
--- a/source/Core/Services/InMemory/InMemoryTokenHandleStore.cs
+++ b/source/Core/Services/InMemory/InMemoryTokenHandleStore.cs
@@ -14,13 +14,13 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services.InMemory
+namespace IdentityServer3.Core.Services.InMemory
{
///
/// In-memory token handle store
diff --git a/source/Core/Services/InMemory/InMemoryUser.cs b/source/Core/Services/InMemory/InMemoryUser.cs
index 4e2a16a69..e6547ab1b 100644
--- a/source/Core/Services/InMemory/InMemoryUser.cs
+++ b/source/Core/Services/InMemory/InMemoryUser.cs
@@ -17,7 +17,7 @@
using System.Collections.Generic;
using System.Security.Claims;
-namespace Thinktecture.IdentityServer.Core.Services.InMemory
+namespace IdentityServer3.Core.Services.InMemory
{
///
/// In-memory user
diff --git a/source/Core/Services/InMemory/InMemoryUserService.cs b/source/Core/Services/InMemory/InMemoryUserService.cs
index 6266f2ab0..62fe0c22b 100644
--- a/source/Core/Services/InMemory/InMemoryUserService.cs
+++ b/source/Core/Services/InMemory/InMemoryUserService.cs
@@ -14,16 +14,16 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Extensions;
+using IdentityServer3.Core.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using System.Threading.Tasks;
using Thinktecture.IdentityModel;
-using Thinktecture.IdentityServer.Core.Extensions;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Services.InMemory
+namespace IdentityServer3.Core.Services.InMemory
{
///
/// In-memory user service
diff --git a/source/Core/Services/OwinEnvironmentService.cs b/source/Core/Services/OwinEnvironmentService.cs
index 530e0bbfe..96f80ba3a 100644
--- a/source/Core/Services/OwinEnvironmentService.cs
+++ b/source/Core/Services/OwinEnvironmentService.cs
@@ -18,7 +18,7 @@
using System;
using System.Collections.Generic;
-namespace Thinktecture.IdentityServer.Core.Services
+namespace IdentityServer3.Core.Services
{
///
/// Container for the OWIN environment.
diff --git a/source/Core/Validation/AuthorizeRequestValidationResult.cs b/source/Core/Validation/AuthorizeRequestValidationResult.cs
index c6d471ac9..f6cfb316d 100644
--- a/source/Core/Validation/AuthorizeRequestValidationResult.cs
+++ b/source/Core/Validation/AuthorizeRequestValidationResult.cs
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
public class AuthorizeRequestValidationResult : ValidationResult
{
diff --git a/source/Core/Validation/AuthorizeRequestValidator.cs b/source/Core/Validation/AuthorizeRequestValidator.cs
index fd2ad58fd..f6c43f19f 100644
--- a/source/Core/Validation/AuthorizeRequestValidator.cs
+++ b/source/Core/Validation/AuthorizeRequestValidator.cs
@@ -14,20 +14,20 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Configuration;
+using IdentityServer3.Core.Configuration.Hosting;
+using IdentityServer3.Core.Extensions;
+using IdentityServer3.Core.Logging;
+using IdentityServer3.Core.Models;
+using IdentityServer3.Core.Services;
using System;
using System.Collections.Specialized;
using System.Linq;
using System.Security.Claims;
using System.Threading.Tasks;
using Thinktecture.IdentityModel;
-using Thinktecture.IdentityServer.Core.Configuration;
-using Thinktecture.IdentityServer.Core.Configuration.Hosting;
-using Thinktecture.IdentityServer.Core.Extensions;
-using Thinktecture.IdentityServer.Core.Logging;
-using Thinktecture.IdentityServer.Core.Models;
-using Thinktecture.IdentityServer.Core.Services;
-
-namespace Thinktecture.IdentityServer.Core.Validation
+
+namespace IdentityServer3.Core.Validation
{
internal class AuthorizeRequestValidator
{
diff --git a/source/Core/Validation/BasicAuthenticationClientValidator.cs b/source/Core/Validation/BasicAuthenticationClientValidator.cs
index 8ccba1825..043e8853a 100644
--- a/source/Core/Validation/BasicAuthenticationClientValidator.cs
+++ b/source/Core/Validation/BasicAuthenticationClientValidator.cs
@@ -14,16 +14,16 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Extensions;
+using IdentityServer3.Core.Models;
+using IdentityServer3.Core.Services;
using Microsoft.Owin;
using System;
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Extensions;
-using Thinktecture.IdentityServer.Core.Models;
-using Thinktecture.IdentityServer.Core.Services;
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
public class BasicAuthenticationClientValidator : ClientValidatorBase
{
diff --git a/source/Core/Validation/BearerTokenUsageType.cs b/source/Core/Validation/BearerTokenUsageType.cs
index 8c5e07db0..5ee9e8826 100644
--- a/source/Core/Validation/BearerTokenUsageType.cs
+++ b/source/Core/Validation/BearerTokenUsageType.cs
@@ -18,7 +18,7 @@
#pragma warning disable 1591
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
[EditorBrowsable(EditorBrowsableState.Never)]
public enum BearerTokenUsageType
diff --git a/source/Core/Validation/BearerTokenUsageValidationResult.cs b/source/Core/Validation/BearerTokenUsageValidationResult.cs
index 9a5db2165..18b76f7f0 100644
--- a/source/Core/Validation/BearerTokenUsageValidationResult.cs
+++ b/source/Core/Validation/BearerTokenUsageValidationResult.cs
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-using System.ComponentModel;
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
internal class BearerTokenUsageValidationResult
{
diff --git a/source/Core/Validation/BearerTokenUsageValidator.cs b/source/Core/Validation/BearerTokenUsageValidator.cs
index 73b6c2708..63cd50861 100644
--- a/source/Core/Validation/BearerTokenUsageValidator.cs
+++ b/source/Core/Validation/BearerTokenUsageValidator.cs
@@ -14,12 +14,12 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Extensions;
+using IdentityServer3.Core.Logging;
using System.Net.Http;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Extensions;
-using Thinktecture.IdentityServer.Core.Logging;
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
internal class BearerTokenUsageValidator
{
diff --git a/source/Core/Validation/ClientValidationResult.cs b/source/Core/Validation/ClientValidationResult.cs
index 697fb7152..6f11b2a41 100644
--- a/source/Core/Validation/ClientValidationResult.cs
+++ b/source/Core/Validation/ClientValidationResult.cs
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-using Thinktecture.IdentityServer.Core.Models;
+using IdentityServer3.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
public class ClientValidationResult : ValidationResult
{
diff --git a/source/Core/Validation/ClientValidatorBase.cs b/source/Core/Validation/ClientValidatorBase.cs
index b378e7076..97befda70 100644
--- a/source/Core/Validation/ClientValidatorBase.cs
+++ b/source/Core/Validation/ClientValidatorBase.cs
@@ -14,13 +14,13 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Logging;
+using IdentityServer3.Core.Models;
+using IdentityServer3.Core.Services;
using System.Collections.Generic;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Logging;
-using Thinktecture.IdentityServer.Core.Models;
-using Thinktecture.IdentityServer.Core.Services;
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
public abstract class ClientValidatorBase : IClientValidator
{
diff --git a/source/Core/Validation/CustomGrantValidationResult.cs b/source/Core/Validation/CustomGrantValidationResult.cs
index 953e56ba1..f4f161b7e 100644
--- a/source/Core/Validation/CustomGrantValidationResult.cs
+++ b/source/Core/Validation/CustomGrantValidationResult.cs
@@ -14,14 +14,14 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Extensions;
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using Thinktecture.IdentityModel;
using Thinktecture.IdentityModel.Extensions;
-using Thinktecture.IdentityServer.Core.Extensions;
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
///
/// Models the result of custom grant validation.
diff --git a/source/Core/Validation/EndSessionRequestValidator.cs b/source/Core/Validation/EndSessionRequestValidator.cs
index 236df38e7..e57b060a8 100644
--- a/source/Core/Validation/EndSessionRequestValidator.cs
+++ b/source/Core/Validation/EndSessionRequestValidator.cs
@@ -14,16 +14,16 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Configuration;
+using IdentityServer3.Core.Extensions;
+using IdentityServer3.Core.Logging;
+using IdentityServer3.Core.Services;
using System.Collections.Specialized;
using System.Linq;
using System.Security.Claims;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Configuration;
-using Thinktecture.IdentityServer.Core.Extensions;
-using Thinktecture.IdentityServer.Core.Logging;
-using Thinktecture.IdentityServer.Core.Services;
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
internal class EndSessionRequestValidator
{
diff --git a/source/Core/Validation/ErrorTypes.cs b/source/Core/Validation/ErrorTypes.cs
index f6b78400b..595e10469 100644
--- a/source/Core/Validation/ErrorTypes.cs
+++ b/source/Core/Validation/ErrorTypes.cs
@@ -15,7 +15,7 @@
*/
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
///
/// Indicates if a is an error to be displayed to the user or returned to the client.
diff --git a/source/Core/Validation/PostBodyClientValidator.cs b/source/Core/Validation/PostBodyClientValidator.cs
index 66bc62a92..5ff3fdb10 100644
--- a/source/Core/Validation/PostBodyClientValidator.cs
+++ b/source/Core/Validation/PostBodyClientValidator.cs
@@ -1,5 +1,7 @@
-using Microsoft.Owin;
-using System;
+using IdentityServer3.Core.Extensions;
+using IdentityServer3.Core.Models;
+using IdentityServer3.Core.Services;
+using Microsoft.Owin;
/*
* Copyright 2014, 2015 Dominick Baier, Brock Allen
*
@@ -17,13 +19,9 @@
*/
using System.Collections.Generic;
-using System.IO;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Extensions;
-using Thinktecture.IdentityServer.Core.Models;
-using Thinktecture.IdentityServer.Core.Services;
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
public class PostBodyClientValidator : ClientValidatorBase
{
diff --git a/source/Core/Validation/ScopeValidator.cs b/source/Core/Validation/ScopeValidator.cs
index d8cf9ebe3..c00502faa 100644
--- a/source/Core/Validation/ScopeValidator.cs
+++ b/source/Core/Validation/ScopeValidator.cs
@@ -14,19 +14,19 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Extensions;
+using IdentityServer3.Core.Logging;
+using IdentityServer3.Core.Models;
+using IdentityServer3.Core.Services;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Extensions;
-using Thinktecture.IdentityServer.Core.Logging;
-using Thinktecture.IdentityServer.Core.Models;
-using Thinktecture.IdentityServer.Core.Services;
#pragma warning disable 1591
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
[EditorBrowsable(EditorBrowsableState.Never)]
public class ScopeValidator
diff --git a/source/Core/Validation/TokenRequestValidationResult.cs b/source/Core/Validation/TokenRequestValidationResult.cs
index c32a624be..5d44cdcb1 100644
--- a/source/Core/Validation/TokenRequestValidationResult.cs
+++ b/source/Core/Validation/TokenRequestValidationResult.cs
@@ -13,13 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
public class TokenRequestValidationResult : ValidationResult
{
diff --git a/source/Core/Validation/TokenRequestValidator.cs b/source/Core/Validation/TokenRequestValidator.cs
index f4227dfc5..b36dc7061 100644
--- a/source/Core/Validation/TokenRequestValidator.cs
+++ b/source/Core/Validation/TokenRequestValidator.cs
@@ -14,17 +14,17 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Configuration;
+using IdentityServer3.Core.Extensions;
+using IdentityServer3.Core.Logging;
+using IdentityServer3.Core.Models;
+using IdentityServer3.Core.Services;
using System;
using System.Collections.Specialized;
using System.Linq;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Configuration;
-using Thinktecture.IdentityServer.Core.Extensions;
-using Thinktecture.IdentityServer.Core.Logging;
-using Thinktecture.IdentityServer.Core.Models;
-using Thinktecture.IdentityServer.Core.Services;
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
internal class TokenRequestValidator
{
diff --git a/source/Core/Validation/TokenRevocationRequestValidationResult.cs b/source/Core/Validation/TokenRevocationRequestValidationResult.cs
index 3a50d6f8a..11320d8a0 100644
--- a/source/Core/Validation/TokenRevocationRequestValidationResult.cs
+++ b/source/Core/Validation/TokenRevocationRequestValidationResult.cs
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
internal class TokenRevocationRequestValidationResult : ValidationResult
{
diff --git a/source/Core/Validation/TokenRevocationRequestValidator.cs b/source/Core/Validation/TokenRevocationRequestValidator.cs
index 59de4342b..7a01ec709 100644
--- a/source/Core/Validation/TokenRevocationRequestValidator.cs
+++ b/source/Core/Validation/TokenRevocationRequestValidator.cs
@@ -14,14 +14,14 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Extensions;
+using IdentityServer3.Core.Models;
+using IdentityServer3.Core.Services;
using System;
using System.Collections.Specialized;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Extensions;
-using Thinktecture.IdentityServer.Core.Models;
-using Thinktecture.IdentityServer.Core.Services;
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
internal class TokenRevocationRequestValidator
{
diff --git a/source/Core/Validation/TokenValidationResult.cs b/source/Core/Validation/TokenValidationResult.cs
index 87a104032..9308e8143 100644
--- a/source/Core/Validation/TokenValidationResult.cs
+++ b/source/Core/Validation/TokenValidationResult.cs
@@ -14,11 +14,11 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Collections.Generic;
using System.Security.Claims;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
///
/// Modles the validation result of access tokens and id tokens.
diff --git a/source/Core/Validation/TokenValidator.cs b/source/Core/Validation/TokenValidator.cs
index cb412e0fd..f57d1d6fb 100644
--- a/source/Core/Validation/TokenValidator.cs
+++ b/source/Core/Validation/TokenValidator.cs
@@ -14,6 +14,11 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Configuration;
+using IdentityServer3.Core.Extensions;
+using IdentityServer3.Core.Logging;
+using IdentityServer3.Core.Models;
+using IdentityServer3.Core.Services;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -24,15 +29,10 @@
using System.ServiceModel.Security;
using System.Threading.Tasks;
using Thinktecture.IdentityModel.Extensions;
-using Thinktecture.IdentityServer.Core.Configuration;
-using Thinktecture.IdentityServer.Core.Extensions;
-using Thinktecture.IdentityServer.Core.Logging;
-using Thinktecture.IdentityServer.Core.Models;
-using Thinktecture.IdentityServer.Core.Services;
#pragma warning disable 1591
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
[EditorBrowsable(EditorBrowsableState.Never)]
public class TokenValidator
diff --git a/source/Core/Validation/ValidatedAuthorizeRequest.cs b/source/Core/Validation/ValidatedAuthorizeRequest.cs
index 04b3c30fa..7b4dd43ce 100644
--- a/source/Core/Validation/ValidatedAuthorizeRequest.cs
+++ b/source/Core/Validation/ValidatedAuthorizeRequest.cs
@@ -14,10 +14,10 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Collections.Generic;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
///
/// Models a validated request to the authorize endpoint.
diff --git a/source/Core/Validation/ValidatedEndSessionRequest.cs b/source/Core/Validation/ValidatedEndSessionRequest.cs
index 37d9ec3c5..ffdeddf70 100644
--- a/source/Core/Validation/ValidatedEndSessionRequest.cs
+++ b/source/Core/Validation/ValidatedEndSessionRequest.cs
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-using Thinktecture.IdentityServer.Core.Models;
+using IdentityServer3.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
///
/// Represents a validated end session (logout) request
diff --git a/source/Core/Validation/ValidatedRequest.cs b/source/Core/Validation/ValidatedRequest.cs
index 7bdbddd9f..579934ee2 100644
--- a/source/Core/Validation/ValidatedRequest.cs
+++ b/source/Core/Validation/ValidatedRequest.cs
@@ -14,11 +14,11 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Configuration;
using System.Collections.Specialized;
using System.Security.Claims;
-using Thinktecture.IdentityServer.Core.Configuration;
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
///
/// Base class for a validate authorize or token request
diff --git a/source/Core/Validation/ValidatedTokenRequest.cs b/source/Core/Validation/ValidatedTokenRequest.cs
index 08f67a8b3..aac0397eb 100644
--- a/source/Core/Validation/ValidatedTokenRequest.cs
+++ b/source/Core/Validation/ValidatedTokenRequest.cs
@@ -14,10 +14,10 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Collections.Generic;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
///
/// Models a validated request to the token endpoint.
diff --git a/source/Core/Validation/ValidatedUserInfoRequest.cs b/source/Core/Validation/ValidatedUserInfoRequest.cs
index 4d0eaa174..730813be1 100644
--- a/source/Core/Validation/ValidatedUserInfoRequest.cs
+++ b/source/Core/Validation/ValidatedUserInfoRequest.cs
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-using Thinktecture.IdentityServer.Core.Models;
+using IdentityServer3.Core.Models;
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
///
/// Represents a validated request to the user info endpoint
diff --git a/source/Core/Validation/ValidationResult.cs b/source/Core/Validation/ValidationResult.cs
index 3243e70c4..d898b8e5b 100644
--- a/source/Core/Validation/ValidationResult.cs
+++ b/source/Core/Validation/ValidationResult.cs
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
///
/// Minimal validation result class (base-class for more complext validation results)
diff --git a/source/Core/Validation/X509CertificateClientValidator.cs b/source/Core/Validation/X509CertificateClientValidator.cs
index ca56d8dda..9877aee74 100644
--- a/source/Core/Validation/X509CertificateClientValidator.cs
+++ b/source/Core/Validation/X509CertificateClientValidator.cs
@@ -14,16 +14,15 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Extensions;
+using IdentityServer3.Core.Models;
+using IdentityServer3.Core.Services;
using Microsoft.Owin;
using System.Collections.Generic;
-using System.IO;
using System.Security.Cryptography.X509Certificates;
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Extensions;
-using Thinktecture.IdentityServer.Core.Models;
-using Thinktecture.IdentityServer.Core.Services;
-namespace Thinktecture.IdentityServer.Core.Validation
+namespace IdentityServer3.Core.Validation
{
public class X509CertificateClientValidator : ClientValidatorBase
{
diff --git a/source/Core/ViewModels/AntiForgeryTokenViewModel.cs b/source/Core/ViewModels/AntiForgeryTokenViewModel.cs
index 8a50f54d1..fd251cb96 100644
--- a/source/Core/ViewModels/AntiForgeryTokenViewModel.cs
+++ b/source/Core/ViewModels/AntiForgeryTokenViewModel.cs
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-namespace Thinktecture.IdentityServer.Core.ViewModels
+namespace IdentityServer3.Core.ViewModels
{
///
/// Models values needed for Cross-Site Request Forgery (CSRF) prevention. These
diff --git a/source/Core/ViewModels/ClientPermissionsViewModel.cs b/source/Core/ViewModels/ClientPermissionsViewModel.cs
index 94762f02d..da952cb81 100644
--- a/source/Core/ViewModels/ClientPermissionsViewModel.cs
+++ b/source/Core/ViewModels/ClientPermissionsViewModel.cs
@@ -14,10 +14,10 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Models;
using System.Collections.Generic;
-using Thinktecture.IdentityServer.Core.Models;
-namespace Thinktecture.IdentityServer.Core.ViewModels
+namespace IdentityServer3.Core.ViewModels
{
///
/// Models the data needed to render the client permissions page.
diff --git a/source/Core/ViewModels/CommonViewModel.cs b/source/Core/ViewModels/CommonViewModel.cs
index 52b6851bb..657101abb 100644
--- a/source/Core/ViewModels/CommonViewModel.cs
+++ b/source/Core/ViewModels/CommonViewModel.cs
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-namespace Thinktecture.IdentityServer.Core.ViewModels
+namespace IdentityServer3.Core.ViewModels
{
///
/// Models common data needed to render pages in IdentityServer.
diff --git a/source/Core/ViewModels/ConsentScopeViewModel.cs b/source/Core/ViewModels/ConsentScopeViewModel.cs
index d9e97f8d1..2473a50b5 100644
--- a/source/Core/ViewModels/ConsentScopeViewModel.cs
+++ b/source/Core/ViewModels/ConsentScopeViewModel.cs
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-namespace Thinktecture.IdentityServer.Core.ViewModels
+namespace IdentityServer3.Core.ViewModels
{
///
/// Models an individual scope to display on the consent page.
diff --git a/source/Core/ViewModels/ConsentViewModel.cs b/source/Core/ViewModels/ConsentViewModel.cs
index 61f87e2ac..1c1ed5766 100644
--- a/source/Core/ViewModels/ConsentViewModel.cs
+++ b/source/Core/ViewModels/ConsentViewModel.cs
@@ -16,7 +16,7 @@
using System.Collections.Generic;
-namespace Thinktecture.IdentityServer.Core.ViewModels
+namespace IdentityServer3.Core.ViewModels
{
///
/// Models the data needed to render the consent page.
diff --git a/source/Core/ViewModels/ErrorViewModel.cs b/source/Core/ViewModels/ErrorViewModel.cs
index 6535a65bc..552f94738 100644
--- a/source/Core/ViewModels/ErrorViewModel.cs
+++ b/source/Core/ViewModels/ErrorViewModel.cs
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-namespace Thinktecture.IdentityServer.Core.ViewModels
+namespace IdentityServer3.Core.ViewModels
{
///
/// Models the data needed to render the error page.
diff --git a/source/Core/ViewModels/LoggedOutViewModel.cs b/source/Core/ViewModels/LoggedOutViewModel.cs
index 18471aa16..966bb17f1 100644
--- a/source/Core/ViewModels/LoggedOutViewModel.cs
+++ b/source/Core/ViewModels/LoggedOutViewModel.cs
@@ -16,7 +16,7 @@
using System.Collections.Generic;
-namespace Thinktecture.IdentityServer.Core.ViewModels
+namespace IdentityServer3.Core.ViewModels
{
///
/// Models the data needed to render the logged out page.
diff --git a/source/Core/ViewModels/LoginCredentials.cs b/source/Core/ViewModels/LoginCredentials.cs
index 188a97a66..ba4993b68 100644
--- a/source/Core/ViewModels/LoginCredentials.cs
+++ b/source/Core/ViewModels/LoginCredentials.cs
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-namespace Thinktecture.IdentityServer.Core.ViewModels
+namespace IdentityServer3.Core.ViewModels
{
///
/// Models the inputs to be submitted to the local login endpoint.
diff --git a/source/Core/ViewModels/LoginViewModel.cs b/source/Core/ViewModels/LoginViewModel.cs
index cc1d6c0e1..118e08839 100644
--- a/source/Core/ViewModels/LoginViewModel.cs
+++ b/source/Core/ViewModels/LoginViewModel.cs
@@ -14,10 +14,10 @@
* limitations under the License.
*/
+using IdentityServer3.Core.Configuration;
using System.Collections.Generic;
-using Thinktecture.IdentityServer.Core.Configuration;
-namespace Thinktecture.IdentityServer.Core.ViewModels
+namespace IdentityServer3.Core.ViewModels
{
///
/// Models that data needed to render the login page.
diff --git a/source/Core/ViewModels/LogoutViewModel.cs b/source/Core/ViewModels/LogoutViewModel.cs
index 961a57284..f49e13b14 100644
--- a/source/Core/ViewModels/LogoutViewModel.cs
+++ b/source/Core/ViewModels/LogoutViewModel.cs
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-namespace Thinktecture.IdentityServer.Core.ViewModels
+namespace IdentityServer3.Core.ViewModels
{
///
/// Models the data needed to render the logout prompt page.
diff --git a/source/Core/ViewModels/RevokeClientPermission.cs b/source/Core/ViewModels/RevokeClientPermission.cs
index 234c7f1b1..ed570fc61 100644
--- a/source/Core/ViewModels/RevokeClientPermission.cs
+++ b/source/Core/ViewModels/RevokeClientPermission.cs
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-namespace Thinktecture.IdentityServer.Core.ViewModels
+namespace IdentityServer3.Core.ViewModels
{
///
/// Models data submitted to revoke a subject's permissions to a client
diff --git a/source/Core/ViewModels/UserConsent.cs b/source/Core/ViewModels/UserConsent.cs
index 9fa7461cd..96b332aaa 100644
--- a/source/Core/ViewModels/UserConsent.cs
+++ b/source/Core/ViewModels/UserConsent.cs
@@ -17,7 +17,7 @@
using System.Collections.Generic;
using System.Linq;
-namespace Thinktecture.IdentityServer.Core.ViewModels
+namespace IdentityServer3.Core.ViewModels
{
///
/// Models the data submitted from the conset page.
diff --git a/source/Host/Config/Cert.cs b/source/Host/Config/Cert.cs
index e53d6db3c..a415482f9 100644
--- a/source/Host/Config/Cert.cs
+++ b/source/Host/Config/Cert.cs
@@ -16,14 +16,14 @@
using System.IO;
using System.Security.Cryptography.X509Certificates;
-namespace Thinktecture.IdentityServer.Host.Config
+namespace IdentityServer3.Host.Config
{
public class Cert
{
public static X509Certificate2 Load()
{
var assembly = typeof(Cert).Assembly;
- using (var stream = assembly.GetManifestResourceStream("Thinktecture.IdentityServer.Host.Config.idsrv3test.pfx"))
+ using (var stream = assembly.GetManifestResourceStream("IdentityServer3.Host.Config.idsrv3test.pfx"))
{
return new X509Certificate2(ReadStream(stream), "idsrv3test");
}
diff --git a/source/Host/Config/Clients.cs b/source/Host/Config/Clients.cs
index 8f33a4241..c41f0617e 100644
--- a/source/Host/Config/Clients.cs
+++ b/source/Host/Config/Clients.cs
@@ -15,10 +15,10 @@
*/
using System.Collections.Generic;
using System.Security.Claims;
-using Thinktecture.IdentityServer.Core;
-using Thinktecture.IdentityServer.Core.Models;
+using IdentityServer3.Core;
+using IdentityServer3.Core.Models;
-namespace Thinktecture.IdentityServer.Host.Config
+namespace IdentityServer3.Host.Config
{
public class Clients
{
@@ -82,6 +82,7 @@ public static List Get()
RequireConsent = true,
AllowRememberConsent = true,
+ AllowAccessToAllScopes = true,
RedirectUris = new List
{
diff --git a/source/Host/Config/CustomGrantValidator.cs b/source/Host/Config/CustomGrantValidator.cs
index 1b9d76ac5..557aeefc7 100644
--- a/source/Host/Config/CustomGrantValidator.cs
+++ b/source/Host/Config/CustomGrantValidator.cs
@@ -15,10 +15,10 @@
*/
using System.Threading.Tasks;
-using Thinktecture.IdentityServer.Core.Services;
-using Thinktecture.IdentityServer.Core.Validation;
+using IdentityServer3.Core.Services;
+using IdentityServer3.Core.Validation;
-namespace Thinktecture.IdentityServer.Host.Config
+namespace IdentityServer3.Host.Config
{
public class CustomGrantValidator : ICustomGrantValidator
{
diff --git a/source/Host/Config/Scopes.cs b/source/Host/Config/Scopes.cs
index 3e882ce79..40a148ef2 100644
--- a/source/Host/Config/Scopes.cs
+++ b/source/Host/Config/Scopes.cs
@@ -14,10 +14,10 @@
* limitations under the License.
*/
using System.Collections.Generic;
-using Thinktecture.IdentityServer.Core;
-using Thinktecture.IdentityServer.Core.Models;
+using IdentityServer3.Core;
+using IdentityServer3.Core.Models;
-namespace Thinktecture.IdentityServer.Host.Config
+namespace IdentityServer3.Host.Config
{
public class Scopes
{
diff --git a/source/Host/Config/Users.cs b/source/Host/Config/Users.cs
index 9719213c1..6795fd512 100644
--- a/source/Host/Config/Users.cs
+++ b/source/Host/Config/Users.cs
@@ -15,10 +15,10 @@
*/
using System.Collections.Generic;
using System.Security.Claims;
-using Thinktecture.IdentityServer.Core;
-using Thinktecture.IdentityServer.Core.Services.InMemory;
+using IdentityServer3.Core;
+using IdentityServer3.Core.Services.InMemory;
-namespace Thinktecture.IdentityServer.Host.Config
+namespace IdentityServer3.Host.Config
{
static class Users
{
diff --git a/source/Host/Host.csproj b/source/Host/Host.csproj
index 2d91a91eb..21afc5f4e 100644
--- a/source/Host/Host.csproj
+++ b/source/Host/Host.csproj
@@ -11,8 +11,8 @@
{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}
Library
Properties
- Thinktecture.IdentityServer.Host
- Thinktecture.IdentityServer.Host
+ IdentityServer3.Host
+ IdentityServer3.Host
v4.5
true
44333
diff --git a/source/Host/Startup.cs b/source/Host/Startup.cs
index 4d584dd78..6147fdef4 100644
--- a/source/Host/Startup.cs
+++ b/source/Host/Startup.cs
@@ -21,16 +21,16 @@
using Microsoft.Owin.Security.Twitter;
using Microsoft.Owin.Security.WsFederation;
using Owin;
-using Thinktecture.IdentityServer.Core.Configuration;
-using Thinktecture.IdentityServer.Core.Logging;
-using Thinktecture.IdentityServer.Core.Services;
-using Thinktecture.IdentityServer.Core.Services.Default;
-using Thinktecture.IdentityServer.Host;
-using Thinktecture.IdentityServer.Host.Config;
+using IdentityServer3.Core.Configuration;
+using IdentityServer3.Core.Logging;
+using IdentityServer3.Core.Services;
+using IdentityServer3.Core.Services.Default;
+using IdentityServer3.Host;
+using IdentityServer3.Host.Config;
[assembly: OwinStartup("LocalTest", typeof(Startup_LocalTest))]
-namespace Thinktecture.IdentityServer.Host
+namespace IdentityServer3.Host
{
public class Startup_LocalTest
{
diff --git a/source/Host/Web.config b/source/Host/Web.config
index e6d4cd06c..dcbf44a10 100644
--- a/source/Host/Web.config
+++ b/source/Host/Web.config
@@ -73,7 +73,7 @@