diff --git a/src/Maw.Cache/Maw.Cache.csproj b/src/Maw.Cache/Maw.Cache.csproj
index e069b73e..d4f6ce55 100644
--- a/src/Maw.Cache/Maw.Cache.csproj
+++ b/src/Maw.Cache/Maw.Cache.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/src/Maw.Data/Maw.Data.csproj b/src/Maw.Data/Maw.Data.csproj
index 609560f7..aa9a07ff 100755
--- a/src/Maw.Data/Maw.Data.csproj
+++ b/src/Maw.Data/Maw.Data.csproj
@@ -14,9 +14,9 @@
-
+
-
+
diff --git a/src/Maw.Domain/Maw.Domain.csproj b/src/Maw.Domain/Maw.Domain.csproj
index ad6ddda6..f6dfa515 100755
--- a/src/Maw.Domain/Maw.Domain.csproj
+++ b/src/Maw.Domain/Maw.Domain.csproj
@@ -18,12 +18,12 @@
-
+
-
+
diff --git a/src/api/api.csproj b/src/api/api.csproj
index fac9398e..43804d51 100644
--- a/src/api/api.csproj
+++ b/src/api/api.csproj
@@ -14,10 +14,10 @@
-
-
+
+
-
+
diff --git a/src/auth/Models/Config.cs b/src/auth/Models/Config.cs
index f16c5184..4cb53327 100644
--- a/src/auth/Models/Config.cs
+++ b/src/auth/Models/Config.cs
@@ -12,21 +12,18 @@ public class Config
readonly string _wwwUrl;
readonly string _wwwSecret;
- readonly string _photosUrl;
readonly string _filesUrl;
readonly string _photosSolidUrl;
- public Config(string wwwUrl, string wwwSecret, string photosUrl, string filesUrl, string photosSolidUrl)
+ public Config(string wwwUrl, string wwwSecret, string filesUrl, string photosSolidUrl)
{
ArgumentNullException.ThrowIfNull(wwwUrl);
ArgumentNullException.ThrowIfNull(wwwSecret);
- ArgumentNullException.ThrowIfNull(photosUrl);
ArgumentNullException.ThrowIfNull(filesUrl);
ArgumentNullException.ThrowIfNull(photosSolidUrl);
_wwwUrl = wwwUrl;
_wwwSecret = wwwSecret;
- _photosUrl = photosUrl;
_filesUrl = filesUrl;
_photosSolidUrl = photosSolidUrl;
}
@@ -125,40 +122,6 @@ public IEnumerable GetClients()
// AbsoluteRefreshTokenLifetime = 20
},
new Client
- {
- ClientId = "maw-photos",
- ClientName = "mikeandwan.us Photo Application",
- AllowedGrantTypes = GrantTypes.Code,
- RequireClientSecret = false,
- AllowAccessTokensViaBrowser = true,
- AllowOfflineAccess = true,
- RedirectUris = new List
- {
- $"{_photosUrl}/login",
- $"{_photosUrl}/silent-refresh.html"
- },
- PostLogoutRedirectUris = new List
- {
- $"{_photosUrl}/signout-callback.html"
- },
- AllowedCorsOrigins = new List
- {
- _photosUrl
- },
- AllowedScopes = new List
- {
- IdentityServerConstants.StandardScopes.OfflineAccess,
- IdentityServerConstants.StandardScopes.OpenId,
- IdentityServerConstants.StandardScopes.Profile,
-
- // apis
- "maw_api",
-
- // identity resources
- JwtClaimTypes.Role
- }
- },
- new Client
{
ClientId = "maw-photos-solid",
ClientName = "mikeandwan.us Photo Application",
@@ -166,6 +129,7 @@ public IEnumerable GetClients()
RequireClientSecret = false,
AllowAccessTokensViaBrowser = true,
AllowOfflineAccess = true,
+ RefreshTokenUsage = TokenUsage.ReUse,
RedirectUris = new List
{
$"{_photosSolidUrl}/login/handle-response"
@@ -199,6 +163,7 @@ public IEnumerable GetClients()
RequireClientSecret = false,
AllowAccessTokensViaBrowser = true,
AllowOfflineAccess = true,
+ RefreshTokenUsage = TokenUsage.ReUse,
RedirectUris = new List
{
$"{_filesUrl}/login",
diff --git a/src/auth/Startup.cs b/src/auth/Startup.cs
index 56436f7f..924f3405 100644
--- a/src/auth/Startup.cs
+++ b/src/auth/Startup.cs
@@ -39,7 +39,6 @@ public void ConfigureServices(IServiceCollection services)
var config = new Config(
_config["Environment:WwwUrl"] ?? throw new InvalidOperationException("www url cannot be null!"),
_config["Environment:WwwClientSecret"] ?? throw new InvalidOperationException("www client secret cannot be null!"),
- _config["Environment:PhotosUrl"] ?? throw new InvalidOperationException("photos url cannot be null!"),
_config["Environment:FilesUrl"] ?? throw new InvalidOperationException("files url cannot be null!"),
_config["Environment:PhotosSolidUrl"] ?? throw new InvalidOperationException("photos-solid url cannot be null!"));
diff --git a/src/auth/auth.csproj b/src/auth/auth.csproj
index 9f0b6bcc..970219e3 100644
--- a/src/auth/auth.csproj
+++ b/src/auth/auth.csproj
@@ -14,15 +14,15 @@
-
-
-
-
-
+
+
+
+
+
-
-
+
+
diff --git a/src/www/www.csproj b/src/www/www.csproj
index 552cd552..95ab9b90 100755
--- a/src/www/www.csproj
+++ b/src/www/www.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/tests/Maw.Cache.Tests/Maw.Cache.Tests.csproj b/tests/Maw.Cache.Tests/Maw.Cache.Tests.csproj
index 974fc237..9209b9f1 100644
--- a/tests/Maw.Cache.Tests/Maw.Cache.Tests.csproj
+++ b/tests/Maw.Cache.Tests/Maw.Cache.Tests.csproj
@@ -8,14 +8,14 @@
-
-
-
-
+
+
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/tests/Maw.Data.Tests/Maw.Data.Tests.csproj b/tests/Maw.Data.Tests/Maw.Data.Tests.csproj
index f9abed1d..24926bdd 100644
--- a/tests/Maw.Data.Tests/Maw.Data.Tests.csproj
+++ b/tests/Maw.Data.Tests/Maw.Data.Tests.csproj
@@ -7,16 +7,16 @@
-
-
-
+
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
diff --git a/tests/Maw.Domain.Models.Tests/Maw.Domain.Models.Tests.csproj b/tests/Maw.Domain.Models.Tests/Maw.Domain.Models.Tests.csproj
index bd06c406..cb40a067 100644
--- a/tests/Maw.Domain.Models.Tests/Maw.Domain.Models.Tests.csproj
+++ b/tests/Maw.Domain.Models.Tests/Maw.Domain.Models.Tests.csproj
@@ -8,13 +8,13 @@
-
-
-
+
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all