SolarNetwork/Swarm
2
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

♻️ Finish centerlizing the data models

Browse Source
This commit is contained in:
LittleSheep
2025-09-27 15:14:05 +08:00
parent e70d8371f8
commit 9ce31c4dd8
167 changed files with 780 additions and 42880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DysonNetwork.Pass/Auth/OpenId/AfdianOidcService.cs
View File

@@ -1,6 +1,4 @@
using System.Net.Http.Json;
using System.Text.Json;
using DysonNetwork.Pass;
using DysonNetwork.Shared.Cache;
namespace DysonNetwork.Pass.Auth.OpenId;

1
DysonNetwork.Pass/Auth/OpenId/AppleMobileSignInRequest.cs
View File

@@ -1,6 +1,5 @@
using System.ComponentModel.DataAnnotations;
using System.Text.Json.Serialization;
namespace DysonNetwork.Pass.Auth.OpenId;

1
DysonNetwork.Pass/Auth/OpenId/AppleOidcService.cs
View File

@@ -3,7 +3,6 @@ using System.Security.Cryptography;
using System.Text;
using System.Text.Json;
using System.Text.Json.Serialization;
using DysonNetwork.Pass;
using DysonNetwork.Shared.Cache;
using Microsoft.IdentityModel.Tokens;

15
DysonNetwork.Pass/Auth/OpenId/ConnectionController.cs
View File

@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using DysonNetwork.Shared.Cache;
using NodaTime;
using DysonNetwork.Shared.Models;
namespace DysonNetwork.Pass.Auth.OpenId;
@@ -23,9 +24,9 @@ public class ConnectionController(
private static readonly TimeSpan StateExpiration = TimeSpan.FromMinutes(15);
[HttpGet]
public async Task<ActionResult<List<AccountConnection>>> GetConnections()
public async Task<ActionResult<List<SnAccountConnection>>> GetConnections()
{
if (HttpContext.Items["CurrentUser"] is not Account.Account currentUser)
if (HttpContext.Items["CurrentUser"] is not SnAccount currentUser)
return Unauthorized();
var connections = await db.AccountConnections
@@ -48,7 +49,7 @@ public class ConnectionController(
[HttpDelete("{id:guid}")]
public async Task<ActionResult> RemoveConnection(Guid id)
{
if (HttpContext.Items["CurrentUser"] is not Account.Account currentUser)
if (HttpContext.Items["CurrentUser"] is not SnAccount currentUser)
return Unauthorized();
var connection = await db.AccountConnections
@@ -66,7 +67,7 @@ public class ConnectionController(
[HttpPost("/api/auth/connect/apple/mobile")]
public async Task<ActionResult> ConnectAppleMobile([FromBody] AppleMobileConnectRequest request)
{
if (HttpContext.Items["CurrentUser"] is not Account.Account currentUser)
if (HttpContext.Items["CurrentUser"] is not SnAccount currentUser)
return Unauthorized();
if (GetOidcService("apple") is not AppleOidcService appleService)
@@ -99,7 +100,7 @@ public class ConnectionController(
$"This Apple account is already linked to {(existingConnection.AccountId == currentUser.Id ? "your account" : "another user")}.");
}
db.AccountConnections.Add(new AccountConnection
db.AccountConnections.Add(new SnAccountConnection
{
AccountId = currentUser.Id,
Provider = "apple",
@@ -250,7 +251,7 @@ public class ConnectionController(
else
{
// Create new connection
db.AccountConnections.Add(new AccountConnection
db.AccountConnections.Add(new SnAccountConnection
{
AccountId = accountId,
Provider = provider,
@@ -324,7 +325,7 @@ public class ConnectionController(
var account = await accounts.LookupAccount(userInfo.Email) ?? await accounts.CreateAccount(userInfo);
// Create connection for new or existing user
var newConnection = new AccountConnection
var newConnection = new SnAccountConnection
{
Account = account,
Provider = provider,

2
DysonNetwork.Pass/Auth/OpenId/DiscordOidcService.cs
View File

@@ -1,6 +1,4 @@
using System.Net.Http.Json;
using System.Text.Json;
using DysonNetwork.Pass;
using DysonNetwork.Shared.Cache;
namespace DysonNetwork.Pass.Auth.OpenId;

2
DysonNetwork.Pass/Auth/OpenId/GitHubOidcService.cs
View File

@@ -1,6 +1,4 @@
using System.Net.Http.Json;
using System.Text.Json;
using DysonNetwork.Pass;
using DysonNetwork.Shared.Cache;
namespace DysonNetwork.Pass.Auth.OpenId;

4
DysonNetwork.Pass/Auth/OpenId/GoogleOidcService.cs
View File

@@ -1,8 +1,4 @@
using System.IdentityModel.Tokens.Jwt;
using System.Net.Http.Json;
using System.Security.Cryptography;
using System.Text;
using DysonNetwork.Pass;
using DysonNetwork.Shared.Cache;
using Microsoft.IdentityModel.Tokens;

8
DysonNetwork.Pass/Auth/OpenId/OidcController.cs
View File

@@ -33,7 +33,7 @@ public class OidcController(
var oidcService = GetOidcService(provider);
// If the user is already authenticated, treat as an account connection request
if (HttpContext.Items["CurrentUser"] is Account.Account currentUser)
if (HttpContext.Items["CurrentUser"] is SnAccount currentUser)
{
var state = Guid.NewGuid().ToString();
var nonce = Guid.NewGuid().ToString();
@@ -128,7 +128,7 @@ public class OidcController(
};
}
private async Task<Account.Account> FindOrCreateAccount(OidcUserInfo userInfo, string provider)
private async Task<SnAccount> FindOrCreateAccount(OidcUserInfo userInfo, string provider)
{
if (string.IsNullOrEmpty(userInfo.Email))
throw new ArgumentException("Email is required for account creation");
@@ -157,7 +157,7 @@ public class OidcController(
return existingAccount;
}
var connection = new AccountConnection
var connection = new SnAccountConnection
{
AccountId = existingAccount.Id,
Provider = provider,
@@ -178,7 +178,7 @@ public class OidcController(
var newAccount = await accounts.CreateAccount(userInfo);
// Create the provider connection
var newConnection = new AccountConnection
var newConnection = new SnAccountConnection
{
AccountId = newAccount.Id,
Provider = provider,

5
DysonNetwork.Pass/Auth/OpenId/OidcService.cs
View File

@@ -1,6 +1,5 @@
using System.IdentityModel.Tokens.Jwt;
using System.Text.Json.Serialization;
using DysonNetwork.Pass.Account;
using DysonNetwork.Shared.Cache;
using DysonNetwork.Shared.Models;
using Microsoft.EntityFrameworkCore;
@@ -190,7 +189,7 @@ public abstract class OidcService(
/// </summary>
public async Task<SnAuthChallenge> CreateChallengeForUserAsync(
OidcUserInfo userInfo,
Account.Account account,
SnAccount account,
HttpContext request,
string deviceId,
string? deviceName = null
@@ -205,7 +204,7 @@ public abstract class OidcService(
if (connection is null)
{
connection = new AccountConnection
connection = new SnAccountConnection
{
Provider = ProviderName,
ProvidedIdentifier = userInfo.UserId ?? "",