From 00470185d5e27b3209c1d2bfb68a3c7e8f70041f Mon Sep 17 00:00:00 2001 From: Nickolas Gupton Date: Sun, 12 Mar 2023 19:06:11 -0500 Subject: [PATCH] Remove authentication from launcher (#195) * Remove authentication from launcher * Remove FirebaseAuthentication NuGet package * Remove unused files and update changelog for 931 * Update README --- README.md | 2 +- UnitystationLauncher/Assets/buttoncontext.png | Bin 2026 -> 0 bytes .../org.unitystation.StationHub.metainfo.xml | 1 + UnitystationLauncher/Assets/userbg.png | Bin 1558 -> 0 bytes UnitystationLauncher/Assets/userico.jpg | Bin 8071 -> 0 bytes UnitystationLauncher/Models/Api/Server.cs | 1 + UnitystationLauncher/Models/Api/ServerList.cs | 4 +- UnitystationLauncher/Models/Installation.cs | 4 +- UnitystationLauncher/Services/AuthService.cs | 247 ------------------ .../Services/ServerService.cs | 9 +- UnitystationLauncher/StandardModule.cs | 4 - .../UnitystationLauncher.csproj | 1 - .../ViewModels/ForgotPasswordViewModel.cs | 67 ----- .../ViewModels/LauncherViewModel.cs | 18 -- .../ViewModels/LoginStatusViewModel.cs | 175 ------------- .../ViewModels/LoginViewModel.cs | 104 -------- .../ViewModels/MainWindowViewModel.cs | 96 +------ .../ViewModels/ServerViewModel.cs | 9 +- .../ViewModels/ServersPanelViewModel.cs | 8 +- .../ViewModels/SignUpViewModel.cs | 146 ----------- .../Views/ForgotPasswordView.xaml | 49 ---- .../Views/ForgotPasswordView.xaml.cs | 18 -- UnitystationLauncher/Views/LauncherView.xaml | 58 +--- .../Views/LoginStatusView.xaml | 57 ---- .../Views/LoginStatusView.xaml.cs | 18 -- UnitystationLauncher/Views/LoginView.xaml | 57 ---- UnitystationLauncher/Views/LoginView.xaml.cs | 18 -- UnitystationLauncher/Views/SignUpView.xaml | 90 ------- UnitystationLauncher/Views/SignUpView.xaml.cs | 18 -- 29 files changed, 29 insertions(+), 1250 deletions(-) delete mode 100644 UnitystationLauncher/Assets/buttoncontext.png delete mode 100644 UnitystationLauncher/Assets/userbg.png delete mode 100644 UnitystationLauncher/Assets/userico.jpg delete mode 100644 UnitystationLauncher/Services/AuthService.cs delete mode 100644 UnitystationLauncher/ViewModels/ForgotPasswordViewModel.cs delete mode 100644 UnitystationLauncher/ViewModels/LoginStatusViewModel.cs delete mode 100644 UnitystationLauncher/ViewModels/LoginViewModel.cs delete mode 100644 UnitystationLauncher/ViewModels/SignUpViewModel.cs delete mode 100644 UnitystationLauncher/Views/ForgotPasswordView.xaml delete mode 100644 UnitystationLauncher/Views/ForgotPasswordView.xaml.cs delete mode 100644 UnitystationLauncher/Views/LoginStatusView.xaml delete mode 100644 UnitystationLauncher/Views/LoginStatusView.xaml.cs delete mode 100644 UnitystationLauncher/Views/LoginView.xaml delete mode 100644 UnitystationLauncher/Views/LoginView.xaml.cs delete mode 100644 UnitystationLauncher/Views/SignUpView.xaml delete mode 100644 UnitystationLauncher/Views/SignUpView.xaml.cs diff --git a/README.md b/README.md index 67a2e070..aee976a7 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Flathub](https://img.shields.io/flathub/v/org.unitystation.StationHub?style=flat-square)](https://flathub.org/apps/details/org.unitystation.StationHub) [![Discord](https://img.shields.io/discord/273774715741667329?style=flat-square)](https://discord.com/invite/tFcTpBp) -This is the official launcher for Unitystation, it handles account creation, downloading, updating, and server joining. +StationHub is the official launcher for Unitystation, it handles downloading, updating, and joining servers. ## Tech-stack It is cross-platform using .NET 6 as the runtime and [Avalonia MVVM](https://docs.avaloniaui.net/guides/basics/mvvm) for the UI. diff --git a/UnitystationLauncher/Assets/buttoncontext.png b/UnitystationLauncher/Assets/buttoncontext.png deleted file mode 100644 index b15a09331f949f53a63cc3535a5c85ea68ec108d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2026 zcmbVMX*3(?8crCD-Jn%LIf`m6T~L!)qV_0}qP16Rt5ADvR|z`Q7Dj1NWo%PRgkEu} zq_!fswFRjqjdZH^64EFV?4IzdA1TQ=>@#}A<5lOsqR6FHR2{|1h-D0m{@Y2vR_mDD`FeI4L#Pv<^V-aBNnL* zgmms)_`R=LnFEfFS9wQGK9>;;vv!RH0EDHE0|=c(2K*8)R1QvNf!h-tsQhGQp zC5y6fL79aH2m6Jf0A>+>cTj%5N-;=OfRYu=4&j_ECIbNQ^}x)pI>pXy%+W#}qvQv+ z#cKr%UPeW%&NZ6lDaHSwtIRv)E`=dmXHy}B=mrI2&)75i9)qc5;e}J;K0Zk*X?;)= zZx-oS@=mg7is2CZWirXUYKHICRtn1dRHG-lW`p&$(}OrU={&l7FbbwhQf;hmPF&8* z@PFcc`-%yWPa44^jW7{Jm;hD(h6(`O^k2De=ve$s`4>92@_h&WpJo5s1ebk!c-gLX z@y*Wafa2QY!dp`~Y8xgY7E+oA-7E8!TGl$M#My~LW{xrfgB0~*bhTaUjpCsb-4$o> zP@N(Hj0-h^?7`Jq-Y}04vsu#=zvVGtrDQaiBy*>xR`!E~ zLBdv#i#yBcMdA$o&ZqVyDdrwW7qSbU90sEr&rmWc^hMOlU`3*yz9E>A7suL4@_;`i zkJ;Dga3``DlBKBm}xWZB>@NO8ZNgbt#rQD!zs15n+Q z`va;J(pxnJxw#85rPyaaA&DQag;x`vi76NvUNkt=!mOY7AJ#H3jkNRZstD73F4Njt zSO4#K{aqadx02uD+}c9u6Z1wyt@Z#q8NZ$=vk|9I5eJobwYJBFzTN5>%g(JnVaL6} z=6&p`;n$~gr19*M)9A^ONCQ{I6X@+x+V$Tji!=LdYjl__>CUHxqPj5*`l>hx&2qk% z;cKHn17gxDNv*EU(B$m2O6FdQjhcqfLH;6D@bINEAI;NXRf$mn*SUgVQ<>0B&%_Pa8g5P~Q$KyX+2%LxgG4qS+n4?Z{-J|Td z{^a=%b_v8`A)^{{KbcEdq#SmzWzcZU*+*--_XS$iuSUuo^=G5G&ulw-&X0 z?gp{Vx$uIQ*2=E-EkZ+dXp?G;Nft;q22PtN;~c%vCDWWP$PVUK{G@v`mY9iaWS9 znl|pmEQ>QzLby^qzSsVly*N!j@24*#zM_mwLkk{tY1$-7mM8HDsRM=7%YRTW|AuUi viSMCf@&A;6T6wAdds links to the Unitystation Discord and GitHub issues pages.
  • The auto update feature has been replaced with a notification.
  • Adds a placeholder to the News panel, this will be replaced with posts from the Unitystation Blog in the future.
    • +
  • Account creation, management, and login is now handled by the game instead of StationHub.

    • Bug Fixes:

      diff --git a/UnitystationLauncher/Assets/userbg.png b/UnitystationLauncher/Assets/userbg.png deleted file mode 100644 index 2e27f6662927ee444c9df8f3a6c3957bfb6ce822..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1558 zcmdT^O-~a+7#<}-!bkkzq!%WOF&gcD^b2;SLg}_r<02_d=)nWa?v!p|ch=p3mc|64 z4eC)Z#+$!@lLwUp(RffUUJYspdeDOj$caQ_oGoo3rp2Ri53@7xzR&YM^UOPYZ)Es# zN9(Cp06<4_NKOH8c%IHnEzNY?C@C%Ub&|w0WE5vfUUd+N>UaXdq^VA#6jJrM8*fk_ z08M9%bcSS>wCo z!#+(2hG37#3gJLd6fZzOFZ6PJFDC?iLRbp&lHU(24@0XtdR9uwiApWHiZD4sY>DIY z`8=Bsu-KX81W^<@-p~2{KAPck=PaTYe3si?Wss4pIfhLPY(bAvoxn3B!ce8VTQKb! zt>sp1qK0t=)#e12_qJ3`RFs2LO|zEmk`&t0TbI~P&)JAeAs5d$8a=pdw^z!RVh&OX zcG4J6S6v**VS?QpwqY#hxhBH1V}_;UynC*UQ4}d@xkR-zl$0Y3Wnm3Nmt;N~ltXfe z?+MF-5RVRq{PJLLA`lIR{9+&;s$ylV&6vm{Rjj^;4L8Jk?O@upvWy&K7U>BGo3OlX z$!M%4(2%c!)f;OGHpFsN4Cfv0zQeADXa{-ITIfh*0c!#5WnZ+uL$AD$Pt-JPZPO<-k&-d LAC{K}$8Y@xu|n?# diff --git a/UnitystationLauncher/Assets/userico.jpg b/UnitystationLauncher/Assets/userico.jpg deleted file mode 100644 index f90445ba521756adb7030590a4da1a75e9af0efe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8071 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 z zRo0^!c2#^niB1(~O47E8AI77j{fhg70a&bJ6&HY-K=c3A>S`FwqCppvNb$w-8vLgig&i& z%1o>bn0NwnC@eQwfnsw=e5O;&-*X2J*nR=VEVl=?zC|xRxM!Z~WzO<4n?g0hGZP;D zxA8W3f4q&yGVw)-#y+gp!aayn=S;C6P1;un*z66r?kUDOlBojpk-RH8j{)Em9$MaW z>GUC6Hi7fLCL8YDcd&URk#^l?bXaIcY@_T5&DjYqR?p7^V5!9FH|yYOm0ch$Y05&q zWk&YXwRR^W{Nv`5qWu7(T})m`<{XUG$c62m?s;65xKMUw2WmAte#{!psZB}=t2Y<2 zyYwyjgVBbo@W_L5o-;3MIr`q_BjtYUw=4p3-5V&r1@6nD@(;o=7?Z>H^w_ZyR4eOcjm`WC-p(;q%jJVX;v%r{LAEl-r=C|W9INaY=mJ}NQTZ`oNZZ4 zthh~URIek!+`6`FqlslmVhz3v$ZzV~z}bGg^O&j`1_O(MS*>jau0Id%C1{nR9L>V= zNcj*p#WUn~HMF?4A7qS?GdiIrcAEDpHei*2vM$ZN`??X;Yw4~k+Q3^WXcwd*fMN7Q zgrA&upPB6actQP@4P(DnDp?(F;F!ddjIHg+nCJ4>cqYXcjlnt?N@wn{Ai6qLQy#Tt zyc(0N5SSC=sg9N*+DF~8NV56-RE=P-b@wC4*J+D)5oT**fKcQvf0l#t&=7C=trq3G zebbJJXNso9$xHJ!2O3x6Dz&RqJTA*!EV^d$69>XrbM6yP<8HogfxWjImm&vjUmP)Vu`Df-7O54kn zf!oHUQ-9@jB@%3k9UK&nv?DUi?>C7H-2D{Btd-=>lHR2j3Vk{q2hvP3+yqr1OY~n5 zqQ!>`N~Dsi^gK*G&`jwy#^G7s_KTvil2z=evd@;pXno?H-V1!T=G{iDTc?WpOVX`o z_*^xcWlFG>FYh?UHiO31)u~O~C8vvrYL~`G;VoQQeX$ne&5}kz0_7*2D*_4Vx|Kd3 zmC0*7xx)6CgL9Y5l1g$+*HCb_EX_$?a1q*C>!h}spmHlKOquddM<4D-8GAAkB0DVF zCoY-*_KY9&11*4jJ6+8RB$EvMfcHhk=wbjEv^mCdfBxHK8C0E z;sHPSWAn)^Zyo{Y7m);^vvLK6F)@TQF`{!qu3x0Vm=SxS`%!z6grykTk% zA4pJJK=Cm#%cpo7K$kEdWfd506;5fCq?sp*`o&KO9cd&tL2h0Vd-FIx_01eys8@t* zvDiWyyInY^oBwLOcRBCeiu^-=Z1OyTc|mH=`+?dnu1(;CEvwp2YF+hCAue4XU5O}u zk=Xvl-u(3H3QvmdtwbAToS)@o-aD!x!i-MEl)saPn_J7?Y7o_&XplgoFaNgmRp*Zi@ZoyX%?IenH=X8A;$YOM#zEWo&KWVPsZ|yQ&$GZ{c>>4_ym$et-)IIy|{&FZ4NJ= zb1a*u&`~fi-pMo5F$r{^2m1PnT?Oa0*4pgHbM@xNg(oHJKzc$0y5;wk3y2Ji9GzH2 z?Q3&KnQ_HpB+t(w=Cgw$QE`!#?{hDu6m&Ibrh595+uokl#8&G__pmn|zhz;7`Y2g8 z@Mb@@gU+=3puZgsas~bd`z{`cmES>s|NeI^+PKc6aG8+xMW!7JO98_V06x)8rPLJ6;F5LVE?(gj(zv>$~9Bsd?+fpr)}^T=Q}FiF4JAL#FL#7MVR2%Pi+?B0ukzvDf&T*e CNgw?H diff --git a/UnitystationLauncher/Models/Api/Server.cs b/UnitystationLauncher/Models/Api/Server.cs index ddb524f1..9eca7ab0 100644 --- a/UnitystationLauncher/Models/Api/Server.cs +++ b/UnitystationLauncher/Models/Api/Server.cs @@ -6,6 +6,7 @@ namespace UnitystationLauncher.Models.Api { + [Serializable] public class Server { public Server(string forkName, int buildVersion, string serverIp, int serverPort) diff --git a/UnitystationLauncher/Models/Api/ServerList.cs b/UnitystationLauncher/Models/Api/ServerList.cs index 52089cf3..0602b225 100644 --- a/UnitystationLauncher/Models/Api/ServerList.cs +++ b/UnitystationLauncher/Models/Api/ServerList.cs @@ -1,9 +1,11 @@ +using System; using System.Collections.Generic; namespace UnitystationLauncher.Models.Api { + [Serializable] public class ServerList { - public List Servers { get; set; } = new List(); + public List Servers { get; set; } = new(); } } \ No newline at end of file diff --git a/UnitystationLauncher/Models/Installation.cs b/UnitystationLauncher/Models/Installation.cs index 197b9370..b0809d4f 100644 --- a/UnitystationLauncher/Models/Installation.cs +++ b/UnitystationLauncher/Models/Installation.cs @@ -54,9 +54,9 @@ public Installation(string folderPath) return exe; } - public void LaunchWithArgs(string ip, short port, string? refreshToken, string? uid) + public void LaunchWithArgs(string ip, short port) { - Start($"--server {ip} --port {port} --refreshtoken {refreshToken} --uid {uid}"); + Start($"--server {ip} --port {port}"); } public void LaunchWithoutArgs() diff --git a/UnitystationLauncher/Services/AuthService.cs b/UnitystationLauncher/Services/AuthService.cs deleted file mode 100644 index 77b65488..00000000 --- a/UnitystationLauncher/Services/AuthService.cs +++ /dev/null @@ -1,247 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Net.Http; -using System.Net.Mail; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.Threading; -using System.Threading.Tasks; -using Firebase.Auth; -using Serilog; -using UnitystationLauncher.Constants; -using UnitystationLauncher.Models.ConfigFile; - -namespace UnitystationLauncher.Services -{ - public class AuthService - { - readonly FirebaseAuthProvider _authProvider; - private readonly HttpClient _http; - public LoginMsg? LoginMsg { get; set; } - public bool AttemptingAutoLogin { get; set; } - - public AuthService(HttpClient http, FirebaseAuthProvider authProvider) - { - _authProvider = authProvider; - _http = http; - - LoadAuthSettings(); - } - - public FirebaseAuthLink? AuthLink { get; set; } - public string? CurrentRefreshToken => AuthLink?.RefreshToken; - - public string? Uid => AuthLink?.User.LocalId; - - private readonly string AuthSettingsPath = Path.Combine(Config.RootFolder, "authSettings.json"); - - private void ConvertToNewAuthFileName() - { - string oldAuthSettingsPath = Path.Combine(Config.RootFolder, "settings.json"); - if (File.Exists(oldAuthSettingsPath)) - { - File.Move(oldAuthSettingsPath, AuthSettingsPath); - } - } - - private void LoadAuthSettings() - { - try - { - ConvertToNewAuthFileName(); - - if (File.Exists(AuthSettingsPath)) - { - var json = File.ReadAllText(AuthSettingsPath); - var authLink = JsonSerializer.Deserialize(json); - AuthLink = authLink; - } - } - catch (Exception) - { - // Something went wrong reading the auth settings. Just ask the user to log in again. - // The auth settings file will get overwritten after they do so we don't need to clean it up. - } - - } - - public void SaveAuthSettings() - { - var json = JsonSerializer.Serialize(AuthLink); - - using (StreamWriter writer = File.CreateText(AuthSettingsPath)) - { - writer.WriteLine(json); - } - } - - public void ResendVerificationEmail() - { - _authProvider.SendEmailVerificationAsync(AuthLink); - } - - public void SendForgotPasswordEmail(string email) - { - _authProvider.SendPasswordResetEmailAsync(email); - } - - internal Task SignInWithEmailAndPasswordAsync(string email, string password) => - _authProvider.SignInWithEmailAndPasswordAsync(email, password); - - internal Task SignInWithCustomTokenAsync(string token) => - _authProvider.SignInWithCustomTokenAsync(token); - - /// - /// Asks firebase to create the user's account. - /// The provided email's domain is checked against a list of disposable email addresses. - /// If the domain is not in the list (or if GitHub is down) then account creation continues. - /// Otherwise an exception is thrown. - /// - /// - internal async Task CreateAccountAsync(string username, string email, string password) - { - // Client-side check for disposable email address. - const string url = - "https://raw.githubusercontent.com/martenson/disposable-email-domains/master/disposable_email_blocklist.conf"; - HttpRequestMessage requestMessage = new(HttpMethod.Get, url); - - CancellationToken cancellationToken = new CancellationTokenSource(60000).Token; - bool isDomainBlacklisted = false; - try - { - HttpResponseMessage response = await _http.SendAsync(requestMessage, cancellationToken); - string msg = await response.Content.ReadAsStringAsync(cancellationToken); - - // Turn msg into a hashset of all domains - using StringReader stringReader = new(msg); - List lines = new(); - - while (await stringReader.ReadLineAsync() is { } line) - { - if (!string.IsNullOrWhiteSpace(line) && !line.TrimStart().StartsWith("//")) - { - lines.Add(line); - } - } - - HashSet blacklist = new(lines, StringComparer.OrdinalIgnoreCase); - - MailAddress address = new(email); - if (blacklist.Contains(address.Host)) - { - // Randomly wait before failing. Might frustrate users who try different disposable emails. - await Task.Delay(new Random().Next(3000, 12000), cancellationToken); - isDomainBlacklisted = true; - } - } - catch (Exception e) - { - Log.Error(e, "Error or timeout in check for email domain blacklist, check has been skipped"); - } - - if (isDomainBlacklisted) - { - throw new InvalidOperationException("The email domain provided by the user is on our blacklist."); - } - - return await _authProvider.CreateUserWithEmailAndPasswordAsync(email, password, username, true); - } - - internal Task GetUpdatedUserAsync() => _authProvider.GetUserAsync(AuthLink); - - public async Task GetCustomTokenAsync(RefreshToken refreshToken) - { - HttpRequestMessage r = new(HttpMethod.Get, ApiUrls.ValidateTokenUrl + Uri.EscapeDataString(JsonSerializer.Serialize(refreshToken))); - CancellationToken cancellationToken = new CancellationTokenSource(120000).Token; - HttpResponseMessage res; - - try - { - res = await _http.SendAsync(r, cancellationToken); - } - catch (Exception e) - { - Log.Error(e, "Failed when sending token validation request"); - return ""; - } - - string msg = await res.Content.ReadAsStringAsync(cancellationToken); - ApiResponse? response = JsonSerializer.Deserialize(msg, new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); - - if (response == null) - { - Log.Error("Error: {Error}", "Response from /validatetoken cannot be deserialized"); - return ""; - } - - if (response.ErrorCode != 0) - { - Log.Error("Error: {Error}", response.ErrorMsg); - return ""; - } - - return response.Message ?? ""; - } - - public async Task SignOutUserAsync() - { - if (AuthLink == null || Uid == null || CurrentRefreshToken == null) - { - return; - } - - RefreshToken token = new() - { - UserId = Uid, - Token = CurrentRefreshToken - }; - - HttpRequestMessage r = new(HttpMethod.Get, ApiUrls.SignOutUrl + Uri.EscapeDataString(JsonSerializer.Serialize(token))); - CancellationToken cancellationToken = new CancellationTokenSource(120000).Token; - HttpResponseMessage res; - - try - { - res = await _http.SendAsync(r, cancellationToken); - } - catch (Exception e) - { - Log.Error(e, "Http request to sign out failed"); - return; - } - - string msg = await res.Content.ReadAsStringAsync(cancellationToken); - - Log.Information("Logout message: {Message}", msg); - AuthLink = null; - } - } - - - - public class LoginMsg - { - public string Email { get; set; } = ""; - public string Pass { get; set; } = ""; - } - - [Serializable] - public class RefreshToken - { - [JsonPropertyName("RefreshToken")] public string? Token { get; set; } - public string? UserId { get; set; } - } - - [Serializable] - public class ApiResponse - { - /// - /// 0 = all good, read the message variable now, otherwise read errorMsg - /// - public int ErrorCode { get; set; } - - public string? ErrorMsg { get; set; } - public string? Message { get; set; } - } -} \ No newline at end of file diff --git a/UnitystationLauncher/Services/ServerService.cs b/UnitystationLauncher/Services/ServerService.cs index 3589fd2c..17cc6ade 100644 --- a/UnitystationLauncher/Services/ServerService.cs +++ b/UnitystationLauncher/Services/ServerService.cs @@ -3,8 +3,8 @@ using System.Linq; using System.Net.Http; using System.Reactive.Linq; +using System.Text.Json; using System.Threading.Tasks; -using Newtonsoft.Json; using ReactiveUI; using Serilog; using UnitystationLauncher.Constants; @@ -41,7 +41,12 @@ private async Task> GetServerListAsync() Refreshing = true; string data = await _http.GetStringAsync(ApiUrls.ServerListUrl); - List? serverData = JsonConvert.DeserializeObject(data)?.Servers; + List? serverData = JsonSerializer.Deserialize(data, options: new() + { + IgnoreReadOnlyProperties = true, + PropertyNameCaseInsensitive = true + })?.Servers; + Log.Information("Server list fetched"); List servers = new(); diff --git a/UnitystationLauncher/StandardModule.cs b/UnitystationLauncher/StandardModule.cs index 39a7e5ed..32a96e87 100644 --- a/UnitystationLauncher/StandardModule.cs +++ b/UnitystationLauncher/StandardModule.cs @@ -1,6 +1,5 @@ using System.Net.Http; using Autofac; -using Firebase.Auth; using UnitystationLauncher.Models.ConfigFile; namespace UnitystationLauncher @@ -18,9 +17,6 @@ protected override void Load(ContainerBuilder builder) builder.RegisterAssemblyTypes(ThisAssembly) .Where(t => t.Name.EndsWith("ViewModel")); - - builder.Register(c => new FirebaseConfig("AIzaSyB7GorzPgwHYjSV4XaJoszj98tLM4_WZpE")).SingleInstance(); - builder.RegisterType().SingleInstance(); } } } \ No newline at end of file diff --git a/UnitystationLauncher/UnitystationLauncher.csproj b/UnitystationLauncher/UnitystationLauncher.csproj index ae3119e7..933221e2 100644 --- a/UnitystationLauncher/UnitystationLauncher.csproj +++ b/UnitystationLauncher/UnitystationLauncher.csproj @@ -51,7 +51,6 @@ - diff --git a/UnitystationLauncher/ViewModels/ForgotPasswordViewModel.cs b/UnitystationLauncher/ViewModels/ForgotPasswordViewModel.cs deleted file mode 100644 index 6fd56416..00000000 --- a/UnitystationLauncher/ViewModels/ForgotPasswordViewModel.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System; -using System.Reactive; -using ReactiveUI; -using UnitystationLauncher.Services; - -namespace UnitystationLauncher.ViewModels -{ - public class ForgotPasswordViewModel : ViewModelBase - { - private readonly Lazy _loginVm; - private readonly AuthService _authService; - private bool _isFormVisible; - private bool _isSuccessVisible; - string _email = ""; - - public string Email - { - get => _email; - set => this.RaiseAndSetIfChanged(ref _email, value); - } - - public ReactiveCommand Submit { get; } - public ReactiveCommand DoneButton { get; } - - public bool IsFormVisible - { - get => _isFormVisible; - set => this.RaiseAndSetIfChanged(ref _isFormVisible, value); - } - - public bool IsSuccessVisible - { - get => _isSuccessVisible; - set => this.RaiseAndSetIfChanged(ref _isSuccessVisible, value); - } - - public ForgotPasswordViewModel(AuthService authService, Lazy loginVm) - { - IsFormVisible = true; - IsSuccessVisible = false; - _authService = authService; - _loginVm = loginVm; - - var inputValidation = this.WhenAnyValue( - x => x.Email, - (e) => !string.IsNullOrWhiteSpace(e) && - e.Contains("@") && e.Contains(".")); - - Submit = ReactiveCommand.Create( - TrySendResetPassword, inputValidation); - - DoneButton = ReactiveCommand.Create(ReturnToLogin); - } - - void TrySendResetPassword() - { - _authService.SendForgotPasswordEmail(Email); - IsFormVisible = false; - IsSuccessVisible = true; - } - - public LoginViewModel ReturnToLogin() - { - return _loginVm.Value; - } - } -} diff --git a/UnitystationLauncher/ViewModels/LauncherViewModel.cs b/UnitystationLauncher/ViewModels/LauncherViewModel.cs index 61dada79..360d27be 100644 --- a/UnitystationLauncher/ViewModels/LauncherViewModel.cs +++ b/UnitystationLauncher/ViewModels/LauncherViewModel.cs @@ -13,15 +13,11 @@ namespace UnitystationLauncher.ViewModels { public class LauncherViewModel : ViewModelBase { - private readonly AuthService _authService; - private readonly Lazy _logoutVm; private readonly Lazy _hubUpdateVm; private readonly Config _config; PanelBase[] _panels; ViewModelBase? _selectedPanel; - public string Username => _authService.AuthLink?.User.DisplayName ?? ""; - public PanelBase[] Panels { get => _panels; @@ -34,12 +30,9 @@ public ViewModelBase? SelectedPanel set => this.RaiseAndSetIfChanged(ref _selectedPanel, value); } - public ReactiveCommand Logout { get; } public ReactiveCommand ShowUpdateView { get; } public LauncherViewModel( - AuthService authService, - Lazy logoutVm, Lazy hubUpdateVm, NewsPanelViewModel newsPanel, ServersPanelViewModel serversPanel, @@ -47,13 +40,10 @@ public LauncherViewModel( SettingsPanelViewModel settingsPanel, Config config) { - _authService = authService; - _logoutVm = logoutVm; _hubUpdateVm = hubUpdateVm; _config = config; _panels = GetEnabledPanels(newsPanel, serversPanel, installationsPanel, settingsPanel); - Logout = ReactiveCommand.CreateFromTask(LogoutAsync); ShowUpdateView = ReactiveCommand.Create(ShowUpdateImp); SelectedPanel = serversPanel; @@ -116,14 +106,6 @@ private async Task ValidateClientVersionAsync() } } - private async Task LogoutAsync() - { - await _authService.SignOutUserAsync(); - Preferences prefs = await _config.GetPreferencesAsync(); - prefs.LastLogin = ""; - return _logoutVm.Value; - } - private HubUpdateViewModel ShowUpdateImp() { return _hubUpdateVm.Value; diff --git a/UnitystationLauncher/ViewModels/LoginStatusViewModel.cs b/UnitystationLauncher/ViewModels/LoginStatusViewModel.cs deleted file mode 100644 index 6146d548..00000000 --- a/UnitystationLauncher/ViewModels/LoginStatusViewModel.cs +++ /dev/null @@ -1,175 +0,0 @@ -using System; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Linq; -using System.Threading.Tasks; -using ReactiveUI; -using Serilog; -using UnitystationLauncher.Infrastructure; -using UnitystationLauncher.Services; - -namespace UnitystationLauncher.ViewModels -{ - public class LoginStatusViewModel : ViewModelBase - { - private readonly AuthService _authService; - private readonly Lazy _launcherVm; - private readonly LoginViewModel _loginVm; - private string? _failedMessage; - private bool _isFailedVisible; - private bool _isResendEmailVisible; - private bool _resendClicked; - private bool _isWaitingVisible; - - public LoginStatusViewModel(AuthService authService, Lazy launcherVm, - LoginViewModel loginVm) - { - IsFailedVisible = false; - IsResendEmailVisible = false; - ResendClicked = false; - _authService = authService; - _loginVm = loginVm; - _launcherVm = launcherVm; - - var hasAlreadyResent = this.WhenAnyValue( - x => x.ResendClicked, - (r) => !r); - - ResendEmail = ReactiveCommand.Create(OnResend, hasAlreadyResent); - - GoBack = ReactiveCommand.Create(GoBackToLogin); - - OpenLauncher = ReactiveCommand.Create(SignInComplete); - - if (!authService.AttemptingAutoLogin) - { - RxApp.MainThreadScheduler.ScheduleAsync((scheduler, ct) => UserLoginAsync()); - } - else - { - IsWaitingVisible = true; - } - } - - public bool IsFailedVisible - { - get => _isFailedVisible; - set => this.RaiseAndSetIfChanged(ref _isFailedVisible, value); - } - - public bool IsResendEmailVisible - { - get => _isResendEmailVisible; - set => this.RaiseAndSetIfChanged(ref _isResendEmailVisible, value); - } - - public string? FailedMessage - { - get => _failedMessage; - set => this.RaiseAndSetIfChanged(ref _failedMessage, value); - } - - public bool ResendClicked - { - get => _resendClicked; - set => this.RaiseAndSetIfChanged(ref _resendClicked, value); - } - - public bool IsWaitingVisible - { - get => _isWaitingVisible; - set => this.RaiseAndSetIfChanged(ref _isWaitingVisible, value); - } - - public ReactiveCommand GoBack { get; } - public ReactiveCommand ResendEmail { get; } - public ReactiveCommand OpenLauncher { get; } - - public async Task UserLoginAsync() - { - bool signInSuccess = true; - ResendClicked = false; - IsResendEmailVisible = false; - IsWaitingVisible = true; - - if (string.IsNullOrEmpty(_authService.LoginMsg?.Email) || - string.IsNullOrEmpty(_authService.LoginMsg.Pass)) - { - Log.Error("Login failed"); - FailedMessage = "Login failed.\r\n" + - "Check your email and password\r\n" + - "and try again."; - return; - } - - try - { - await _authService.SignInWithEmailAndPasswordAsync( - _authService.LoginMsg.Email, _authService.LoginMsg.Pass).AwaitWithTimeout(TimeSpan.FromSeconds(20), - firebaseAuthLink => _authService.AuthLink = firebaseAuthLink); - } - catch (OperationCanceledException) - { - Log.Error("Error: {Error}", "Login timed out"); - FailedMessage = "Timed out while trying to log in.\n" - + "Please check your network connection."; - signInSuccess = false; - } - catch (Exception e) - { - Log.Error(e, "Login failed"); - FailedMessage = "Login failed.\r\n" + - "Check your email and password\r\n" + - "and try again."; - signInSuccess = false; - } - - if (signInSuccess) - { - var user = await _authService.GetUpdatedUserAsync(); - - if (!user.IsEmailVerified) - { - FailedMessage = "Email not yet verified.\r\n" + - "Please click on the activation link sent to your\r\n" + - "email address. Alternatively you can request another verification\r\n" + - "email by clicking the resend button below."; - signInSuccess = false; - IsResendEmailVisible = true; - } - } - - _authService.LoginMsg = null; - - IsWaitingVisible = false; - if (!signInSuccess) - { - IsFailedVisible = true; - return; - } - - _authService.SaveAuthSettings(); - - Observable.Start(() => { }).InvokeCommand(this, vm => vm.OpenLauncher); - } - - public void OnResend() - { - _authService.ResendVerificationEmail(); - ResendClicked = true; - FailedMessage = "A new verification email has been sent to:\r\n" + - $"{_authService.AuthLink?.User.Email ?? "{ no email }"}\r\n" + - $"Please activate your account by clicking the link\r\n" + - $"in the email and try again."; - } - - public LoginViewModel GoBackToLogin() - { - return _loginVm; - } - public LauncherViewModel SignInComplete() - { - return _launcherVm.Value; - } - } -} \ No newline at end of file diff --git a/UnitystationLauncher/ViewModels/LoginViewModel.cs b/UnitystationLauncher/ViewModels/LoginViewModel.cs deleted file mode 100644 index 278d2117..00000000 --- a/UnitystationLauncher/ViewModels/LoginViewModel.cs +++ /dev/null @@ -1,104 +0,0 @@ -using System; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Threading.Tasks; -using ReactiveUI; -using UnitystationLauncher.Models.ConfigFile; -using UnitystationLauncher.Services; - -namespace UnitystationLauncher.ViewModels -{ - public class LoginViewModel : ViewModelBase - { - private readonly Lazy _signUpVm; - private readonly Lazy _forgotVm; - private readonly Lazy _loginStatusVm; - private readonly AuthService _authService; - private readonly Config _config; - string _email = ""; - string _password = ""; - - public LoginViewModel( - Lazy loginStatusVm, - Lazy signUpVm, - Lazy forgotVm, - AuthService authService, - Config config) - { - _authService = authService; - _config = config; - _signUpVm = signUpVm; - _loginStatusVm = loginStatusVm; - _forgotVm = forgotVm; - - var possibleCredentials = this.WhenAnyValue( - x => x.Email, - x => x.Password, - (u, p) => - !string.IsNullOrWhiteSpace(u) && - !string.IsNullOrWhiteSpace(p)); - - Login = ReactiveCommand.CreateFromTask( - UserLoginAsync, - possibleCredentials); - - Create = ReactiveCommand.Create( - UserCreate); - - ForgotPw = ReactiveCommand.Create( - ForgotPass); - - RxApp.MainThreadScheduler.ScheduleAsync((scheduler, ct) => CheckForLastLoginAsync()); - } - - public string Email - { - get => _email; - set => this.RaiseAndSetIfChanged(ref _email, value); - } - - public string Password - { - get => _password; - set => this.RaiseAndSetIfChanged(ref _password, value); - } - - public ReactiveCommand Login { get; } - public ReactiveCommand Create { get; } - public ReactiveCommand ForgotPw { get; } - - public async Task UserLoginAsync() - { - _authService.LoginMsg = new LoginMsg - { - Email = Email, - Pass = Password - }; - - await SaveLoginEmailAsync(); - - return _loginStatusVm.Value; - } - - public SignUpViewModel UserCreate() - { - return _signUpVm.Value; - } - - public ForgotPasswordViewModel ForgotPass() - { - return _forgotVm.Value; - } - - async Task CheckForLastLoginAsync() - { - Email = (await _config.GetPreferencesAsync()).LastLogin ?? ""; - } - - async Task SaveLoginEmailAsync() - { - var prefs = await _config.GetPreferencesAsync(); - prefs.LastLogin = _email; - } - } -} diff --git a/UnitystationLauncher/ViewModels/MainWindowViewModel.cs b/UnitystationLauncher/ViewModels/MainWindowViewModel.cs index 8d093554..3fff4f20 100644 --- a/UnitystationLauncher/ViewModels/MainWindowViewModel.cs +++ b/UnitystationLauncher/ViewModels/MainWindowViewModel.cs @@ -13,12 +13,7 @@ namespace UnitystationLauncher.ViewModels { public class MainWindowViewModel : ViewModelBase { - private readonly Lazy _launcherVm; - private readonly Lazy _loginStatusVm; - private readonly AuthService _authService; - private readonly LoginViewModel _loginVm; - - ViewModelBase _content; + private ViewModelBase _content; private Geometry _maximizeIcon; private string _maximizeToolTip; @@ -34,18 +29,11 @@ public string MaximizeToolTip set => this.RaiseAndSetIfChanged(ref _maximizeToolTip, value); } - public MainWindowViewModel(LoginViewModel loginVm, Lazy loginStatusVm, Lazy launcherVm, - AuthService authService) + public MainWindowViewModel(LauncherViewModel launcherVm) { - _loginStatusVm = loginStatusVm; - _loginVm = loginVm; - _authService = authService; - _launcherVm = launcherVm; - Content = _content = loginVm; - authService.AttemptingAutoLogin = false; _maximizeIcon = Geometry.Parse("M2048 2048v-2048h-2048v2048h2048zM1843 1843h-1638v-1638h1638v1638z"); _maximizeToolTip = "Maximize"; - RxApp.MainThreadScheduler.ScheduleAsync((_, _) => CheckForExistingUserAsync()); + Content = _content = launcherVm; } private void Maximize() @@ -74,95 +62,17 @@ private set } } - async Task CheckForExistingUserAsync() - { - if (_authService.AuthLink != null) - { - _authService.AttemptingAutoLogin = true; - Content = _loginStatusVm.Value; - await AttemptAuthRefreshAsync(); - } - } - - async Task AttemptAuthRefreshAsync() - { - if (_authService.AuthLink == null) - { - Log.Error("Login failed"); - Content = _loginVm; - _authService.AttemptingAutoLogin = false; - return; - } - - RefreshToken refreshToken = new() - { - UserId = _authService.AuthLink.User.LocalId, - Token = _authService.AuthLink.RefreshToken - }; - - string token = await _authService.GetCustomTokenAsync(refreshToken); - - if (string.IsNullOrEmpty(token)) - { - Log.Error("Login failed"); - Content = _loginVm; - _authService.AttemptingAutoLogin = false; - return; - } - - try - { - _authService.AuthLink = await _authService.SignInWithCustomTokenAsync(token); - } - catch (Exception e) - { - Log.Error(e, "Login failed"); - Content = _loginVm; - _authService.AttemptingAutoLogin = false; - return; - } - - var user = await _authService.GetUpdatedUserAsync(); - if (!user.IsEmailVerified) - { - Content = _loginVm; - _authService.AttemptingAutoLogin = false; - return; - } - _authService.AttemptingAutoLogin = false; - _authService.SaveAuthSettings(); - Content = _launcherVm.Value; - } - private void ContentChanged() { SubscribeToVm(Content switch { - LoginViewModel loginVm => Observable.Merge( - loginVm.Login.Select(vm => (ViewModelBase)vm), - loginVm.Create.Select(vm => (ViewModelBase)vm), - loginVm.ForgotPw.Select(vm => (ViewModelBase)vm)), - - LoginStatusViewModel loginStatusVm => Observable.Merge( - loginStatusVm.GoBack.Select(vm => (ViewModelBase)vm), - loginStatusVm.OpenLauncher.Select(vm => (ViewModelBase)vm)), - LauncherViewModel launcherVm => Observable.Merge( - launcherVm.Logout.Select(vm => (ViewModelBase)vm), launcherVm.ShowUpdateView.Select(vm => (ViewModelBase)vm)), - SignUpViewModel signUpViewModel => Observable.Merge( - signUpViewModel.Cancel, - signUpViewModel.DoneButton), - HubUpdateViewModel hubUpdateViewModel => Observable.Merge( hubUpdateViewModel.Skip, hubUpdateViewModel.Ignore), - ForgotPasswordViewModel forgotPasswordViewModel => Observable.Merge( - forgotPasswordViewModel.DoneButton), - - _ => throw new ArgumentException($"ViewModel type is not handled and will never be able to change") }); } diff --git a/UnitystationLauncher/ViewModels/ServerViewModel.cs b/UnitystationLauncher/ViewModels/ServerViewModel.cs index b3841d8a..ce1d31f5 100644 --- a/UnitystationLauncher/ViewModels/ServerViewModel.cs +++ b/UnitystationLauncher/ViewModels/ServerViewModel.cs @@ -11,7 +11,6 @@ using Serilog; using UnitystationLauncher.Models; using UnitystationLauncher.Models.Api; -using UnitystationLauncher.Services; namespace UnitystationLauncher.ViewModels { @@ -27,14 +26,11 @@ public class ServerViewModel : ViewModelBase public IObservable Downloading => Download?.WhenAnyValue(d => d.Active) ?? Observable.Return(false); - private readonly AuthService _authService; - - public ServerViewModel(Server server, Installation? installation, Download? download, AuthService authService) + public ServerViewModel(Server server, Installation? installation, Download? download) { Server = server; Installation = installation; Download = download; - _authService = authService; RoundTrip = new(); try @@ -81,8 +77,7 @@ private void PingCompletedCallback(object _, PingCompletedEventArgs eventArgs) public void LaunchGame() { - Installation?.LaunchWithArgs(Server.ServerIp, (short)Server.ServerPort, - _authService.CurrentRefreshToken, _authService.Uid); + Installation?.LaunchWithArgs(Server.ServerIp, (short)Server.ServerPort); } // Ping does not work in the Flatpak sandbox so we have to reconstruct its functionality in that case. diff --git a/UnitystationLauncher/ViewModels/ServersPanelViewModel.cs b/UnitystationLauncher/ViewModels/ServersPanelViewModel.cs index 177ea140..ce486202 100644 --- a/UnitystationLauncher/ViewModels/ServersPanelViewModel.cs +++ b/UnitystationLauncher/ViewModels/ServersPanelViewModel.cs @@ -12,19 +12,16 @@ namespace UnitystationLauncher.ViewModels { public class ServersPanelViewModel : PanelBase { - private readonly AuthService _authService; private readonly StateService _stateService; private readonly DownloadService _downloadService; public override string Name => "Servers"; public override bool IsEnabled => true; - public ServersPanelViewModel(StateService stateService, DownloadService downloadService, - AuthService authService) + public ServersPanelViewModel(StateService stateService, DownloadService downloadService) { _stateService = stateService; _downloadService = downloadService; - _authService = authService; DownloadCommand = ReactiveCommand.CreateFromTask(async server => { @@ -38,8 +35,7 @@ public ServersPanelViewModel(StateService stateService, DownloadService download public IObservable> ServerList => _stateService.State .Select(state => state .SelectMany(installationState => installationState.Value.Servers - .Select(s => new ServerViewModel(s, installationState.Value.Installation, - installationState.Value.Download, _authService))) + .Select(s => new ServerViewModel(s, installationState.Value.Installation, installationState.Value.Download))) .ToList()); public IObservable ServersFound => ServerList.Select(sl => sl.Any()); diff --git a/UnitystationLauncher/ViewModels/SignUpViewModel.cs b/UnitystationLauncher/ViewModels/SignUpViewModel.cs deleted file mode 100644 index d74cab90..00000000 --- a/UnitystationLauncher/ViewModels/SignUpViewModel.cs +++ /dev/null @@ -1,146 +0,0 @@ -using System; -using System.Reactive; -using System.Threading.Tasks; -using ReactiveUI; -using Serilog; -using UnitystationLauncher.Services; - -namespace UnitystationLauncher.ViewModels -{ - public class SignUpViewModel : ViewModelBase - { - private readonly AuthService _authService; - private readonly Lazy _loginVm; - string _email = ""; - string _password = ""; - string _username = ""; - private string? _creationMessage; - private string? _endButtonText; - private bool _isFormVisible; - private bool _isWaitingVisible; - private bool _isCreatedVisible; - - public string Username - { - get => _username; - set => this.RaiseAndSetIfChanged(ref _username, value); - } - - public string Email - { - get => _email; - set => this.RaiseAndSetIfChanged(ref _email, value); - } - - public string Password - { - get => _password; - set => this.RaiseAndSetIfChanged(ref _password, value); - } - - public bool IsFormVisible - { - get => _isFormVisible; - set => this.RaiseAndSetIfChanged(ref _isFormVisible, value); - } - - public bool IsCreatedVisible - { - get => _isCreatedVisible; - set => this.RaiseAndSetIfChanged(ref _isCreatedVisible, value); - } - - public bool IsWaitingVisible - { - get => _isWaitingVisible; - set => this.RaiseAndSetIfChanged(ref _isWaitingVisible, value); - } - - public string? CreationMessage - { - get => _creationMessage; - set => this.RaiseAndSetIfChanged(ref _creationMessage, value); - } - - public string? EndButtonText - { - get => _endButtonText; - set => this.RaiseAndSetIfChanged(ref _endButtonText, value); - } - - public ReactiveCommand Cancel { get; } - public ReactiveCommand DoneButton { get; } - public ReactiveCommand Submit { get; } - - public SignUpViewModel(AuthService authService, Lazy loginVm) - { - IsFormVisible = true; - IsWaitingVisible = false; - IsCreatedVisible = false; - _authService = authService; - _loginVm = loginVm; - var possibleCredentials = this.WhenAnyValue( - x => x.Email, - x => x.Password, - x => x.Username, - (u, p, i) => - !string.IsNullOrWhiteSpace(u) && - !string.IsNullOrWhiteSpace(p) && - p.Length > 6 && - !string.IsNullOrEmpty(i)); - - Submit = ReactiveCommand.CreateFromTask( - UserCreateAsync, possibleCredentials); - - Cancel = ReactiveCommand.Create(ReturnToLogin); - - DoneButton = ReactiveCommand.Create(CreationEndButton); - } - - public async Task UserCreateAsync() - { - IsFormVisible = false; - var creationSuccess = true; - IsWaitingVisible = true; - - try - { - await _authService.CreateAccountAsync(_username, _email, _password); - } - catch (Exception e) - { - Log.Error(e, "Login failed"); - creationSuccess = false; - } - - if (creationSuccess) - { - CreationMessage = $"Success! An email has been sent to \r\n{_email}\r\n" + - $"Please click the link in the email to verify\r\n" + - $"your account before signing in."; - EndButtonText = "Done"; - } - else - { - CreationMessage = $"Something went wrong with the verification email server.\r\n" + - $"A reset password email has been sent to {_email} as a work around.\r\n" + - $"Please reset your password and try to log in."; - _authService.SendForgotPasswordEmail(_email); - EndButtonText = "Back"; - } - - IsWaitingVisible = false; - IsCreatedVisible = true; - } - - public LoginViewModel ReturnToLogin() - { - return _loginVm.Value; - } - - public LoginViewModel CreationEndButton() - { - return _loginVm.Value; - } - } -} \ No newline at end of file diff --git a/UnitystationLauncher/Views/ForgotPasswordView.xaml b/UnitystationLauncher/Views/ForgotPasswordView.xaml deleted file mode 100644 index 1816dadf..00000000 --- a/UnitystationLauncher/Views/ForgotPasswordView.xaml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - Enter your email address: - - - - - - - - - - - - - - - A reset password email has been sent to your address. - Please reset your password and try logging in again - - - - - - \ No newline at end of file diff --git a/UnitystationLauncher/Views/ForgotPasswordView.xaml.cs b/UnitystationLauncher/Views/ForgotPasswordView.xaml.cs deleted file mode 100644 index 1f080729..00000000 --- a/UnitystationLauncher/Views/ForgotPasswordView.xaml.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Avalonia.Controls; -using Avalonia.Markup.Xaml; - -namespace UnitystationLauncher.Views -{ - public class ForgotPasswordView : UserControl - { - public ForgotPasswordView() - { - InitializeComponent(); - } - - private void InitializeComponent() - { - AvaloniaXamlLoader.Load(this); - } - } -} \ No newline at end of file diff --git a/UnitystationLauncher/Views/LauncherView.xaml b/UnitystationLauncher/Views/LauncherView.xaml index 817395ee..aa08a96c 100644 --- a/UnitystationLauncher/Views/LauncherView.xaml +++ b/UnitystationLauncher/Views/LauncherView.xaml @@ -7,56 +7,12 @@ TextBlock.FontSize="18" Background="Transparent" x:Class="UnitystationLauncher.Views.LauncherView"> - - - - - + - - - - - - - - - - - - - - - - @@ -86,9 +42,9 @@ - + diff --git a/UnitystationLauncher/Views/LoginStatusView.xaml b/UnitystationLauncher/Views/LoginStatusView.xaml deleted file mode 100644 index 1ff71533..00000000 --- a/UnitystationLauncher/Views/LoginStatusView.xaml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/UnitystationLauncher/Views/LoginView.xaml.cs b/UnitystationLauncher/Views/LoginView.xaml.cs deleted file mode 100644 index 7cb6e70c..00000000 --- a/UnitystationLauncher/Views/LoginView.xaml.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Avalonia.Controls; -using Avalonia.Markup.Xaml; - -namespace UnitystationLauncher.Views -{ - public class LoginView : UserControl - { - public LoginView() - { - InitializeComponent(); - } - - private void InitializeComponent() - { - AvaloniaXamlLoader.Load(this); - } - } -} \ No newline at end of file diff --git a/UnitystationLauncher/Views/SignUpView.xaml b/UnitystationLauncher/Views/SignUpView.xaml deleted file mode 100644 index 072aca12..00000000 --- a/UnitystationLauncher/Views/SignUpView.xaml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - Create Account: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -