From e8561f2cf881ac0de50517bfd8d17f5d59a9851c Mon Sep 17 00:00:00 2001 From: lnh Date: Tue, 8 Jun 2021 15:44:04 +0800 Subject: [PATCH] rename 1-src to src --- 0-build/build.cake | 2 +- README.md | 36 +++++++------- docker-compose.yml | 16 +++---- oidc.example.sln | 44 +++++++++--------- {1-src => src}/_shared/GlobalConfig.cs | 0 .../ForbiddenResult.cs | 0 .../IPermissionHandler.cs | 0 .../IPermissionHandlerProvider.cs | 0 .../PermissionAttribute.cs | 0 .../aspnetcore.filters.permissions.csproj | 0 .../Program.cs | 0 ...resource-owner-password-credentials.csproj | 0 .../Program.cs | 0 ...le.oauth2.client.client-credentials.csproj | 0 .../http.diagnostic/HttpDefaultObserver.cs | 0 .../HttpDiagnosticListenerObserver.cs | 0 .../http.diagnostic/http.diagnostic.csproj | 0 .../ApplicationBuilderExtension.cs | 0 .../GithubClaimsAction.cs | 0 .../GithubOAuthHandler.cs | 0 .../GithubOAuthOptions.cs | 0 .../oauth2.github.aspnetcore.csproj | 0 .../ApplicationBuilderExtension.cs | 0 .../QQConnectOAuthHandler.cs | 0 .../QQConnectOAuthOptions.cs | 0 .../oauth2.qqconnect.aspnetcore.csproj | 0 .../AppBuilderExtensions.cs | 0 .../QQConnectOAuthHandler.cs | 0 .../QQConnectOAuthMiddleware.cs | 0 .../QQConnectOAuthOptions.cs | 0 .../oauth2.qqconnect.owin.csproj | 0 .../Extensions/ClaimExtension.cs | 0 .../Extensions/DictionaryExtension.cs | 0 .../Extensions/JObjectExtension.cs | 0 .../QQConnectPropertiesExtension.cs | 0 .../Extensions/SetExtension.cs | 0 .../Extensions/StringExtension.cs | 0 .../oauth2.qqconnect/QQConnectClient.cs | 0 .../oauth2.qqconnect/QQConnectOptions.cs | 0 .../QQConnectProfile.ClaimTypes.cs | 0 .../oauth2.qqconnect/QQConnectProfile.cs | 0 .../oauth2.qqconnect/QQConnectProperties.cs | 0 .../Response/OpenIdResponse.cs | 0 .../Response/TokenResponse.cs | 0 .../oauth2.qqconnect/Response/UserResponse.cs | 0 .../oauth2.qqconnect/oauth2.qqconnect.csproj | 0 {1-src => src}/traefik/traefik.yml | 0 .../App.xaml | 0 .../App.xaml.cs | 0 .../Assets/LockScreenLogo.scale-200.png | Bin .../Assets/SplashScreen.scale-200.png | Bin .../Assets/Square150x150Logo.scale-200.png | Bin .../Assets/Square44x44Logo.scale-200.png | Bin ...x44Logo.targetsize-24_altform-unplated.png | Bin .../Assets/StoreLogo.png | Bin .../Assets/Wide310x150Logo.scale-200.png | Bin .../LoginPage.xaml | 0 .../LoginPage.xaml.cs | 0 .../MainPage.xaml | 0 .../MainPage.xaml.cs | 0 .../Models/JwtModel.cs | 0 .../Models/TokenModel.cs | 0 .../Oidc/OidcClient.cs | 0 .../Oidc/OidcOptions.cs | 0 .../Oidc/TokenFile.cs | 0 .../Package.appxmanifest | 0 .../Properties/AssemblyInfo.cs | 0 .../Properties/Default.rd.xml | 0 .../uwp.oidc.client.authorization-code.csproj | 0 .../uwp.pfx | Bin .../web.oauth2.client.aspnetcore.dockerfile | 0 .../Controllers/AccountController.cs | 0 .../Controllers/HomeController.cs | 0 .../OAuth2/OAuth2Constants.cs | 0 .../OAuth2/OAuth2Extensions.cs | 0 .../web.oauth2.client.aspnetcore}/Program.cs | 0 .../web.oauth2.client.aspnetcore/Startup.cs | 0 .../Views/Home/Index.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views/_ViewStart.cshtml | 0 .../web.oauth2.client.aspnetcore}/web.config | 0 .../web.oauth2.client.aspnetcore.csproj | 0 .../Controllers/AccountController.cs | 0 .../Controllers/HomeController.cs | 0 .../web.oauth2.client.owin/Global.asax | 0 .../web.oauth2.client.owin/Global.asax.cs | 0 .../OAuth2/OAuth2Constants.cs | 0 .../OAuth2/OAuth2Extensions.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../web.oauth2.client.owin/Startup.cs | 0 .../Views/Home/Index.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/_ViewStart.cshtml | 0 .../web.oauth2.client.owin/Views/web.config | 0 .../web.oauth2.client.owin/Web.config | 0 .../web.oauth2.client.owin/packages.config | 0 .../web.oauth2.client.owin.csproj | 0 ...web.oauth2.resources.aspnetcore.dockerfile | 0 .../Apis/Book.cs | 0 .../Apis/BooksController.cs | 0 .../Apis/HomeController.cs | 0 .../Permissions/PermissionExtension.cs | 0 .../Permissions/PermissionHandlerProvider.cs | 0 .../Permissions/RolePermissionHandler.cs | 0 .../Permissions/ScopePermissionHandler.cs | 0 .../Program.cs | 0 .../Startup.cs | 0 .../Web.config | 0 .../web.oauth2.resources.aspnetcore.csproj | 0 .../web.oauth2.resources.java.dockerfile | 0 .../web.oauth2.resources.java/.gitignore | 0 .../.mvn/wrapper/MavenWrapperDownloader.java | 0 .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 {1-src => src}/web.oauth2.resources.java/mvnw | 0 .../web.oauth2.resources.java/mvnw.cmd | 0 .../web.oauth2.resources.java/pom.xml | 0 .../src/main/java/api/ApiApplication.java | 0 .../api/configuration/WebConfiguration.java | 0 .../WebSecurityConfiguration.java | 0 .../java/api/controller/ApiController.java | 0 .../CustomizedAccessDeniedHandler.java | 0 .../CustomizedAuthenticationEntryPoint.java | 0 .../src/main/resources/application.yml | 0 .../web.oauth2.resources.nodejs.dockerfile | 0 .../web.oauth2.resources.nodejs/app.js | 0 .../authentication.js | 0 .../package-lock.json | 0 .../web.oauth2.resources.nodejs/package.json | 0 .../Apis/IndexApiController.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../web.oauth2.resources.owin/Startup.cs | 0 .../web.oauth2.resources.owin/Web.config | 0 .../web.oauth2.resources.owin/packages.config | 0 .../web.oauth2.resources.owin.csproj | 0 .../web.oidc.client.hybrid.dockerfile | 0 .../Controllers/AccountController.cs | 0 .../Controllers/HomeController.cs | 0 .../web.oidc.client.hybrid/Oidc/Constants.cs | 0 .../Oidc/OidcExtentions.cs | 0 .../web.oidc.client.hybrid}/Program.cs | 0 .../web.oidc.client.hybrid/Startup.cs | 0 .../Views/Home/Index.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views/_ViewStart.cshtml | 0 .../web.oidc.client.hybrid/web.config | 0 .../web.oidc.client.hybrid.csproj | 0 .../App_Start/RouteConfig.cs | 0 .../Controllers/AccountController.cs | 0 .../Controllers/HomeController.cs | 0 .../web.oidc.client.implicit/Global.asax | 0 .../web.oidc.client.implicit/Global.asax.cs | 0 .../Oidc/Constants.cs | 0 .../Oidc/OidcController.cs | 0 .../Oidc/OidcExtentions.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../web.oidc.client.implicit/Startup.cs | 0 .../Views/Home/Index.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/_ViewStart.cshtml | 0 .../web.oidc.client.implicit/Views/web.config | 0 .../web.oidc.client.implicit/Web.config | 0 .../web.oidc.client.implicit/packages.config | 0 .../web.oidc.client.implicit.csproj | 0 {1-src => src}/web.oidc.client.js.dockerfile | 0 {1-src => src}/web.oidc.client.js/README.md | 0 {1-src => src}/web.oidc.client.js/index.html | 0 .../oidc/login-callback.html | 0 .../oidc/refresh-token.html | 0 .../web.oidc.server.ids4.dockerfile | 0 .../Controllers/DebugController.cs | 0 .../Controllers/HomeController.cs | 0 .../Ids4/Account/AccountController.cs | 0 .../Ids4/Account/ExternalLoginViewModel.cs | 0 .../Ids4/Account/LoginFormModel.cs | 0 .../Ids4/Account/LoginViewModel.cs | 0 .../Ids4/Account/NewUserViewModel.cs | 0 .../web.oidc.server.ids4/Ids4/Clients.cs | 0 .../Ids4/Ids4Extensions.cs | 0 .../web.oidc.server.ids4/Ids4/Resources.cs | 0 .../Ids4/Shared/SharedController.cs | 0 .../web.oidc.server.ids4/Ids4/Users.cs | 0 .../web.oidc.server.ids4/Program.cs | 0 .../web.oidc.server.ids4/Startup.cs | 0 .../Views/Account/ExternalLoginNewUser.cshtml | 0 .../Views/Account/LoggedOut.cshtml | 0 .../Views/Account/Login.cshtml | 0 .../Views/Shared/Error.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views/_ViewStart.cshtml | 0 .../web.oidc.server.ids4/tempkey.jwk | 0 .../web.oidc.server.ids4}/web.config | 0 .../web.oidc.server.ids4.csproj | 0 {1-src => src}/web.traefik.dockerfile | 0 .../App.xaml | 0 .../App.xaml.cs | 0 .../Login.xaml | 0 .../Login.xaml.cs | 0 .../Main.xaml | 0 .../Main.xaml.cs | 0 .../Models/JwtModel.cs | 0 .../Models/TokenModel.cs | 0 .../Oidc/OidcClient.cs | 0 .../Oidc/OidcOptions.cs | 0 .../Oidc/TokenFile.cs | 0 .../wpf.oidc.client.authorization-code.csproj | 0 209 files changed, 49 insertions(+), 49 deletions(-) rename {1-src => src}/_shared/GlobalConfig.cs (100%) rename {1-src => src}/aspnetcore.filters.permissions/ForbiddenResult.cs (100%) rename {1-src => src}/aspnetcore.filters.permissions/IPermissionHandler.cs (100%) rename {1-src => src}/aspnetcore.filters.permissions/IPermissionHandlerProvider.cs (100%) rename {1-src => src}/aspnetcore.filters.permissions/PermissionAttribute.cs (100%) rename {1-src => src}/aspnetcore.filters.permissions/aspnetcore.filters.permissions.csproj (100%) rename {1-src => src}/console.oauth2.client.resource-owner-password-credentials/Program.cs (100%) rename {1-src => src}/console.oauth2.client.resource-owner-password-credentials/console.oauth2.client.resource-owner-password-credentials.csproj (100%) rename {1-src => src}/console.oidc.client.client-credentials/Program.cs (100%) rename {1-src => src}/console.oidc.client.client-credentials/console.oauth2.client.client-credentials.csproj (100%) rename {1-src => src}/http.diagnostic/HttpDefaultObserver.cs (100%) rename {1-src => src}/http.diagnostic/HttpDiagnosticListenerObserver.cs (100%) rename {1-src => src}/http.diagnostic/http.diagnostic.csproj (100%) rename {1-src => src}/oauth2.github.aspnetcore/ApplicationBuilderExtension.cs (100%) rename {1-src => src}/oauth2.github.aspnetcore/GithubClaimsAction.cs (100%) rename {1-src => src}/oauth2.github.aspnetcore/GithubOAuthHandler.cs (100%) rename {1-src => src}/oauth2.github.aspnetcore/GithubOAuthOptions.cs (100%) rename {1-src => src}/oauth2.github.aspnetcore/oauth2.github.aspnetcore.csproj (100%) rename {1-src => src}/oauth2.qqconnect.aspnetcore/ApplicationBuilderExtension.cs (100%) rename {1-src => src}/oauth2.qqconnect.aspnetcore/QQConnectOAuthHandler.cs (100%) rename {1-src => src}/oauth2.qqconnect.aspnetcore/QQConnectOAuthOptions.cs (100%) rename {1-src => src}/oauth2.qqconnect.aspnetcore/oauth2.qqconnect.aspnetcore.csproj (100%) rename {1-src => src}/oauth2.qqconnect.owin/AppBuilderExtensions.cs (100%) rename {1-src => src}/oauth2.qqconnect.owin/QQConnectOAuthHandler.cs (100%) rename {1-src => src}/oauth2.qqconnect.owin/QQConnectOAuthMiddleware.cs (100%) rename {1-src => src}/oauth2.qqconnect.owin/QQConnectOAuthOptions.cs (100%) rename {1-src => src}/oauth2.qqconnect.owin/oauth2.qqconnect.owin.csproj (100%) rename {1-src => src}/oauth2.qqconnect/Extensions/ClaimExtension.cs (100%) rename {1-src => src}/oauth2.qqconnect/Extensions/DictionaryExtension.cs (100%) rename {1-src => src}/oauth2.qqconnect/Extensions/JObjectExtension.cs (100%) rename {1-src => src}/oauth2.qqconnect/Extensions/QQConnectPropertiesExtension.cs (100%) rename {1-src => src}/oauth2.qqconnect/Extensions/SetExtension.cs (100%) rename {1-src => src}/oauth2.qqconnect/Extensions/StringExtension.cs (100%) rename {1-src => src}/oauth2.qqconnect/QQConnectClient.cs (100%) rename {1-src => src}/oauth2.qqconnect/QQConnectOptions.cs (100%) rename {1-src => src}/oauth2.qqconnect/QQConnectProfile.ClaimTypes.cs (100%) rename {1-src => src}/oauth2.qqconnect/QQConnectProfile.cs (100%) rename {1-src => src}/oauth2.qqconnect/QQConnectProperties.cs (100%) rename {1-src => src}/oauth2.qqconnect/Response/OpenIdResponse.cs (100%) rename {1-src => src}/oauth2.qqconnect/Response/TokenResponse.cs (100%) rename {1-src => src}/oauth2.qqconnect/Response/UserResponse.cs (100%) rename {1-src => src}/oauth2.qqconnect/oauth2.qqconnect.csproj (100%) rename {1-src => src}/traefik/traefik.yml (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/App.xaml (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/App.xaml.cs (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/Assets/LockScreenLogo.scale-200.png (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/Assets/SplashScreen.scale-200.png (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/Assets/Square150x150Logo.scale-200.png (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/Assets/Square44x44Logo.scale-200.png (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/Assets/Square44x44Logo.targetsize-24_altform-unplated.png (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/Assets/StoreLogo.png (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/Assets/Wide310x150Logo.scale-200.png (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/LoginPage.xaml (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/LoginPage.xaml.cs (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/MainPage.xaml (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/MainPage.xaml.cs (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/Models/JwtModel.cs (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/Models/TokenModel.cs (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/Oidc/OidcClient.cs (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/Oidc/OidcOptions.cs (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/Oidc/TokenFile.cs (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/Package.appxmanifest (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/Properties/AssemblyInfo.cs (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/Properties/Default.rd.xml (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/uwp.oidc.client.authorization-code.csproj (100%) rename {1-src => src}/uwp.oidc.client.authorization-code/uwp.pfx (100%) rename {1-src => src}/web.oauth2.client.aspnetcore.dockerfile (100%) rename {1-src => src}/web.oauth2.client.aspnetcore/Controllers/AccountController.cs (100%) rename {1-src/web.oidc.client.hybrid => src/web.oauth2.client.aspnetcore}/Controllers/HomeController.cs (100%) rename {1-src => src}/web.oauth2.client.aspnetcore/OAuth2/OAuth2Constants.cs (100%) rename {1-src => src}/web.oauth2.client.aspnetcore/OAuth2/OAuth2Extensions.cs (100%) rename {1-src/web.oidc.client.hybrid => src/web.oauth2.client.aspnetcore}/Program.cs (100%) rename {1-src => src}/web.oauth2.client.aspnetcore/Startup.cs (100%) rename {1-src => src}/web.oauth2.client.aspnetcore/Views/Home/Index.cshtml (100%) rename {1-src => src}/web.oauth2.client.aspnetcore/Views/Shared/_Layout.cshtml (100%) rename {1-src => src}/web.oauth2.client.aspnetcore/Views/_ViewImports.cshtml (100%) rename {1-src/web.oidc.server.ids4 => src/web.oauth2.client.aspnetcore}/Views/_ViewStart.cshtml (100%) rename {1-src/web.oidc.server.ids4 => src/web.oauth2.client.aspnetcore}/web.config (100%) rename {1-src => src}/web.oauth2.client.aspnetcore/web.oauth2.client.aspnetcore.csproj (100%) rename {1-src => src}/web.oauth2.client.owin/Controllers/AccountController.cs (100%) rename {1-src/web.oidc.client.implicit => src/web.oauth2.client.owin}/Controllers/HomeController.cs (100%) rename {1-src => src}/web.oauth2.client.owin/Global.asax (100%) rename {1-src => src}/web.oauth2.client.owin/Global.asax.cs (100%) rename {1-src => src}/web.oauth2.client.owin/OAuth2/OAuth2Constants.cs (100%) rename {1-src => src}/web.oauth2.client.owin/OAuth2/OAuth2Extensions.cs (100%) rename {1-src => src}/web.oauth2.client.owin/Properties/AssemblyInfo.cs (100%) rename {1-src => src}/web.oauth2.client.owin/Startup.cs (100%) rename {1-src/web.oidc.client.implicit => src/web.oauth2.client.owin}/Views/Home/Index.cshtml (100%) rename {1-src => src}/web.oauth2.client.owin/Views/Shared/_Layout.cshtml (100%) rename {1-src/web.oidc.client.implicit => src/web.oauth2.client.owin}/Views/_ViewStart.cshtml (100%) rename {1-src => src}/web.oauth2.client.owin/Views/web.config (100%) rename {1-src => src}/web.oauth2.client.owin/Web.config (100%) rename {1-src => src}/web.oauth2.client.owin/packages.config (100%) rename {1-src => src}/web.oauth2.client.owin/web.oauth2.client.owin.csproj (100%) rename {1-src => src}/web.oauth2.resources.aspnetcore.dockerfile (100%) rename {1-src => src}/web.oauth2.resources.aspnetcore/Apis/Book.cs (100%) rename {1-src => src}/web.oauth2.resources.aspnetcore/Apis/BooksController.cs (100%) rename {1-src => src}/web.oauth2.resources.aspnetcore/Apis/HomeController.cs (100%) rename {1-src => src}/web.oauth2.resources.aspnetcore/Permissions/PermissionExtension.cs (100%) rename {1-src => src}/web.oauth2.resources.aspnetcore/Permissions/PermissionHandlerProvider.cs (100%) rename {1-src => src}/web.oauth2.resources.aspnetcore/Permissions/RolePermissionHandler.cs (100%) rename {1-src => src}/web.oauth2.resources.aspnetcore/Permissions/ScopePermissionHandler.cs (100%) rename {1-src => src}/web.oauth2.resources.aspnetcore/Program.cs (100%) rename {1-src => src}/web.oauth2.resources.aspnetcore/Startup.cs (100%) rename {1-src => src}/web.oauth2.resources.aspnetcore/Web.config (100%) rename {1-src => src}/web.oauth2.resources.aspnetcore/web.oauth2.resources.aspnetcore.csproj (100%) rename {1-src => src}/web.oauth2.resources.java.dockerfile (100%) rename {1-src => src}/web.oauth2.resources.java/.gitignore (100%) rename {1-src => src}/web.oauth2.resources.java/.mvn/wrapper/MavenWrapperDownloader.java (100%) rename {1-src => src}/web.oauth2.resources.java/.mvn/wrapper/maven-wrapper.jar (100%) rename {1-src => src}/web.oauth2.resources.java/.mvn/wrapper/maven-wrapper.properties (100%) rename {1-src => src}/web.oauth2.resources.java/mvnw (100%) mode change 100755 => 100644 rename {1-src => src}/web.oauth2.resources.java/mvnw.cmd (100%) rename {1-src => src}/web.oauth2.resources.java/pom.xml (100%) rename {1-src => src}/web.oauth2.resources.java/src/main/java/api/ApiApplication.java (100%) rename {1-src => src}/web.oauth2.resources.java/src/main/java/api/configuration/WebConfiguration.java (100%) rename {1-src => src}/web.oauth2.resources.java/src/main/java/api/configuration/WebSecurityConfiguration.java (100%) rename {1-src => src}/web.oauth2.resources.java/src/main/java/api/controller/ApiController.java (100%) rename {1-src => src}/web.oauth2.resources.java/src/main/java/api/handler/CustomizedAccessDeniedHandler.java (100%) rename {1-src => src}/web.oauth2.resources.java/src/main/java/api/handler/CustomizedAuthenticationEntryPoint.java (100%) rename {1-src => src}/web.oauth2.resources.java/src/main/resources/application.yml (100%) rename {1-src => src}/web.oauth2.resources.nodejs.dockerfile (100%) rename {1-src => src}/web.oauth2.resources.nodejs/app.js (100%) rename {1-src => src}/web.oauth2.resources.nodejs/authentication.js (100%) rename {1-src => src}/web.oauth2.resources.nodejs/package-lock.json (100%) rename {1-src => src}/web.oauth2.resources.nodejs/package.json (100%) rename {1-src => src}/web.oauth2.resources.owin/Apis/IndexApiController.cs (100%) rename {1-src => src}/web.oauth2.resources.owin/Properties/AssemblyInfo.cs (100%) rename {1-src => src}/web.oauth2.resources.owin/Startup.cs (100%) rename {1-src => src}/web.oauth2.resources.owin/Web.config (100%) rename {1-src => src}/web.oauth2.resources.owin/packages.config (100%) rename {1-src => src}/web.oauth2.resources.owin/web.oauth2.resources.owin.csproj (100%) rename {1-src => src}/web.oidc.client.hybrid.dockerfile (100%) rename {1-src => src}/web.oidc.client.hybrid/Controllers/AccountController.cs (100%) rename {1-src/web.oauth2.client.aspnetcore => src/web.oidc.client.hybrid}/Controllers/HomeController.cs (100%) rename {1-src => src}/web.oidc.client.hybrid/Oidc/Constants.cs (100%) rename {1-src => src}/web.oidc.client.hybrid/Oidc/OidcExtentions.cs (100%) rename {1-src/web.oauth2.client.aspnetcore => src/web.oidc.client.hybrid}/Program.cs (100%) rename {1-src => src}/web.oidc.client.hybrid/Startup.cs (100%) rename {1-src => src}/web.oidc.client.hybrid/Views/Home/Index.cshtml (100%) rename {1-src => src}/web.oidc.client.hybrid/Views/Shared/_Layout.cshtml (100%) rename {1-src => src}/web.oidc.client.hybrid/Views/_ViewImports.cshtml (100%) rename {1-src => src}/web.oidc.client.hybrid/Views/_ViewStart.cshtml (100%) rename {1-src => src}/web.oidc.client.hybrid/web.config (100%) rename {1-src => src}/web.oidc.client.hybrid/web.oidc.client.hybrid.csproj (100%) rename {1-src => src}/web.oidc.client.implicit/App_Start/RouteConfig.cs (100%) rename {1-src => src}/web.oidc.client.implicit/Controllers/AccountController.cs (100%) rename {1-src/web.oauth2.client.owin => src/web.oidc.client.implicit}/Controllers/HomeController.cs (100%) rename {1-src => src}/web.oidc.client.implicit/Global.asax (100%) rename {1-src => src}/web.oidc.client.implicit/Global.asax.cs (100%) rename {1-src => src}/web.oidc.client.implicit/Oidc/Constants.cs (100%) rename {1-src => src}/web.oidc.client.implicit/Oidc/OidcController.cs (100%) rename {1-src => src}/web.oidc.client.implicit/Oidc/OidcExtentions.cs (100%) rename {1-src => src}/web.oidc.client.implicit/Properties/AssemblyInfo.cs (100%) rename {1-src => src}/web.oidc.client.implicit/Startup.cs (100%) rename {1-src/web.oauth2.client.owin => src/web.oidc.client.implicit}/Views/Home/Index.cshtml (100%) rename {1-src => src}/web.oidc.client.implicit/Views/Shared/_Layout.cshtml (100%) rename {1-src/web.oauth2.client.owin => src/web.oidc.client.implicit}/Views/_ViewStart.cshtml (100%) rename {1-src => src}/web.oidc.client.implicit/Views/web.config (100%) rename {1-src => src}/web.oidc.client.implicit/Web.config (100%) rename {1-src => src}/web.oidc.client.implicit/packages.config (100%) rename {1-src => src}/web.oidc.client.implicit/web.oidc.client.implicit.csproj (100%) rename {1-src => src}/web.oidc.client.js.dockerfile (100%) rename {1-src => src}/web.oidc.client.js/README.md (100%) rename {1-src => src}/web.oidc.client.js/index.html (100%) rename {1-src => src}/web.oidc.client.js/oidc/login-callback.html (100%) rename {1-src => src}/web.oidc.client.js/oidc/refresh-token.html (100%) rename {1-src => src}/web.oidc.server.ids4.dockerfile (100%) rename {1-src => src}/web.oidc.server.ids4/Controllers/DebugController.cs (100%) rename {1-src => src}/web.oidc.server.ids4/Controllers/HomeController.cs (100%) rename {1-src => src}/web.oidc.server.ids4/Ids4/Account/AccountController.cs (100%) rename {1-src => src}/web.oidc.server.ids4/Ids4/Account/ExternalLoginViewModel.cs (100%) rename {1-src => src}/web.oidc.server.ids4/Ids4/Account/LoginFormModel.cs (100%) rename {1-src => src}/web.oidc.server.ids4/Ids4/Account/LoginViewModel.cs (100%) rename {1-src => src}/web.oidc.server.ids4/Ids4/Account/NewUserViewModel.cs (100%) rename {1-src => src}/web.oidc.server.ids4/Ids4/Clients.cs (100%) rename {1-src => src}/web.oidc.server.ids4/Ids4/Ids4Extensions.cs (100%) rename {1-src => src}/web.oidc.server.ids4/Ids4/Resources.cs (100%) rename {1-src => src}/web.oidc.server.ids4/Ids4/Shared/SharedController.cs (100%) rename {1-src => src}/web.oidc.server.ids4/Ids4/Users.cs (100%) rename {1-src => src}/web.oidc.server.ids4/Program.cs (100%) rename {1-src => src}/web.oidc.server.ids4/Startup.cs (100%) rename {1-src => src}/web.oidc.server.ids4/Views/Account/ExternalLoginNewUser.cshtml (100%) rename {1-src => src}/web.oidc.server.ids4/Views/Account/LoggedOut.cshtml (100%) rename {1-src => src}/web.oidc.server.ids4/Views/Account/Login.cshtml (100%) rename {1-src => src}/web.oidc.server.ids4/Views/Shared/Error.cshtml (100%) rename {1-src => src}/web.oidc.server.ids4/Views/Shared/_Layout.cshtml (100%) rename {1-src => src}/web.oidc.server.ids4/Views/_ViewImports.cshtml (100%) rename {1-src/web.oauth2.client.aspnetcore => src/web.oidc.server.ids4}/Views/_ViewStart.cshtml (100%) rename {1-src => src}/web.oidc.server.ids4/tempkey.jwk (100%) rename {1-src/web.oauth2.client.aspnetcore => src/web.oidc.server.ids4}/web.config (100%) rename {1-src => src}/web.oidc.server.ids4/web.oidc.server.ids4.csproj (100%) rename {1-src => src}/web.traefik.dockerfile (100%) rename {1-src => src}/wpf.oidc.client.authorization-code/App.xaml (100%) rename {1-src => src}/wpf.oidc.client.authorization-code/App.xaml.cs (100%) rename {1-src => src}/wpf.oidc.client.authorization-code/Login.xaml (100%) rename {1-src => src}/wpf.oidc.client.authorization-code/Login.xaml.cs (100%) rename {1-src => src}/wpf.oidc.client.authorization-code/Main.xaml (100%) rename {1-src => src}/wpf.oidc.client.authorization-code/Main.xaml.cs (100%) rename {1-src => src}/wpf.oidc.client.authorization-code/Models/JwtModel.cs (100%) rename {1-src => src}/wpf.oidc.client.authorization-code/Models/TokenModel.cs (100%) rename {1-src => src}/wpf.oidc.client.authorization-code/Oidc/OidcClient.cs (100%) rename {1-src => src}/wpf.oidc.client.authorization-code/Oidc/OidcOptions.cs (100%) rename {1-src => src}/wpf.oidc.client.authorization-code/Oidc/TokenFile.cs (100%) rename {1-src => src}/wpf.oidc.client.authorization-code/wpf.oidc.client.authorization-code.csproj (100%) diff --git a/0-build/build.cake b/0-build/build.cake index 4156978..24dace7 100644 --- a/0-build/build.cake +++ b/0-build/build.cake @@ -12,7 +12,7 @@ var target = Argument("target", "default"); /// constant var rootPath = "../"; -var srcPath = rootPath + "1-src/"; +var srcPath = rootPath + "src/"; var slnPath = rootPath + "oidc.example.sln"; var webSiteList = GetWebSiteList(srcPath); diff --git a/README.md b/README.md index 1115121..899827c 100644 --- a/README.md +++ b/README.md @@ -92,44 +92,44 @@ default 默认执行open-browser # OIDC Servers -1. [1-src/web.oidc.server.ids4](1-src/web.oidc.server.ids4) : ids4 (https://github.com/IdentityServer/IdentityServer4) example (with github, qqconnect external login). +1. [src/web.oidc.server.ids4](src/web.oidc.server.ids4) : ids4 (https://github.com/IdentityServer/IdentityServer4) example (with github, qqconnect external login). # OIDC Clients -1. [1-src/web.oidc.client.hybrid](1-src/web.oidc.client.hybrid) : web site, hybrid flow. -1. [1-src/web.oidc.client.implicit](1-src/web.oidc.client.implicit) : web site, implicit flow. -1. [1-src/web.oidc.client.js](1-src/web.oidc.client.js) : web site(static), implicit flow . -1. [1-src/uwp.oidc.client.authorization-code](1-src/uwp.oidc.client.authorization-code) : uwp app, authorization code flow. -1. [1-src/wpf.oidc.client.authorization-code](1-src/wpf.oidc.client.authorization-code) : wpf app, authorization code flow. +1. [src/web.oidc.client.hybrid](src/web.oidc.client.hybrid) : web site, hybrid flow. +1. [src/web.oidc.client.implicit](src/web.oidc.client.implicit) : web site, implicit flow. +1. [src/web.oidc.client.js](src/web.oidc.client.js) : web site(static), implicit flow . +1. [src/uwp.oidc.client.authorization-code](src/uwp.oidc.client.authorization-code) : uwp app, authorization code flow. +1. [src/wpf.oidc.client.authorization-code](src/wpf.oidc.client.authorization-code) : wpf app, authorization code flow. # OAuth2 Clients -1. [1-src/web.oauth2.client.aspnetcore](1-src/web.oauth2.client.aspnetcore) : asp.net core 3.1. -1. [1-src/web.oauth2.client.owin](1-src/web.oauth2.client.owin) : asp.net owin. -1. [1-src/console.oauth2.client.client-credentials](1-src/console.oauth2.client.client-credentials) : console app, client credentials flow(oauth2). -1. [1-src/console.oauth2.client.resource-owner-password-credentials](1-src/console.oauth2.client.resource-owner-password-credentials) : console app, resource owner password credentials flow(oauth2). +1. [src/web.oauth2.client.aspnetcore](src/web.oauth2.client.aspnetcore) : asp.net core 3.1. +1. [src/web.oauth2.client.owin](src/web.oauth2.client.owin) : asp.net owin. +1. [src/console.oauth2.client.client-credentials](src/console.oauth2.client.client-credentials) : console app, client credentials flow(oauth2). +1. [src/console.oauth2.client.resource-owner-password-credentials](src/console.oauth2.client.resource-owner-password-credentials) : console app, resource owner password credentials flow(oauth2). # OAuth2 Resources Servers -1. [1-src/web.oauth2.resources.aspnetcore](1-src/web.oauth2.resources.aspnetcore): asp.net core 3.1. -1. [1-src/web.oauth2.resources.owin](1-src/web.oauth2.resources.owin): asp.net owin. -1. [1-src/web.oauth2.resources.nodejs](1-src/web.oauth2.resources.nodejs): node.js. -1. [1-src/web.oauth2.resources.java](1-src/web.oauth2.resources.java): java (spring boot 2.2.1). +1. [src/web.oauth2.resources.aspnetcore](src/web.oauth2.resources.aspnetcore): asp.net core 3.1. +1. [src/web.oauth2.resources.owin](src/web.oauth2.resources.owin): asp.net owin. +1. [src/web.oauth2.resources.nodejs](src/web.oauth2.resources.nodejs): node.js. +1. [src/web.oauth2.resources.java](src/web.oauth2.resources.java): java (spring boot 2.2.1). # OAuth2 Middleware -1. [1-src/oauth2.github.aspnetcore](1-src/oauth2.github.aspnetcore): asp.net core 3.1. -1. [1-src/oauth2.qqconnect.aspnetcore](1-src/oauth2.qqconnect.aspnetcore): asp.net core 3.1. -1. [1-src/oauth2.qqconnect.owin](1-src/oauth2.qqconnect.owin): asp.net owin. +1. [src/oauth2.github.aspnetcore](src/oauth2.github.aspnetcore): asp.net core 3.1. +1. [src/oauth2.qqconnect.aspnetcore](src/oauth2.qqconnect.aspnetcore): asp.net core 3.1. +1. [src/oauth2.qqconnect.owin](src/oauth2.qqconnect.owin): asp.net owin. ## Global Config -If you want use QQ Connect or Github, please replace `ClientId` and `ClientSercet` in [1-src/_shared/GlobalConfig.cs](1-src/_shared/GlobalConfig.cs) file. +If you want use QQ Connect or Github, please replace `ClientId` and `ClientSercet` in [src/_shared/GlobalConfig.cs](src/_shared/GlobalConfig.cs) file. ```csharp public static class GlobalConfig { diff --git a/docker-compose.yml b/docker-compose.yml index ebf981a..240b318 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ version: '3' services: traefik.test: build: - context: ./1-src/ + context: ./src/ dockerfile: web.traefik.dockerfile ports: - '80:80' @@ -24,7 +24,7 @@ services: oidc-server.test: build: - context: ./1-src/ + context: ./src/ dockerfile: web.oidc.server.ids4.dockerfile labels: - traefik.enable=true @@ -34,7 +34,7 @@ services: oidc-client-hybrid.test: build: - context: ./1-src/ + context: ./src/ dockerfile: web.oidc.client.hybrid.dockerfile labels: - traefik.enable=true @@ -44,7 +44,7 @@ services: oidc-client-js.test: build: - context: ./1-src/ + context: ./src/ dockerfile: web.oidc.client.js.dockerfile labels: - traefik.enable=true @@ -54,7 +54,7 @@ services: oauth2-client-aspnetcore.test: build: - context: ./1-src/ + context: ./src/ dockerfile: web.oauth2.client.aspnetcore.dockerfile labels: - traefik.enable=true @@ -64,7 +64,7 @@ services: oauth2-resources-aspnetcore.test: build: - context: ./1-src/ + context: ./src/ dockerfile: web.oauth2.resources.aspnetcore.dockerfile depends_on: - oidc-server.test @@ -76,7 +76,7 @@ services: oauth2-resources-nodejs.test: build: - context: ./1-src/ + context: ./src/ dockerfile: web.oauth2.resources.nodejs.dockerfile depends_on: - oidc-server.test @@ -88,7 +88,7 @@ services: oauth2-resources-java.test: build: - context: ./1-src/ + context: ./src/ dockerfile: web.oauth2.resources.java.dockerfile depends_on: - oidc-server.test diff --git a/oidc.example.sln b/oidc.example.sln index ebd91a1..7e952e9 100644 --- a/oidc.example.sln +++ b/oidc.example.sln @@ -12,60 +12,60 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "oidc.servers", "oidc.server EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_shared", "_shared", "{7BED3B30-A933-4783-BB29-209D53B8938D}" ProjectSection(SolutionItems) = preProject - 1-src\_shared\GlobalConfig.cs = 1-src\_shared\GlobalConfig.cs + src\_shared\GlobalConfig.cs = src\_shared\GlobalConfig.cs EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "oauth2.qqconnect", "1-src\oauth2.qqconnect\oauth2.qqconnect.csproj", "{C6E8379B-9F94-4174-918B-565F02BEEA2B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "oauth2.qqconnect", "src\oauth2.qqconnect\oauth2.qqconnect.csproj", "{C6E8379B-9F94-4174-918B-565F02BEEA2B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "oauth2.qqconnect.owin", "1-src\oauth2.qqconnect.owin\oauth2.qqconnect.owin.csproj", "{75208FB9-233E-462F-8437-075234F8225C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "oauth2.qqconnect.owin", "src\oauth2.qqconnect.owin\oauth2.qqconnect.owin.csproj", "{75208FB9-233E-462F-8437-075234F8225C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "web.oauth2.client.owin", "1-src\web.oauth2.client.owin\web.oauth2.client.owin.csproj", "{582EFA98-3ECA-4185-8026-49AC734569E5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "web.oauth2.client.owin", "src\web.oauth2.client.owin\web.oauth2.client.owin.csproj", "{582EFA98-3ECA-4185-8026-49AC734569E5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "web.oidc.client.implicit", "1-src\web.oidc.client.implicit\web.oidc.client.implicit.csproj", "{FF7A1991-5B44-4C78-8E97-E29E739189F3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "web.oidc.client.implicit", "src\web.oidc.client.implicit\web.oidc.client.implicit.csproj", "{FF7A1991-5B44-4C78-8E97-E29E739189F3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "web.oidc.client.js", "web.oidc.client.js", "{0D2741E3-A8BC-4930-A4D8-444AF6988224}" ProjectSection(SolutionItems) = preProject - 1-src\web.oidc.client.js\index.html = 1-src\web.oidc.client.js\index.html - 1-src\web.oidc.client.js\README.md = 1-src\web.oidc.client.js\README.md + src\web.oidc.client.js\index.html = src\web.oidc.client.js\index.html + src\web.oidc.client.js\README.md = src\web.oidc.client.js\README.md EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "oidc", "oidc", "{477BFAC1-F7DC-495D-B823-113B7692B265}" ProjectSection(SolutionItems) = preProject - 1-src\web.oidc.client.js\oidc\login-callback.html = 1-src\web.oidc.client.js\oidc\login-callback.html - 1-src\web.oidc.client.js\oidc\refresh-token.html = 1-src\web.oidc.client.js\oidc\refresh-token.html + src\web.oidc.client.js\oidc\login-callback.html = src\web.oidc.client.js\oidc\login-callback.html + src\web.oidc.client.js\oidc\refresh-token.html = src\web.oidc.client.js\oidc\refresh-token.html EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "web.oidc.server.ids4", "1-src\web.oidc.server.ids4\web.oidc.server.ids4.csproj", "{ACEBC330-D4F6-4C4D-98CD-18FF4CA45260}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "web.oidc.server.ids4", "src\web.oidc.server.ids4\web.oidc.server.ids4.csproj", "{ACEBC330-D4F6-4C4D-98CD-18FF4CA45260}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "oauth2.qqconnect.aspnetcore", "1-src\oauth2.qqconnect.aspnetcore\oauth2.qqconnect.aspnetcore.csproj", "{B306A07A-DFD6-48E2-A629-5FF38934B9B9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "oauth2.qqconnect.aspnetcore", "src\oauth2.qqconnect.aspnetcore\oauth2.qqconnect.aspnetcore.csproj", "{B306A07A-DFD6-48E2-A629-5FF38934B9B9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "web.oauth2.client.aspnetcore", "1-src\web.oauth2.client.aspnetcore\web.oauth2.client.aspnetcore.csproj", "{10655652-C13C-4921-88B1-EC23C095F3F3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "web.oauth2.client.aspnetcore", "src\web.oauth2.client.aspnetcore\web.oauth2.client.aspnetcore.csproj", "{10655652-C13C-4921-88B1-EC23C095F3F3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "web.oidc.client.hybrid", "1-src\web.oidc.client.hybrid\web.oidc.client.hybrid.csproj", "{868A5075-A471-4EE0-8573-20DA53A62D31}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "web.oidc.client.hybrid", "src\web.oidc.client.hybrid\web.oidc.client.hybrid.csproj", "{868A5075-A471-4EE0-8573-20DA53A62D31}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "uwp.oidc.client.authorization-code", "1-src\uwp.oidc.client.authorization-code\uwp.oidc.client.authorization-code.csproj", "{B101D8E1-7EE2-4884-9A72-6F4A6B4DBF2A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "uwp.oidc.client.authorization-code", "src\uwp.oidc.client.authorization-code\uwp.oidc.client.authorization-code.csproj", "{B101D8E1-7EE2-4884-9A72-6F4A6B4DBF2A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "console.oauth2.client.client-credentials", "1-src\console.oidc.client.client-credentials\console.oauth2.client.client-credentials.csproj", "{E9C6A35A-D909-499C-BC9F-1F65A02B732B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "console.oauth2.client.client-credentials", "src\console.oidc.client.client-credentials\console.oauth2.client.client-credentials.csproj", "{E9C6A35A-D909-499C-BC9F-1F65A02B732B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "filters", "filters", "{AC8AAA8F-4684-4158-B1B3-4FBC1870CFA8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "web.oauth2.resources.aspnetcore", "1-src\web.oauth2.resources.aspnetcore\web.oauth2.resources.aspnetcore.csproj", "{7E592C54-3E5C-4666-84DC-3C4115CA71A6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "web.oauth2.resources.aspnetcore", "src\web.oauth2.resources.aspnetcore\web.oauth2.resources.aspnetcore.csproj", "{7E592C54-3E5C-4666-84DC-3C4115CA71A6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "aspnetcore.filters.permissions", "1-src\aspnetcore.filters.permissions\aspnetcore.filters.permissions.csproj", "{F5AD4B2E-000A-4F9B-9223-2AC1B7E9DF4C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "aspnetcore.filters.permissions", "src\aspnetcore.filters.permissions\aspnetcore.filters.permissions.csproj", "{F5AD4B2E-000A-4F9B-9223-2AC1B7E9DF4C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "oauth2.resources", "oauth2.resources", "{ABBE4B77-AA7C-4B50-B7AB-BC854C44D0C9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "web.oauth2.resources.owin", "1-src\web.oauth2.resources.owin\web.oauth2.resources.owin.csproj", "{DED7DCFE-9D7D-4E46-90A8-8D2A70729A41}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "web.oauth2.resources.owin", "src\web.oauth2.resources.owin\web.oauth2.resources.owin.csproj", "{DED7DCFE-9D7D-4E46-90A8-8D2A70729A41}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "oauth2.github.aspnetcore", "1-src\oauth2.github.aspnetcore\oauth2.github.aspnetcore.csproj", "{5DEA7015-9157-452C-8AD8-3A3733073168}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "oauth2.github.aspnetcore", "src\oauth2.github.aspnetcore\oauth2.github.aspnetcore.csproj", "{5DEA7015-9157-452C-8AD8-3A3733073168}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "wpf.oidc.client.authorization-code", "1-src\wpf.oidc.client.authorization-code\wpf.oidc.client.authorization-code.csproj", "{BF96A910-9614-4C8C-BFE9-5AEB322625A3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "wpf.oidc.client.authorization-code", "src\wpf.oidc.client.authorization-code\wpf.oidc.client.authorization-code.csproj", "{BF96A910-9614-4C8C-BFE9-5AEB322625A3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "http.diagnostic", "1-src\http.diagnostic\http.diagnostic.csproj", "{DD4702C4-3500-44DA-A7C5-824AE557449E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "http.diagnostic", "src\http.diagnostic\http.diagnostic.csproj", "{DD4702C4-3500-44DA-A7C5-824AE557449E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "diagnostic", "diagnostic", "{6773FFFA-7647-49CC-93D1-62C8D9BEA698}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "console.oauth2.client.resource-owner-password-credentials", "1-src\console.oauth2.client.resource-owner-password-credentials\console.oauth2.client.resource-owner-password-credentials.csproj", "{F656EDC6-12C9-4A08-B821-2C5815A1A4E0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "console.oauth2.client.resource-owner-password-credentials", "src\console.oauth2.client.resource-owner-password-credentials\console.oauth2.client.resource-owner-password-credentials.csproj", "{F656EDC6-12C9-4A08-B821-2C5815A1A4E0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/1-src/_shared/GlobalConfig.cs b/src/_shared/GlobalConfig.cs similarity index 100% rename from 1-src/_shared/GlobalConfig.cs rename to src/_shared/GlobalConfig.cs diff --git a/1-src/aspnetcore.filters.permissions/ForbiddenResult.cs b/src/aspnetcore.filters.permissions/ForbiddenResult.cs similarity index 100% rename from 1-src/aspnetcore.filters.permissions/ForbiddenResult.cs rename to src/aspnetcore.filters.permissions/ForbiddenResult.cs diff --git a/1-src/aspnetcore.filters.permissions/IPermissionHandler.cs b/src/aspnetcore.filters.permissions/IPermissionHandler.cs similarity index 100% rename from 1-src/aspnetcore.filters.permissions/IPermissionHandler.cs rename to src/aspnetcore.filters.permissions/IPermissionHandler.cs diff --git a/1-src/aspnetcore.filters.permissions/IPermissionHandlerProvider.cs b/src/aspnetcore.filters.permissions/IPermissionHandlerProvider.cs similarity index 100% rename from 1-src/aspnetcore.filters.permissions/IPermissionHandlerProvider.cs rename to src/aspnetcore.filters.permissions/IPermissionHandlerProvider.cs diff --git a/1-src/aspnetcore.filters.permissions/PermissionAttribute.cs b/src/aspnetcore.filters.permissions/PermissionAttribute.cs similarity index 100% rename from 1-src/aspnetcore.filters.permissions/PermissionAttribute.cs rename to src/aspnetcore.filters.permissions/PermissionAttribute.cs diff --git a/1-src/aspnetcore.filters.permissions/aspnetcore.filters.permissions.csproj b/src/aspnetcore.filters.permissions/aspnetcore.filters.permissions.csproj similarity index 100% rename from 1-src/aspnetcore.filters.permissions/aspnetcore.filters.permissions.csproj rename to src/aspnetcore.filters.permissions/aspnetcore.filters.permissions.csproj diff --git a/1-src/console.oauth2.client.resource-owner-password-credentials/Program.cs b/src/console.oauth2.client.resource-owner-password-credentials/Program.cs similarity index 100% rename from 1-src/console.oauth2.client.resource-owner-password-credentials/Program.cs rename to src/console.oauth2.client.resource-owner-password-credentials/Program.cs diff --git a/1-src/console.oauth2.client.resource-owner-password-credentials/console.oauth2.client.resource-owner-password-credentials.csproj b/src/console.oauth2.client.resource-owner-password-credentials/console.oauth2.client.resource-owner-password-credentials.csproj similarity index 100% rename from 1-src/console.oauth2.client.resource-owner-password-credentials/console.oauth2.client.resource-owner-password-credentials.csproj rename to src/console.oauth2.client.resource-owner-password-credentials/console.oauth2.client.resource-owner-password-credentials.csproj diff --git a/1-src/console.oidc.client.client-credentials/Program.cs b/src/console.oidc.client.client-credentials/Program.cs similarity index 100% rename from 1-src/console.oidc.client.client-credentials/Program.cs rename to src/console.oidc.client.client-credentials/Program.cs diff --git a/1-src/console.oidc.client.client-credentials/console.oauth2.client.client-credentials.csproj b/src/console.oidc.client.client-credentials/console.oauth2.client.client-credentials.csproj similarity index 100% rename from 1-src/console.oidc.client.client-credentials/console.oauth2.client.client-credentials.csproj rename to src/console.oidc.client.client-credentials/console.oauth2.client.client-credentials.csproj diff --git a/1-src/http.diagnostic/HttpDefaultObserver.cs b/src/http.diagnostic/HttpDefaultObserver.cs similarity index 100% rename from 1-src/http.diagnostic/HttpDefaultObserver.cs rename to src/http.diagnostic/HttpDefaultObserver.cs diff --git a/1-src/http.diagnostic/HttpDiagnosticListenerObserver.cs b/src/http.diagnostic/HttpDiagnosticListenerObserver.cs similarity index 100% rename from 1-src/http.diagnostic/HttpDiagnosticListenerObserver.cs rename to src/http.diagnostic/HttpDiagnosticListenerObserver.cs diff --git a/1-src/http.diagnostic/http.diagnostic.csproj b/src/http.diagnostic/http.diagnostic.csproj similarity index 100% rename from 1-src/http.diagnostic/http.diagnostic.csproj rename to src/http.diagnostic/http.diagnostic.csproj diff --git a/1-src/oauth2.github.aspnetcore/ApplicationBuilderExtension.cs b/src/oauth2.github.aspnetcore/ApplicationBuilderExtension.cs similarity index 100% rename from 1-src/oauth2.github.aspnetcore/ApplicationBuilderExtension.cs rename to src/oauth2.github.aspnetcore/ApplicationBuilderExtension.cs diff --git a/1-src/oauth2.github.aspnetcore/GithubClaimsAction.cs b/src/oauth2.github.aspnetcore/GithubClaimsAction.cs similarity index 100% rename from 1-src/oauth2.github.aspnetcore/GithubClaimsAction.cs rename to src/oauth2.github.aspnetcore/GithubClaimsAction.cs diff --git a/1-src/oauth2.github.aspnetcore/GithubOAuthHandler.cs b/src/oauth2.github.aspnetcore/GithubOAuthHandler.cs similarity index 100% rename from 1-src/oauth2.github.aspnetcore/GithubOAuthHandler.cs rename to src/oauth2.github.aspnetcore/GithubOAuthHandler.cs diff --git a/1-src/oauth2.github.aspnetcore/GithubOAuthOptions.cs b/src/oauth2.github.aspnetcore/GithubOAuthOptions.cs similarity index 100% rename from 1-src/oauth2.github.aspnetcore/GithubOAuthOptions.cs rename to src/oauth2.github.aspnetcore/GithubOAuthOptions.cs diff --git a/1-src/oauth2.github.aspnetcore/oauth2.github.aspnetcore.csproj b/src/oauth2.github.aspnetcore/oauth2.github.aspnetcore.csproj similarity index 100% rename from 1-src/oauth2.github.aspnetcore/oauth2.github.aspnetcore.csproj rename to src/oauth2.github.aspnetcore/oauth2.github.aspnetcore.csproj diff --git a/1-src/oauth2.qqconnect.aspnetcore/ApplicationBuilderExtension.cs b/src/oauth2.qqconnect.aspnetcore/ApplicationBuilderExtension.cs similarity index 100% rename from 1-src/oauth2.qqconnect.aspnetcore/ApplicationBuilderExtension.cs rename to src/oauth2.qqconnect.aspnetcore/ApplicationBuilderExtension.cs diff --git a/1-src/oauth2.qqconnect.aspnetcore/QQConnectOAuthHandler.cs b/src/oauth2.qqconnect.aspnetcore/QQConnectOAuthHandler.cs similarity index 100% rename from 1-src/oauth2.qqconnect.aspnetcore/QQConnectOAuthHandler.cs rename to src/oauth2.qqconnect.aspnetcore/QQConnectOAuthHandler.cs diff --git a/1-src/oauth2.qqconnect.aspnetcore/QQConnectOAuthOptions.cs b/src/oauth2.qqconnect.aspnetcore/QQConnectOAuthOptions.cs similarity index 100% rename from 1-src/oauth2.qqconnect.aspnetcore/QQConnectOAuthOptions.cs rename to src/oauth2.qqconnect.aspnetcore/QQConnectOAuthOptions.cs diff --git a/1-src/oauth2.qqconnect.aspnetcore/oauth2.qqconnect.aspnetcore.csproj b/src/oauth2.qqconnect.aspnetcore/oauth2.qqconnect.aspnetcore.csproj similarity index 100% rename from 1-src/oauth2.qqconnect.aspnetcore/oauth2.qqconnect.aspnetcore.csproj rename to src/oauth2.qqconnect.aspnetcore/oauth2.qqconnect.aspnetcore.csproj diff --git a/1-src/oauth2.qqconnect.owin/AppBuilderExtensions.cs b/src/oauth2.qqconnect.owin/AppBuilderExtensions.cs similarity index 100% rename from 1-src/oauth2.qqconnect.owin/AppBuilderExtensions.cs rename to src/oauth2.qqconnect.owin/AppBuilderExtensions.cs diff --git a/1-src/oauth2.qqconnect.owin/QQConnectOAuthHandler.cs b/src/oauth2.qqconnect.owin/QQConnectOAuthHandler.cs similarity index 100% rename from 1-src/oauth2.qqconnect.owin/QQConnectOAuthHandler.cs rename to src/oauth2.qqconnect.owin/QQConnectOAuthHandler.cs diff --git a/1-src/oauth2.qqconnect.owin/QQConnectOAuthMiddleware.cs b/src/oauth2.qqconnect.owin/QQConnectOAuthMiddleware.cs similarity index 100% rename from 1-src/oauth2.qqconnect.owin/QQConnectOAuthMiddleware.cs rename to src/oauth2.qqconnect.owin/QQConnectOAuthMiddleware.cs diff --git a/1-src/oauth2.qqconnect.owin/QQConnectOAuthOptions.cs b/src/oauth2.qqconnect.owin/QQConnectOAuthOptions.cs similarity index 100% rename from 1-src/oauth2.qqconnect.owin/QQConnectOAuthOptions.cs rename to src/oauth2.qqconnect.owin/QQConnectOAuthOptions.cs diff --git a/1-src/oauth2.qqconnect.owin/oauth2.qqconnect.owin.csproj b/src/oauth2.qqconnect.owin/oauth2.qqconnect.owin.csproj similarity index 100% rename from 1-src/oauth2.qqconnect.owin/oauth2.qqconnect.owin.csproj rename to src/oauth2.qqconnect.owin/oauth2.qqconnect.owin.csproj diff --git a/1-src/oauth2.qqconnect/Extensions/ClaimExtension.cs b/src/oauth2.qqconnect/Extensions/ClaimExtension.cs similarity index 100% rename from 1-src/oauth2.qqconnect/Extensions/ClaimExtension.cs rename to src/oauth2.qqconnect/Extensions/ClaimExtension.cs diff --git a/1-src/oauth2.qqconnect/Extensions/DictionaryExtension.cs b/src/oauth2.qqconnect/Extensions/DictionaryExtension.cs similarity index 100% rename from 1-src/oauth2.qqconnect/Extensions/DictionaryExtension.cs rename to src/oauth2.qqconnect/Extensions/DictionaryExtension.cs diff --git a/1-src/oauth2.qqconnect/Extensions/JObjectExtension.cs b/src/oauth2.qqconnect/Extensions/JObjectExtension.cs similarity index 100% rename from 1-src/oauth2.qqconnect/Extensions/JObjectExtension.cs rename to src/oauth2.qqconnect/Extensions/JObjectExtension.cs diff --git a/1-src/oauth2.qqconnect/Extensions/QQConnectPropertiesExtension.cs b/src/oauth2.qqconnect/Extensions/QQConnectPropertiesExtension.cs similarity index 100% rename from 1-src/oauth2.qqconnect/Extensions/QQConnectPropertiesExtension.cs rename to src/oauth2.qqconnect/Extensions/QQConnectPropertiesExtension.cs diff --git a/1-src/oauth2.qqconnect/Extensions/SetExtension.cs b/src/oauth2.qqconnect/Extensions/SetExtension.cs similarity index 100% rename from 1-src/oauth2.qqconnect/Extensions/SetExtension.cs rename to src/oauth2.qqconnect/Extensions/SetExtension.cs diff --git a/1-src/oauth2.qqconnect/Extensions/StringExtension.cs b/src/oauth2.qqconnect/Extensions/StringExtension.cs similarity index 100% rename from 1-src/oauth2.qqconnect/Extensions/StringExtension.cs rename to src/oauth2.qqconnect/Extensions/StringExtension.cs diff --git a/1-src/oauth2.qqconnect/QQConnectClient.cs b/src/oauth2.qqconnect/QQConnectClient.cs similarity index 100% rename from 1-src/oauth2.qqconnect/QQConnectClient.cs rename to src/oauth2.qqconnect/QQConnectClient.cs diff --git a/1-src/oauth2.qqconnect/QQConnectOptions.cs b/src/oauth2.qqconnect/QQConnectOptions.cs similarity index 100% rename from 1-src/oauth2.qqconnect/QQConnectOptions.cs rename to src/oauth2.qqconnect/QQConnectOptions.cs diff --git a/1-src/oauth2.qqconnect/QQConnectProfile.ClaimTypes.cs b/src/oauth2.qqconnect/QQConnectProfile.ClaimTypes.cs similarity index 100% rename from 1-src/oauth2.qqconnect/QQConnectProfile.ClaimTypes.cs rename to src/oauth2.qqconnect/QQConnectProfile.ClaimTypes.cs diff --git a/1-src/oauth2.qqconnect/QQConnectProfile.cs b/src/oauth2.qqconnect/QQConnectProfile.cs similarity index 100% rename from 1-src/oauth2.qqconnect/QQConnectProfile.cs rename to src/oauth2.qqconnect/QQConnectProfile.cs diff --git a/1-src/oauth2.qqconnect/QQConnectProperties.cs b/src/oauth2.qqconnect/QQConnectProperties.cs similarity index 100% rename from 1-src/oauth2.qqconnect/QQConnectProperties.cs rename to src/oauth2.qqconnect/QQConnectProperties.cs diff --git a/1-src/oauth2.qqconnect/Response/OpenIdResponse.cs b/src/oauth2.qqconnect/Response/OpenIdResponse.cs similarity index 100% rename from 1-src/oauth2.qqconnect/Response/OpenIdResponse.cs rename to src/oauth2.qqconnect/Response/OpenIdResponse.cs diff --git a/1-src/oauth2.qqconnect/Response/TokenResponse.cs b/src/oauth2.qqconnect/Response/TokenResponse.cs similarity index 100% rename from 1-src/oauth2.qqconnect/Response/TokenResponse.cs rename to src/oauth2.qqconnect/Response/TokenResponse.cs diff --git a/1-src/oauth2.qqconnect/Response/UserResponse.cs b/src/oauth2.qqconnect/Response/UserResponse.cs similarity index 100% rename from 1-src/oauth2.qqconnect/Response/UserResponse.cs rename to src/oauth2.qqconnect/Response/UserResponse.cs diff --git a/1-src/oauth2.qqconnect/oauth2.qqconnect.csproj b/src/oauth2.qqconnect/oauth2.qqconnect.csproj similarity index 100% rename from 1-src/oauth2.qqconnect/oauth2.qqconnect.csproj rename to src/oauth2.qqconnect/oauth2.qqconnect.csproj diff --git a/1-src/traefik/traefik.yml b/src/traefik/traefik.yml similarity index 100% rename from 1-src/traefik/traefik.yml rename to src/traefik/traefik.yml diff --git a/1-src/uwp.oidc.client.authorization-code/App.xaml b/src/uwp.oidc.client.authorization-code/App.xaml similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/App.xaml rename to src/uwp.oidc.client.authorization-code/App.xaml diff --git a/1-src/uwp.oidc.client.authorization-code/App.xaml.cs b/src/uwp.oidc.client.authorization-code/App.xaml.cs similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/App.xaml.cs rename to src/uwp.oidc.client.authorization-code/App.xaml.cs diff --git a/1-src/uwp.oidc.client.authorization-code/Assets/LockScreenLogo.scale-200.png b/src/uwp.oidc.client.authorization-code/Assets/LockScreenLogo.scale-200.png similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/Assets/LockScreenLogo.scale-200.png rename to src/uwp.oidc.client.authorization-code/Assets/LockScreenLogo.scale-200.png diff --git a/1-src/uwp.oidc.client.authorization-code/Assets/SplashScreen.scale-200.png b/src/uwp.oidc.client.authorization-code/Assets/SplashScreen.scale-200.png similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/Assets/SplashScreen.scale-200.png rename to src/uwp.oidc.client.authorization-code/Assets/SplashScreen.scale-200.png diff --git a/1-src/uwp.oidc.client.authorization-code/Assets/Square150x150Logo.scale-200.png b/src/uwp.oidc.client.authorization-code/Assets/Square150x150Logo.scale-200.png similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/Assets/Square150x150Logo.scale-200.png rename to src/uwp.oidc.client.authorization-code/Assets/Square150x150Logo.scale-200.png diff --git a/1-src/uwp.oidc.client.authorization-code/Assets/Square44x44Logo.scale-200.png b/src/uwp.oidc.client.authorization-code/Assets/Square44x44Logo.scale-200.png similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/Assets/Square44x44Logo.scale-200.png rename to src/uwp.oidc.client.authorization-code/Assets/Square44x44Logo.scale-200.png diff --git a/1-src/uwp.oidc.client.authorization-code/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/uwp.oidc.client.authorization-code/Assets/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/Assets/Square44x44Logo.targetsize-24_altform-unplated.png rename to src/uwp.oidc.client.authorization-code/Assets/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/1-src/uwp.oidc.client.authorization-code/Assets/StoreLogo.png b/src/uwp.oidc.client.authorization-code/Assets/StoreLogo.png similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/Assets/StoreLogo.png rename to src/uwp.oidc.client.authorization-code/Assets/StoreLogo.png diff --git a/1-src/uwp.oidc.client.authorization-code/Assets/Wide310x150Logo.scale-200.png b/src/uwp.oidc.client.authorization-code/Assets/Wide310x150Logo.scale-200.png similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/Assets/Wide310x150Logo.scale-200.png rename to src/uwp.oidc.client.authorization-code/Assets/Wide310x150Logo.scale-200.png diff --git a/1-src/uwp.oidc.client.authorization-code/LoginPage.xaml b/src/uwp.oidc.client.authorization-code/LoginPage.xaml similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/LoginPage.xaml rename to src/uwp.oidc.client.authorization-code/LoginPage.xaml diff --git a/1-src/uwp.oidc.client.authorization-code/LoginPage.xaml.cs b/src/uwp.oidc.client.authorization-code/LoginPage.xaml.cs similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/LoginPage.xaml.cs rename to src/uwp.oidc.client.authorization-code/LoginPage.xaml.cs diff --git a/1-src/uwp.oidc.client.authorization-code/MainPage.xaml b/src/uwp.oidc.client.authorization-code/MainPage.xaml similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/MainPage.xaml rename to src/uwp.oidc.client.authorization-code/MainPage.xaml diff --git a/1-src/uwp.oidc.client.authorization-code/MainPage.xaml.cs b/src/uwp.oidc.client.authorization-code/MainPage.xaml.cs similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/MainPage.xaml.cs rename to src/uwp.oidc.client.authorization-code/MainPage.xaml.cs diff --git a/1-src/uwp.oidc.client.authorization-code/Models/JwtModel.cs b/src/uwp.oidc.client.authorization-code/Models/JwtModel.cs similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/Models/JwtModel.cs rename to src/uwp.oidc.client.authorization-code/Models/JwtModel.cs diff --git a/1-src/uwp.oidc.client.authorization-code/Models/TokenModel.cs b/src/uwp.oidc.client.authorization-code/Models/TokenModel.cs similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/Models/TokenModel.cs rename to src/uwp.oidc.client.authorization-code/Models/TokenModel.cs diff --git a/1-src/uwp.oidc.client.authorization-code/Oidc/OidcClient.cs b/src/uwp.oidc.client.authorization-code/Oidc/OidcClient.cs similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/Oidc/OidcClient.cs rename to src/uwp.oidc.client.authorization-code/Oidc/OidcClient.cs diff --git a/1-src/uwp.oidc.client.authorization-code/Oidc/OidcOptions.cs b/src/uwp.oidc.client.authorization-code/Oidc/OidcOptions.cs similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/Oidc/OidcOptions.cs rename to src/uwp.oidc.client.authorization-code/Oidc/OidcOptions.cs diff --git a/1-src/uwp.oidc.client.authorization-code/Oidc/TokenFile.cs b/src/uwp.oidc.client.authorization-code/Oidc/TokenFile.cs similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/Oidc/TokenFile.cs rename to src/uwp.oidc.client.authorization-code/Oidc/TokenFile.cs diff --git a/1-src/uwp.oidc.client.authorization-code/Package.appxmanifest b/src/uwp.oidc.client.authorization-code/Package.appxmanifest similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/Package.appxmanifest rename to src/uwp.oidc.client.authorization-code/Package.appxmanifest diff --git a/1-src/uwp.oidc.client.authorization-code/Properties/AssemblyInfo.cs b/src/uwp.oidc.client.authorization-code/Properties/AssemblyInfo.cs similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/Properties/AssemblyInfo.cs rename to src/uwp.oidc.client.authorization-code/Properties/AssemblyInfo.cs diff --git a/1-src/uwp.oidc.client.authorization-code/Properties/Default.rd.xml b/src/uwp.oidc.client.authorization-code/Properties/Default.rd.xml similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/Properties/Default.rd.xml rename to src/uwp.oidc.client.authorization-code/Properties/Default.rd.xml diff --git a/1-src/uwp.oidc.client.authorization-code/uwp.oidc.client.authorization-code.csproj b/src/uwp.oidc.client.authorization-code/uwp.oidc.client.authorization-code.csproj similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/uwp.oidc.client.authorization-code.csproj rename to src/uwp.oidc.client.authorization-code/uwp.oidc.client.authorization-code.csproj diff --git a/1-src/uwp.oidc.client.authorization-code/uwp.pfx b/src/uwp.oidc.client.authorization-code/uwp.pfx similarity index 100% rename from 1-src/uwp.oidc.client.authorization-code/uwp.pfx rename to src/uwp.oidc.client.authorization-code/uwp.pfx diff --git a/1-src/web.oauth2.client.aspnetcore.dockerfile b/src/web.oauth2.client.aspnetcore.dockerfile similarity index 100% rename from 1-src/web.oauth2.client.aspnetcore.dockerfile rename to src/web.oauth2.client.aspnetcore.dockerfile diff --git a/1-src/web.oauth2.client.aspnetcore/Controllers/AccountController.cs b/src/web.oauth2.client.aspnetcore/Controllers/AccountController.cs similarity index 100% rename from 1-src/web.oauth2.client.aspnetcore/Controllers/AccountController.cs rename to src/web.oauth2.client.aspnetcore/Controllers/AccountController.cs diff --git a/1-src/web.oidc.client.hybrid/Controllers/HomeController.cs b/src/web.oauth2.client.aspnetcore/Controllers/HomeController.cs similarity index 100% rename from 1-src/web.oidc.client.hybrid/Controllers/HomeController.cs rename to src/web.oauth2.client.aspnetcore/Controllers/HomeController.cs diff --git a/1-src/web.oauth2.client.aspnetcore/OAuth2/OAuth2Constants.cs b/src/web.oauth2.client.aspnetcore/OAuth2/OAuth2Constants.cs similarity index 100% rename from 1-src/web.oauth2.client.aspnetcore/OAuth2/OAuth2Constants.cs rename to src/web.oauth2.client.aspnetcore/OAuth2/OAuth2Constants.cs diff --git a/1-src/web.oauth2.client.aspnetcore/OAuth2/OAuth2Extensions.cs b/src/web.oauth2.client.aspnetcore/OAuth2/OAuth2Extensions.cs similarity index 100% rename from 1-src/web.oauth2.client.aspnetcore/OAuth2/OAuth2Extensions.cs rename to src/web.oauth2.client.aspnetcore/OAuth2/OAuth2Extensions.cs diff --git a/1-src/web.oidc.client.hybrid/Program.cs b/src/web.oauth2.client.aspnetcore/Program.cs similarity index 100% rename from 1-src/web.oidc.client.hybrid/Program.cs rename to src/web.oauth2.client.aspnetcore/Program.cs diff --git a/1-src/web.oauth2.client.aspnetcore/Startup.cs b/src/web.oauth2.client.aspnetcore/Startup.cs similarity index 100% rename from 1-src/web.oauth2.client.aspnetcore/Startup.cs rename to src/web.oauth2.client.aspnetcore/Startup.cs diff --git a/1-src/web.oauth2.client.aspnetcore/Views/Home/Index.cshtml b/src/web.oauth2.client.aspnetcore/Views/Home/Index.cshtml similarity index 100% rename from 1-src/web.oauth2.client.aspnetcore/Views/Home/Index.cshtml rename to src/web.oauth2.client.aspnetcore/Views/Home/Index.cshtml diff --git a/1-src/web.oauth2.client.aspnetcore/Views/Shared/_Layout.cshtml b/src/web.oauth2.client.aspnetcore/Views/Shared/_Layout.cshtml similarity index 100% rename from 1-src/web.oauth2.client.aspnetcore/Views/Shared/_Layout.cshtml rename to src/web.oauth2.client.aspnetcore/Views/Shared/_Layout.cshtml diff --git a/1-src/web.oauth2.client.aspnetcore/Views/_ViewImports.cshtml b/src/web.oauth2.client.aspnetcore/Views/_ViewImports.cshtml similarity index 100% rename from 1-src/web.oauth2.client.aspnetcore/Views/_ViewImports.cshtml rename to src/web.oauth2.client.aspnetcore/Views/_ViewImports.cshtml diff --git a/1-src/web.oidc.server.ids4/Views/_ViewStart.cshtml b/src/web.oauth2.client.aspnetcore/Views/_ViewStart.cshtml similarity index 100% rename from 1-src/web.oidc.server.ids4/Views/_ViewStart.cshtml rename to src/web.oauth2.client.aspnetcore/Views/_ViewStart.cshtml diff --git a/1-src/web.oidc.server.ids4/web.config b/src/web.oauth2.client.aspnetcore/web.config similarity index 100% rename from 1-src/web.oidc.server.ids4/web.config rename to src/web.oauth2.client.aspnetcore/web.config diff --git a/1-src/web.oauth2.client.aspnetcore/web.oauth2.client.aspnetcore.csproj b/src/web.oauth2.client.aspnetcore/web.oauth2.client.aspnetcore.csproj similarity index 100% rename from 1-src/web.oauth2.client.aspnetcore/web.oauth2.client.aspnetcore.csproj rename to src/web.oauth2.client.aspnetcore/web.oauth2.client.aspnetcore.csproj diff --git a/1-src/web.oauth2.client.owin/Controllers/AccountController.cs b/src/web.oauth2.client.owin/Controllers/AccountController.cs similarity index 100% rename from 1-src/web.oauth2.client.owin/Controllers/AccountController.cs rename to src/web.oauth2.client.owin/Controllers/AccountController.cs diff --git a/1-src/web.oidc.client.implicit/Controllers/HomeController.cs b/src/web.oauth2.client.owin/Controllers/HomeController.cs similarity index 100% rename from 1-src/web.oidc.client.implicit/Controllers/HomeController.cs rename to src/web.oauth2.client.owin/Controllers/HomeController.cs diff --git a/1-src/web.oauth2.client.owin/Global.asax b/src/web.oauth2.client.owin/Global.asax similarity index 100% rename from 1-src/web.oauth2.client.owin/Global.asax rename to src/web.oauth2.client.owin/Global.asax diff --git a/1-src/web.oauth2.client.owin/Global.asax.cs b/src/web.oauth2.client.owin/Global.asax.cs similarity index 100% rename from 1-src/web.oauth2.client.owin/Global.asax.cs rename to src/web.oauth2.client.owin/Global.asax.cs diff --git a/1-src/web.oauth2.client.owin/OAuth2/OAuth2Constants.cs b/src/web.oauth2.client.owin/OAuth2/OAuth2Constants.cs similarity index 100% rename from 1-src/web.oauth2.client.owin/OAuth2/OAuth2Constants.cs rename to src/web.oauth2.client.owin/OAuth2/OAuth2Constants.cs diff --git a/1-src/web.oauth2.client.owin/OAuth2/OAuth2Extensions.cs b/src/web.oauth2.client.owin/OAuth2/OAuth2Extensions.cs similarity index 100% rename from 1-src/web.oauth2.client.owin/OAuth2/OAuth2Extensions.cs rename to src/web.oauth2.client.owin/OAuth2/OAuth2Extensions.cs diff --git a/1-src/web.oauth2.client.owin/Properties/AssemblyInfo.cs b/src/web.oauth2.client.owin/Properties/AssemblyInfo.cs similarity index 100% rename from 1-src/web.oauth2.client.owin/Properties/AssemblyInfo.cs rename to src/web.oauth2.client.owin/Properties/AssemblyInfo.cs diff --git a/1-src/web.oauth2.client.owin/Startup.cs b/src/web.oauth2.client.owin/Startup.cs similarity index 100% rename from 1-src/web.oauth2.client.owin/Startup.cs rename to src/web.oauth2.client.owin/Startup.cs diff --git a/1-src/web.oidc.client.implicit/Views/Home/Index.cshtml b/src/web.oauth2.client.owin/Views/Home/Index.cshtml similarity index 100% rename from 1-src/web.oidc.client.implicit/Views/Home/Index.cshtml rename to src/web.oauth2.client.owin/Views/Home/Index.cshtml diff --git a/1-src/web.oauth2.client.owin/Views/Shared/_Layout.cshtml b/src/web.oauth2.client.owin/Views/Shared/_Layout.cshtml similarity index 100% rename from 1-src/web.oauth2.client.owin/Views/Shared/_Layout.cshtml rename to src/web.oauth2.client.owin/Views/Shared/_Layout.cshtml diff --git a/1-src/web.oidc.client.implicit/Views/_ViewStart.cshtml b/src/web.oauth2.client.owin/Views/_ViewStart.cshtml similarity index 100% rename from 1-src/web.oidc.client.implicit/Views/_ViewStart.cshtml rename to src/web.oauth2.client.owin/Views/_ViewStart.cshtml diff --git a/1-src/web.oauth2.client.owin/Views/web.config b/src/web.oauth2.client.owin/Views/web.config similarity index 100% rename from 1-src/web.oauth2.client.owin/Views/web.config rename to src/web.oauth2.client.owin/Views/web.config diff --git a/1-src/web.oauth2.client.owin/Web.config b/src/web.oauth2.client.owin/Web.config similarity index 100% rename from 1-src/web.oauth2.client.owin/Web.config rename to src/web.oauth2.client.owin/Web.config diff --git a/1-src/web.oauth2.client.owin/packages.config b/src/web.oauth2.client.owin/packages.config similarity index 100% rename from 1-src/web.oauth2.client.owin/packages.config rename to src/web.oauth2.client.owin/packages.config diff --git a/1-src/web.oauth2.client.owin/web.oauth2.client.owin.csproj b/src/web.oauth2.client.owin/web.oauth2.client.owin.csproj similarity index 100% rename from 1-src/web.oauth2.client.owin/web.oauth2.client.owin.csproj rename to src/web.oauth2.client.owin/web.oauth2.client.owin.csproj diff --git a/1-src/web.oauth2.resources.aspnetcore.dockerfile b/src/web.oauth2.resources.aspnetcore.dockerfile similarity index 100% rename from 1-src/web.oauth2.resources.aspnetcore.dockerfile rename to src/web.oauth2.resources.aspnetcore.dockerfile diff --git a/1-src/web.oauth2.resources.aspnetcore/Apis/Book.cs b/src/web.oauth2.resources.aspnetcore/Apis/Book.cs similarity index 100% rename from 1-src/web.oauth2.resources.aspnetcore/Apis/Book.cs rename to src/web.oauth2.resources.aspnetcore/Apis/Book.cs diff --git a/1-src/web.oauth2.resources.aspnetcore/Apis/BooksController.cs b/src/web.oauth2.resources.aspnetcore/Apis/BooksController.cs similarity index 100% rename from 1-src/web.oauth2.resources.aspnetcore/Apis/BooksController.cs rename to src/web.oauth2.resources.aspnetcore/Apis/BooksController.cs diff --git a/1-src/web.oauth2.resources.aspnetcore/Apis/HomeController.cs b/src/web.oauth2.resources.aspnetcore/Apis/HomeController.cs similarity index 100% rename from 1-src/web.oauth2.resources.aspnetcore/Apis/HomeController.cs rename to src/web.oauth2.resources.aspnetcore/Apis/HomeController.cs diff --git a/1-src/web.oauth2.resources.aspnetcore/Permissions/PermissionExtension.cs b/src/web.oauth2.resources.aspnetcore/Permissions/PermissionExtension.cs similarity index 100% rename from 1-src/web.oauth2.resources.aspnetcore/Permissions/PermissionExtension.cs rename to src/web.oauth2.resources.aspnetcore/Permissions/PermissionExtension.cs diff --git a/1-src/web.oauth2.resources.aspnetcore/Permissions/PermissionHandlerProvider.cs b/src/web.oauth2.resources.aspnetcore/Permissions/PermissionHandlerProvider.cs similarity index 100% rename from 1-src/web.oauth2.resources.aspnetcore/Permissions/PermissionHandlerProvider.cs rename to src/web.oauth2.resources.aspnetcore/Permissions/PermissionHandlerProvider.cs diff --git a/1-src/web.oauth2.resources.aspnetcore/Permissions/RolePermissionHandler.cs b/src/web.oauth2.resources.aspnetcore/Permissions/RolePermissionHandler.cs similarity index 100% rename from 1-src/web.oauth2.resources.aspnetcore/Permissions/RolePermissionHandler.cs rename to src/web.oauth2.resources.aspnetcore/Permissions/RolePermissionHandler.cs diff --git a/1-src/web.oauth2.resources.aspnetcore/Permissions/ScopePermissionHandler.cs b/src/web.oauth2.resources.aspnetcore/Permissions/ScopePermissionHandler.cs similarity index 100% rename from 1-src/web.oauth2.resources.aspnetcore/Permissions/ScopePermissionHandler.cs rename to src/web.oauth2.resources.aspnetcore/Permissions/ScopePermissionHandler.cs diff --git a/1-src/web.oauth2.resources.aspnetcore/Program.cs b/src/web.oauth2.resources.aspnetcore/Program.cs similarity index 100% rename from 1-src/web.oauth2.resources.aspnetcore/Program.cs rename to src/web.oauth2.resources.aspnetcore/Program.cs diff --git a/1-src/web.oauth2.resources.aspnetcore/Startup.cs b/src/web.oauth2.resources.aspnetcore/Startup.cs similarity index 100% rename from 1-src/web.oauth2.resources.aspnetcore/Startup.cs rename to src/web.oauth2.resources.aspnetcore/Startup.cs diff --git a/1-src/web.oauth2.resources.aspnetcore/Web.config b/src/web.oauth2.resources.aspnetcore/Web.config similarity index 100% rename from 1-src/web.oauth2.resources.aspnetcore/Web.config rename to src/web.oauth2.resources.aspnetcore/Web.config diff --git a/1-src/web.oauth2.resources.aspnetcore/web.oauth2.resources.aspnetcore.csproj b/src/web.oauth2.resources.aspnetcore/web.oauth2.resources.aspnetcore.csproj similarity index 100% rename from 1-src/web.oauth2.resources.aspnetcore/web.oauth2.resources.aspnetcore.csproj rename to src/web.oauth2.resources.aspnetcore/web.oauth2.resources.aspnetcore.csproj diff --git a/1-src/web.oauth2.resources.java.dockerfile b/src/web.oauth2.resources.java.dockerfile similarity index 100% rename from 1-src/web.oauth2.resources.java.dockerfile rename to src/web.oauth2.resources.java.dockerfile diff --git a/1-src/web.oauth2.resources.java/.gitignore b/src/web.oauth2.resources.java/.gitignore similarity index 100% rename from 1-src/web.oauth2.resources.java/.gitignore rename to src/web.oauth2.resources.java/.gitignore diff --git a/1-src/web.oauth2.resources.java/.mvn/wrapper/MavenWrapperDownloader.java b/src/web.oauth2.resources.java/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from 1-src/web.oauth2.resources.java/.mvn/wrapper/MavenWrapperDownloader.java rename to src/web.oauth2.resources.java/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/1-src/web.oauth2.resources.java/.mvn/wrapper/maven-wrapper.jar b/src/web.oauth2.resources.java/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from 1-src/web.oauth2.resources.java/.mvn/wrapper/maven-wrapper.jar rename to src/web.oauth2.resources.java/.mvn/wrapper/maven-wrapper.jar diff --git a/1-src/web.oauth2.resources.java/.mvn/wrapper/maven-wrapper.properties b/src/web.oauth2.resources.java/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from 1-src/web.oauth2.resources.java/.mvn/wrapper/maven-wrapper.properties rename to src/web.oauth2.resources.java/.mvn/wrapper/maven-wrapper.properties diff --git a/1-src/web.oauth2.resources.java/mvnw b/src/web.oauth2.resources.java/mvnw old mode 100755 new mode 100644 similarity index 100% rename from 1-src/web.oauth2.resources.java/mvnw rename to src/web.oauth2.resources.java/mvnw diff --git a/1-src/web.oauth2.resources.java/mvnw.cmd b/src/web.oauth2.resources.java/mvnw.cmd similarity index 100% rename from 1-src/web.oauth2.resources.java/mvnw.cmd rename to src/web.oauth2.resources.java/mvnw.cmd diff --git a/1-src/web.oauth2.resources.java/pom.xml b/src/web.oauth2.resources.java/pom.xml similarity index 100% rename from 1-src/web.oauth2.resources.java/pom.xml rename to src/web.oauth2.resources.java/pom.xml diff --git a/1-src/web.oauth2.resources.java/src/main/java/api/ApiApplication.java b/src/web.oauth2.resources.java/src/main/java/api/ApiApplication.java similarity index 100% rename from 1-src/web.oauth2.resources.java/src/main/java/api/ApiApplication.java rename to src/web.oauth2.resources.java/src/main/java/api/ApiApplication.java diff --git a/1-src/web.oauth2.resources.java/src/main/java/api/configuration/WebConfiguration.java b/src/web.oauth2.resources.java/src/main/java/api/configuration/WebConfiguration.java similarity index 100% rename from 1-src/web.oauth2.resources.java/src/main/java/api/configuration/WebConfiguration.java rename to src/web.oauth2.resources.java/src/main/java/api/configuration/WebConfiguration.java diff --git a/1-src/web.oauth2.resources.java/src/main/java/api/configuration/WebSecurityConfiguration.java b/src/web.oauth2.resources.java/src/main/java/api/configuration/WebSecurityConfiguration.java similarity index 100% rename from 1-src/web.oauth2.resources.java/src/main/java/api/configuration/WebSecurityConfiguration.java rename to src/web.oauth2.resources.java/src/main/java/api/configuration/WebSecurityConfiguration.java diff --git a/1-src/web.oauth2.resources.java/src/main/java/api/controller/ApiController.java b/src/web.oauth2.resources.java/src/main/java/api/controller/ApiController.java similarity index 100% rename from 1-src/web.oauth2.resources.java/src/main/java/api/controller/ApiController.java rename to src/web.oauth2.resources.java/src/main/java/api/controller/ApiController.java diff --git a/1-src/web.oauth2.resources.java/src/main/java/api/handler/CustomizedAccessDeniedHandler.java b/src/web.oauth2.resources.java/src/main/java/api/handler/CustomizedAccessDeniedHandler.java similarity index 100% rename from 1-src/web.oauth2.resources.java/src/main/java/api/handler/CustomizedAccessDeniedHandler.java rename to src/web.oauth2.resources.java/src/main/java/api/handler/CustomizedAccessDeniedHandler.java diff --git a/1-src/web.oauth2.resources.java/src/main/java/api/handler/CustomizedAuthenticationEntryPoint.java b/src/web.oauth2.resources.java/src/main/java/api/handler/CustomizedAuthenticationEntryPoint.java similarity index 100% rename from 1-src/web.oauth2.resources.java/src/main/java/api/handler/CustomizedAuthenticationEntryPoint.java rename to src/web.oauth2.resources.java/src/main/java/api/handler/CustomizedAuthenticationEntryPoint.java diff --git a/1-src/web.oauth2.resources.java/src/main/resources/application.yml b/src/web.oauth2.resources.java/src/main/resources/application.yml similarity index 100% rename from 1-src/web.oauth2.resources.java/src/main/resources/application.yml rename to src/web.oauth2.resources.java/src/main/resources/application.yml diff --git a/1-src/web.oauth2.resources.nodejs.dockerfile b/src/web.oauth2.resources.nodejs.dockerfile similarity index 100% rename from 1-src/web.oauth2.resources.nodejs.dockerfile rename to src/web.oauth2.resources.nodejs.dockerfile diff --git a/1-src/web.oauth2.resources.nodejs/app.js b/src/web.oauth2.resources.nodejs/app.js similarity index 100% rename from 1-src/web.oauth2.resources.nodejs/app.js rename to src/web.oauth2.resources.nodejs/app.js diff --git a/1-src/web.oauth2.resources.nodejs/authentication.js b/src/web.oauth2.resources.nodejs/authentication.js similarity index 100% rename from 1-src/web.oauth2.resources.nodejs/authentication.js rename to src/web.oauth2.resources.nodejs/authentication.js diff --git a/1-src/web.oauth2.resources.nodejs/package-lock.json b/src/web.oauth2.resources.nodejs/package-lock.json similarity index 100% rename from 1-src/web.oauth2.resources.nodejs/package-lock.json rename to src/web.oauth2.resources.nodejs/package-lock.json diff --git a/1-src/web.oauth2.resources.nodejs/package.json b/src/web.oauth2.resources.nodejs/package.json similarity index 100% rename from 1-src/web.oauth2.resources.nodejs/package.json rename to src/web.oauth2.resources.nodejs/package.json diff --git a/1-src/web.oauth2.resources.owin/Apis/IndexApiController.cs b/src/web.oauth2.resources.owin/Apis/IndexApiController.cs similarity index 100% rename from 1-src/web.oauth2.resources.owin/Apis/IndexApiController.cs rename to src/web.oauth2.resources.owin/Apis/IndexApiController.cs diff --git a/1-src/web.oauth2.resources.owin/Properties/AssemblyInfo.cs b/src/web.oauth2.resources.owin/Properties/AssemblyInfo.cs similarity index 100% rename from 1-src/web.oauth2.resources.owin/Properties/AssemblyInfo.cs rename to src/web.oauth2.resources.owin/Properties/AssemblyInfo.cs diff --git a/1-src/web.oauth2.resources.owin/Startup.cs b/src/web.oauth2.resources.owin/Startup.cs similarity index 100% rename from 1-src/web.oauth2.resources.owin/Startup.cs rename to src/web.oauth2.resources.owin/Startup.cs diff --git a/1-src/web.oauth2.resources.owin/Web.config b/src/web.oauth2.resources.owin/Web.config similarity index 100% rename from 1-src/web.oauth2.resources.owin/Web.config rename to src/web.oauth2.resources.owin/Web.config diff --git a/1-src/web.oauth2.resources.owin/packages.config b/src/web.oauth2.resources.owin/packages.config similarity index 100% rename from 1-src/web.oauth2.resources.owin/packages.config rename to src/web.oauth2.resources.owin/packages.config diff --git a/1-src/web.oauth2.resources.owin/web.oauth2.resources.owin.csproj b/src/web.oauth2.resources.owin/web.oauth2.resources.owin.csproj similarity index 100% rename from 1-src/web.oauth2.resources.owin/web.oauth2.resources.owin.csproj rename to src/web.oauth2.resources.owin/web.oauth2.resources.owin.csproj diff --git a/1-src/web.oidc.client.hybrid.dockerfile b/src/web.oidc.client.hybrid.dockerfile similarity index 100% rename from 1-src/web.oidc.client.hybrid.dockerfile rename to src/web.oidc.client.hybrid.dockerfile diff --git a/1-src/web.oidc.client.hybrid/Controllers/AccountController.cs b/src/web.oidc.client.hybrid/Controllers/AccountController.cs similarity index 100% rename from 1-src/web.oidc.client.hybrid/Controllers/AccountController.cs rename to src/web.oidc.client.hybrid/Controllers/AccountController.cs diff --git a/1-src/web.oauth2.client.aspnetcore/Controllers/HomeController.cs b/src/web.oidc.client.hybrid/Controllers/HomeController.cs similarity index 100% rename from 1-src/web.oauth2.client.aspnetcore/Controllers/HomeController.cs rename to src/web.oidc.client.hybrid/Controllers/HomeController.cs diff --git a/1-src/web.oidc.client.hybrid/Oidc/Constants.cs b/src/web.oidc.client.hybrid/Oidc/Constants.cs similarity index 100% rename from 1-src/web.oidc.client.hybrid/Oidc/Constants.cs rename to src/web.oidc.client.hybrid/Oidc/Constants.cs diff --git a/1-src/web.oidc.client.hybrid/Oidc/OidcExtentions.cs b/src/web.oidc.client.hybrid/Oidc/OidcExtentions.cs similarity index 100% rename from 1-src/web.oidc.client.hybrid/Oidc/OidcExtentions.cs rename to src/web.oidc.client.hybrid/Oidc/OidcExtentions.cs diff --git a/1-src/web.oauth2.client.aspnetcore/Program.cs b/src/web.oidc.client.hybrid/Program.cs similarity index 100% rename from 1-src/web.oauth2.client.aspnetcore/Program.cs rename to src/web.oidc.client.hybrid/Program.cs diff --git a/1-src/web.oidc.client.hybrid/Startup.cs b/src/web.oidc.client.hybrid/Startup.cs similarity index 100% rename from 1-src/web.oidc.client.hybrid/Startup.cs rename to src/web.oidc.client.hybrid/Startup.cs diff --git a/1-src/web.oidc.client.hybrid/Views/Home/Index.cshtml b/src/web.oidc.client.hybrid/Views/Home/Index.cshtml similarity index 100% rename from 1-src/web.oidc.client.hybrid/Views/Home/Index.cshtml rename to src/web.oidc.client.hybrid/Views/Home/Index.cshtml diff --git a/1-src/web.oidc.client.hybrid/Views/Shared/_Layout.cshtml b/src/web.oidc.client.hybrid/Views/Shared/_Layout.cshtml similarity index 100% rename from 1-src/web.oidc.client.hybrid/Views/Shared/_Layout.cshtml rename to src/web.oidc.client.hybrid/Views/Shared/_Layout.cshtml diff --git a/1-src/web.oidc.client.hybrid/Views/_ViewImports.cshtml b/src/web.oidc.client.hybrid/Views/_ViewImports.cshtml similarity index 100% rename from 1-src/web.oidc.client.hybrid/Views/_ViewImports.cshtml rename to src/web.oidc.client.hybrid/Views/_ViewImports.cshtml diff --git a/1-src/web.oidc.client.hybrid/Views/_ViewStart.cshtml b/src/web.oidc.client.hybrid/Views/_ViewStart.cshtml similarity index 100% rename from 1-src/web.oidc.client.hybrid/Views/_ViewStart.cshtml rename to src/web.oidc.client.hybrid/Views/_ViewStart.cshtml diff --git a/1-src/web.oidc.client.hybrid/web.config b/src/web.oidc.client.hybrid/web.config similarity index 100% rename from 1-src/web.oidc.client.hybrid/web.config rename to src/web.oidc.client.hybrid/web.config diff --git a/1-src/web.oidc.client.hybrid/web.oidc.client.hybrid.csproj b/src/web.oidc.client.hybrid/web.oidc.client.hybrid.csproj similarity index 100% rename from 1-src/web.oidc.client.hybrid/web.oidc.client.hybrid.csproj rename to src/web.oidc.client.hybrid/web.oidc.client.hybrid.csproj diff --git a/1-src/web.oidc.client.implicit/App_Start/RouteConfig.cs b/src/web.oidc.client.implicit/App_Start/RouteConfig.cs similarity index 100% rename from 1-src/web.oidc.client.implicit/App_Start/RouteConfig.cs rename to src/web.oidc.client.implicit/App_Start/RouteConfig.cs diff --git a/1-src/web.oidc.client.implicit/Controllers/AccountController.cs b/src/web.oidc.client.implicit/Controllers/AccountController.cs similarity index 100% rename from 1-src/web.oidc.client.implicit/Controllers/AccountController.cs rename to src/web.oidc.client.implicit/Controllers/AccountController.cs diff --git a/1-src/web.oauth2.client.owin/Controllers/HomeController.cs b/src/web.oidc.client.implicit/Controllers/HomeController.cs similarity index 100% rename from 1-src/web.oauth2.client.owin/Controllers/HomeController.cs rename to src/web.oidc.client.implicit/Controllers/HomeController.cs diff --git a/1-src/web.oidc.client.implicit/Global.asax b/src/web.oidc.client.implicit/Global.asax similarity index 100% rename from 1-src/web.oidc.client.implicit/Global.asax rename to src/web.oidc.client.implicit/Global.asax diff --git a/1-src/web.oidc.client.implicit/Global.asax.cs b/src/web.oidc.client.implicit/Global.asax.cs similarity index 100% rename from 1-src/web.oidc.client.implicit/Global.asax.cs rename to src/web.oidc.client.implicit/Global.asax.cs diff --git a/1-src/web.oidc.client.implicit/Oidc/Constants.cs b/src/web.oidc.client.implicit/Oidc/Constants.cs similarity index 100% rename from 1-src/web.oidc.client.implicit/Oidc/Constants.cs rename to src/web.oidc.client.implicit/Oidc/Constants.cs diff --git a/1-src/web.oidc.client.implicit/Oidc/OidcController.cs b/src/web.oidc.client.implicit/Oidc/OidcController.cs similarity index 100% rename from 1-src/web.oidc.client.implicit/Oidc/OidcController.cs rename to src/web.oidc.client.implicit/Oidc/OidcController.cs diff --git a/1-src/web.oidc.client.implicit/Oidc/OidcExtentions.cs b/src/web.oidc.client.implicit/Oidc/OidcExtentions.cs similarity index 100% rename from 1-src/web.oidc.client.implicit/Oidc/OidcExtentions.cs rename to src/web.oidc.client.implicit/Oidc/OidcExtentions.cs diff --git a/1-src/web.oidc.client.implicit/Properties/AssemblyInfo.cs b/src/web.oidc.client.implicit/Properties/AssemblyInfo.cs similarity index 100% rename from 1-src/web.oidc.client.implicit/Properties/AssemblyInfo.cs rename to src/web.oidc.client.implicit/Properties/AssemblyInfo.cs diff --git a/1-src/web.oidc.client.implicit/Startup.cs b/src/web.oidc.client.implicit/Startup.cs similarity index 100% rename from 1-src/web.oidc.client.implicit/Startup.cs rename to src/web.oidc.client.implicit/Startup.cs diff --git a/1-src/web.oauth2.client.owin/Views/Home/Index.cshtml b/src/web.oidc.client.implicit/Views/Home/Index.cshtml similarity index 100% rename from 1-src/web.oauth2.client.owin/Views/Home/Index.cshtml rename to src/web.oidc.client.implicit/Views/Home/Index.cshtml diff --git a/1-src/web.oidc.client.implicit/Views/Shared/_Layout.cshtml b/src/web.oidc.client.implicit/Views/Shared/_Layout.cshtml similarity index 100% rename from 1-src/web.oidc.client.implicit/Views/Shared/_Layout.cshtml rename to src/web.oidc.client.implicit/Views/Shared/_Layout.cshtml diff --git a/1-src/web.oauth2.client.owin/Views/_ViewStart.cshtml b/src/web.oidc.client.implicit/Views/_ViewStart.cshtml similarity index 100% rename from 1-src/web.oauth2.client.owin/Views/_ViewStart.cshtml rename to src/web.oidc.client.implicit/Views/_ViewStart.cshtml diff --git a/1-src/web.oidc.client.implicit/Views/web.config b/src/web.oidc.client.implicit/Views/web.config similarity index 100% rename from 1-src/web.oidc.client.implicit/Views/web.config rename to src/web.oidc.client.implicit/Views/web.config diff --git a/1-src/web.oidc.client.implicit/Web.config b/src/web.oidc.client.implicit/Web.config similarity index 100% rename from 1-src/web.oidc.client.implicit/Web.config rename to src/web.oidc.client.implicit/Web.config diff --git a/1-src/web.oidc.client.implicit/packages.config b/src/web.oidc.client.implicit/packages.config similarity index 100% rename from 1-src/web.oidc.client.implicit/packages.config rename to src/web.oidc.client.implicit/packages.config diff --git a/1-src/web.oidc.client.implicit/web.oidc.client.implicit.csproj b/src/web.oidc.client.implicit/web.oidc.client.implicit.csproj similarity index 100% rename from 1-src/web.oidc.client.implicit/web.oidc.client.implicit.csproj rename to src/web.oidc.client.implicit/web.oidc.client.implicit.csproj diff --git a/1-src/web.oidc.client.js.dockerfile b/src/web.oidc.client.js.dockerfile similarity index 100% rename from 1-src/web.oidc.client.js.dockerfile rename to src/web.oidc.client.js.dockerfile diff --git a/1-src/web.oidc.client.js/README.md b/src/web.oidc.client.js/README.md similarity index 100% rename from 1-src/web.oidc.client.js/README.md rename to src/web.oidc.client.js/README.md diff --git a/1-src/web.oidc.client.js/index.html b/src/web.oidc.client.js/index.html similarity index 100% rename from 1-src/web.oidc.client.js/index.html rename to src/web.oidc.client.js/index.html diff --git a/1-src/web.oidc.client.js/oidc/login-callback.html b/src/web.oidc.client.js/oidc/login-callback.html similarity index 100% rename from 1-src/web.oidc.client.js/oidc/login-callback.html rename to src/web.oidc.client.js/oidc/login-callback.html diff --git a/1-src/web.oidc.client.js/oidc/refresh-token.html b/src/web.oidc.client.js/oidc/refresh-token.html similarity index 100% rename from 1-src/web.oidc.client.js/oidc/refresh-token.html rename to src/web.oidc.client.js/oidc/refresh-token.html diff --git a/1-src/web.oidc.server.ids4.dockerfile b/src/web.oidc.server.ids4.dockerfile similarity index 100% rename from 1-src/web.oidc.server.ids4.dockerfile rename to src/web.oidc.server.ids4.dockerfile diff --git a/1-src/web.oidc.server.ids4/Controllers/DebugController.cs b/src/web.oidc.server.ids4/Controllers/DebugController.cs similarity index 100% rename from 1-src/web.oidc.server.ids4/Controllers/DebugController.cs rename to src/web.oidc.server.ids4/Controllers/DebugController.cs diff --git a/1-src/web.oidc.server.ids4/Controllers/HomeController.cs b/src/web.oidc.server.ids4/Controllers/HomeController.cs similarity index 100% rename from 1-src/web.oidc.server.ids4/Controllers/HomeController.cs rename to src/web.oidc.server.ids4/Controllers/HomeController.cs diff --git a/1-src/web.oidc.server.ids4/Ids4/Account/AccountController.cs b/src/web.oidc.server.ids4/Ids4/Account/AccountController.cs similarity index 100% rename from 1-src/web.oidc.server.ids4/Ids4/Account/AccountController.cs rename to src/web.oidc.server.ids4/Ids4/Account/AccountController.cs diff --git a/1-src/web.oidc.server.ids4/Ids4/Account/ExternalLoginViewModel.cs b/src/web.oidc.server.ids4/Ids4/Account/ExternalLoginViewModel.cs similarity index 100% rename from 1-src/web.oidc.server.ids4/Ids4/Account/ExternalLoginViewModel.cs rename to src/web.oidc.server.ids4/Ids4/Account/ExternalLoginViewModel.cs diff --git a/1-src/web.oidc.server.ids4/Ids4/Account/LoginFormModel.cs b/src/web.oidc.server.ids4/Ids4/Account/LoginFormModel.cs similarity index 100% rename from 1-src/web.oidc.server.ids4/Ids4/Account/LoginFormModel.cs rename to src/web.oidc.server.ids4/Ids4/Account/LoginFormModel.cs diff --git a/1-src/web.oidc.server.ids4/Ids4/Account/LoginViewModel.cs b/src/web.oidc.server.ids4/Ids4/Account/LoginViewModel.cs similarity index 100% rename from 1-src/web.oidc.server.ids4/Ids4/Account/LoginViewModel.cs rename to src/web.oidc.server.ids4/Ids4/Account/LoginViewModel.cs diff --git a/1-src/web.oidc.server.ids4/Ids4/Account/NewUserViewModel.cs b/src/web.oidc.server.ids4/Ids4/Account/NewUserViewModel.cs similarity index 100% rename from 1-src/web.oidc.server.ids4/Ids4/Account/NewUserViewModel.cs rename to src/web.oidc.server.ids4/Ids4/Account/NewUserViewModel.cs diff --git a/1-src/web.oidc.server.ids4/Ids4/Clients.cs b/src/web.oidc.server.ids4/Ids4/Clients.cs similarity index 100% rename from 1-src/web.oidc.server.ids4/Ids4/Clients.cs rename to src/web.oidc.server.ids4/Ids4/Clients.cs diff --git a/1-src/web.oidc.server.ids4/Ids4/Ids4Extensions.cs b/src/web.oidc.server.ids4/Ids4/Ids4Extensions.cs similarity index 100% rename from 1-src/web.oidc.server.ids4/Ids4/Ids4Extensions.cs rename to src/web.oidc.server.ids4/Ids4/Ids4Extensions.cs diff --git a/1-src/web.oidc.server.ids4/Ids4/Resources.cs b/src/web.oidc.server.ids4/Ids4/Resources.cs similarity index 100% rename from 1-src/web.oidc.server.ids4/Ids4/Resources.cs rename to src/web.oidc.server.ids4/Ids4/Resources.cs diff --git a/1-src/web.oidc.server.ids4/Ids4/Shared/SharedController.cs b/src/web.oidc.server.ids4/Ids4/Shared/SharedController.cs similarity index 100% rename from 1-src/web.oidc.server.ids4/Ids4/Shared/SharedController.cs rename to src/web.oidc.server.ids4/Ids4/Shared/SharedController.cs diff --git a/1-src/web.oidc.server.ids4/Ids4/Users.cs b/src/web.oidc.server.ids4/Ids4/Users.cs similarity index 100% rename from 1-src/web.oidc.server.ids4/Ids4/Users.cs rename to src/web.oidc.server.ids4/Ids4/Users.cs diff --git a/1-src/web.oidc.server.ids4/Program.cs b/src/web.oidc.server.ids4/Program.cs similarity index 100% rename from 1-src/web.oidc.server.ids4/Program.cs rename to src/web.oidc.server.ids4/Program.cs diff --git a/1-src/web.oidc.server.ids4/Startup.cs b/src/web.oidc.server.ids4/Startup.cs similarity index 100% rename from 1-src/web.oidc.server.ids4/Startup.cs rename to src/web.oidc.server.ids4/Startup.cs diff --git a/1-src/web.oidc.server.ids4/Views/Account/ExternalLoginNewUser.cshtml b/src/web.oidc.server.ids4/Views/Account/ExternalLoginNewUser.cshtml similarity index 100% rename from 1-src/web.oidc.server.ids4/Views/Account/ExternalLoginNewUser.cshtml rename to src/web.oidc.server.ids4/Views/Account/ExternalLoginNewUser.cshtml diff --git a/1-src/web.oidc.server.ids4/Views/Account/LoggedOut.cshtml b/src/web.oidc.server.ids4/Views/Account/LoggedOut.cshtml similarity index 100% rename from 1-src/web.oidc.server.ids4/Views/Account/LoggedOut.cshtml rename to src/web.oidc.server.ids4/Views/Account/LoggedOut.cshtml diff --git a/1-src/web.oidc.server.ids4/Views/Account/Login.cshtml b/src/web.oidc.server.ids4/Views/Account/Login.cshtml similarity index 100% rename from 1-src/web.oidc.server.ids4/Views/Account/Login.cshtml rename to src/web.oidc.server.ids4/Views/Account/Login.cshtml diff --git a/1-src/web.oidc.server.ids4/Views/Shared/Error.cshtml b/src/web.oidc.server.ids4/Views/Shared/Error.cshtml similarity index 100% rename from 1-src/web.oidc.server.ids4/Views/Shared/Error.cshtml rename to src/web.oidc.server.ids4/Views/Shared/Error.cshtml diff --git a/1-src/web.oidc.server.ids4/Views/Shared/_Layout.cshtml b/src/web.oidc.server.ids4/Views/Shared/_Layout.cshtml similarity index 100% rename from 1-src/web.oidc.server.ids4/Views/Shared/_Layout.cshtml rename to src/web.oidc.server.ids4/Views/Shared/_Layout.cshtml diff --git a/1-src/web.oidc.server.ids4/Views/_ViewImports.cshtml b/src/web.oidc.server.ids4/Views/_ViewImports.cshtml similarity index 100% rename from 1-src/web.oidc.server.ids4/Views/_ViewImports.cshtml rename to src/web.oidc.server.ids4/Views/_ViewImports.cshtml diff --git a/1-src/web.oauth2.client.aspnetcore/Views/_ViewStart.cshtml b/src/web.oidc.server.ids4/Views/_ViewStart.cshtml similarity index 100% rename from 1-src/web.oauth2.client.aspnetcore/Views/_ViewStart.cshtml rename to src/web.oidc.server.ids4/Views/_ViewStart.cshtml diff --git a/1-src/web.oidc.server.ids4/tempkey.jwk b/src/web.oidc.server.ids4/tempkey.jwk similarity index 100% rename from 1-src/web.oidc.server.ids4/tempkey.jwk rename to src/web.oidc.server.ids4/tempkey.jwk diff --git a/1-src/web.oauth2.client.aspnetcore/web.config b/src/web.oidc.server.ids4/web.config similarity index 100% rename from 1-src/web.oauth2.client.aspnetcore/web.config rename to src/web.oidc.server.ids4/web.config diff --git a/1-src/web.oidc.server.ids4/web.oidc.server.ids4.csproj b/src/web.oidc.server.ids4/web.oidc.server.ids4.csproj similarity index 100% rename from 1-src/web.oidc.server.ids4/web.oidc.server.ids4.csproj rename to src/web.oidc.server.ids4/web.oidc.server.ids4.csproj diff --git a/1-src/web.traefik.dockerfile b/src/web.traefik.dockerfile similarity index 100% rename from 1-src/web.traefik.dockerfile rename to src/web.traefik.dockerfile diff --git a/1-src/wpf.oidc.client.authorization-code/App.xaml b/src/wpf.oidc.client.authorization-code/App.xaml similarity index 100% rename from 1-src/wpf.oidc.client.authorization-code/App.xaml rename to src/wpf.oidc.client.authorization-code/App.xaml diff --git a/1-src/wpf.oidc.client.authorization-code/App.xaml.cs b/src/wpf.oidc.client.authorization-code/App.xaml.cs similarity index 100% rename from 1-src/wpf.oidc.client.authorization-code/App.xaml.cs rename to src/wpf.oidc.client.authorization-code/App.xaml.cs diff --git a/1-src/wpf.oidc.client.authorization-code/Login.xaml b/src/wpf.oidc.client.authorization-code/Login.xaml similarity index 100% rename from 1-src/wpf.oidc.client.authorization-code/Login.xaml rename to src/wpf.oidc.client.authorization-code/Login.xaml diff --git a/1-src/wpf.oidc.client.authorization-code/Login.xaml.cs b/src/wpf.oidc.client.authorization-code/Login.xaml.cs similarity index 100% rename from 1-src/wpf.oidc.client.authorization-code/Login.xaml.cs rename to src/wpf.oidc.client.authorization-code/Login.xaml.cs diff --git a/1-src/wpf.oidc.client.authorization-code/Main.xaml b/src/wpf.oidc.client.authorization-code/Main.xaml similarity index 100% rename from 1-src/wpf.oidc.client.authorization-code/Main.xaml rename to src/wpf.oidc.client.authorization-code/Main.xaml diff --git a/1-src/wpf.oidc.client.authorization-code/Main.xaml.cs b/src/wpf.oidc.client.authorization-code/Main.xaml.cs similarity index 100% rename from 1-src/wpf.oidc.client.authorization-code/Main.xaml.cs rename to src/wpf.oidc.client.authorization-code/Main.xaml.cs diff --git a/1-src/wpf.oidc.client.authorization-code/Models/JwtModel.cs b/src/wpf.oidc.client.authorization-code/Models/JwtModel.cs similarity index 100% rename from 1-src/wpf.oidc.client.authorization-code/Models/JwtModel.cs rename to src/wpf.oidc.client.authorization-code/Models/JwtModel.cs diff --git a/1-src/wpf.oidc.client.authorization-code/Models/TokenModel.cs b/src/wpf.oidc.client.authorization-code/Models/TokenModel.cs similarity index 100% rename from 1-src/wpf.oidc.client.authorization-code/Models/TokenModel.cs rename to src/wpf.oidc.client.authorization-code/Models/TokenModel.cs diff --git a/1-src/wpf.oidc.client.authorization-code/Oidc/OidcClient.cs b/src/wpf.oidc.client.authorization-code/Oidc/OidcClient.cs similarity index 100% rename from 1-src/wpf.oidc.client.authorization-code/Oidc/OidcClient.cs rename to src/wpf.oidc.client.authorization-code/Oidc/OidcClient.cs diff --git a/1-src/wpf.oidc.client.authorization-code/Oidc/OidcOptions.cs b/src/wpf.oidc.client.authorization-code/Oidc/OidcOptions.cs similarity index 100% rename from 1-src/wpf.oidc.client.authorization-code/Oidc/OidcOptions.cs rename to src/wpf.oidc.client.authorization-code/Oidc/OidcOptions.cs diff --git a/1-src/wpf.oidc.client.authorization-code/Oidc/TokenFile.cs b/src/wpf.oidc.client.authorization-code/Oidc/TokenFile.cs similarity index 100% rename from 1-src/wpf.oidc.client.authorization-code/Oidc/TokenFile.cs rename to src/wpf.oidc.client.authorization-code/Oidc/TokenFile.cs diff --git a/1-src/wpf.oidc.client.authorization-code/wpf.oidc.client.authorization-code.csproj b/src/wpf.oidc.client.authorization-code/wpf.oidc.client.authorization-code.csproj similarity index 100% rename from 1-src/wpf.oidc.client.authorization-code/wpf.oidc.client.authorization-code.csproj rename to src/wpf.oidc.client.authorization-code/wpf.oidc.client.authorization-code.csproj