Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using IdentityModel.AspNetCore.OAuth2Introspection;

using Zitadel.Credentials;

namespace Zitadel.Authentication.Options;

/// <summary>
Expand All @@ -26,5 +24,5 @@ public class ZitadelIntrospectionOptions : OAuth2IntrospectionOptions
/// the client assertion is added.
/// </para>
/// </summary>
public Application? JwtProfile { get; set; }
public global::Zitadel.Credentials.Application? JwtProfile { get; set; }
}
6 changes: 3 additions & 3 deletions tests/Zitadel.Test/Credentials/Application.Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

using Xunit;

using Zitadel.Credentials;
using ZitadelApplication = Zitadel.Credentials.Application;

namespace Zitadel.Test.Credentials;

Expand All @@ -11,14 +11,14 @@ public class ApplicationTest
[Fact]
public async Task Load_App_From_Json()
{
var app = await Application.LoadFromJsonStringAsync(TestData.ApplicationJson);
var app = await ZitadelApplication.LoadFromJsonStringAsync(TestData.ApplicationJson);
app.AppId.Should().Be("170101999168127233");
}

[Fact]
public async Task Create_Signed_Jwt()
{
var app = await Application.LoadFromJsonStringAsync(TestData.ApplicationJson);
var app = await ZitadelApplication.LoadFromJsonStringAsync(TestData.ApplicationJson);
var token = await app.GetSignedJwtAsync(TestData.ApiUrl);

token.Should().StartWith("ey");
Expand Down
3 changes: 2 additions & 1 deletion tests/Zitadel.Test/TestData.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Zitadel.Credentials;
using ZitadelApplication = Zitadel.Credentials.Application;

namespace Zitadel.Test;

Expand Down Expand Up @@ -39,7 +40,7 @@ public static class TestData
}
""";

public static Application Application => Application.LoadFromJsonString(ApplicationJson);
public static ZitadelApplication Application => ZitadelApplication.LoadFromJsonString(ApplicationJson);

public static ServiceAccount ServiceAccount => ServiceAccount.LoadFromJsonString(ServiceAccountJson);
}
Loading