From 4b778b46bebb33645ffd0e16132dcc0b7226ccad Mon Sep 17 00:00:00 2001
From: Liz Ainslie <lizainslie16@gmail.com>
Date: Thu, 28 Jul 2022 13:38:54 -0700
Subject: [PATCH 1/3] Add Xbox colors to brand palette

---
 .idea/gradle.xml           |  2 +-
 web/src/styles/button.scss | 16 ++++++++++++++++
 web/src/styles/colors.scss |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 681df12f..f9c5da88 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,7 +8,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$/api" />
-        <option name="gradleHome" value="$PROJECT_DIR$/../../gradle" />
+        <option name="gradleHome" value="$USER_HOME$/gradle" />
         <option name="gradleJvm" value="16" />
         <option name="modules">
           <set>
diff --git a/web/src/styles/button.scss b/web/src/styles/button.scss
index e7c063bd..79ca105a 100644
--- a/web/src/styles/button.scss
+++ b/web/src/styles/button.scss
@@ -130,4 +130,20 @@
 			}
 		}
 	}
+
+	&.xbox {
+		background-color: $xbox;
+
+		.linkTag {
+			color: $xbox;
+		}
+
+		&:hover:not(.disabled) {
+			background-color: darken($xbox, 10);
+
+			.linkTag {
+				color: darken($xbox, 10);
+			}
+		}
+	}
 }
diff --git a/web/src/styles/colors.scss b/web/src/styles/colors.scss
index a0cda8ef..52599d19 100644
--- a/web/src/styles/colors.scss
+++ b/web/src/styles/colors.scss
@@ -3,3 +3,4 @@ $twitter: #1da1f2;
 $github: #333333;
 $reddit: #ff4500;
 $twitch: #9146ff;
+$xbox: #52b043;

From 836e22ba9ae64bcd459b2e36931dadd5047752ff Mon Sep 17 00:00:00 2001
From: Liz Ainslie <lizainslie16@gmail.com>
Date: Fri, 29 Jul 2022 00:17:20 -0700
Subject: [PATCH 2/3] Add MS Auth

---
 .idea/gradle.xml                              |   2 +-
 .idea/misc.xml                                |   1 +
 .idea/runConfigurations/Start_API.xml         |   2 +-
 api/config.example.json                       |   5 +
 .../dev/synapsetech/tzdb/config/oauth.kt      |   1 +
 .../kotlin/dev/synapsetech/tzdb/data/User.kt  |   5 +-
 .../dev/synapsetech/tzdb/plugins/Security.kt  | 219 +++++++++++++++++-
 web/src/lib/data.ts                           |   1 +
 web/src/views/AccountView.vue                 | 210 +++++++++--------
 9 files changed, 341 insertions(+), 105 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f9c5da88..317e5cb8 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,8 +8,8 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$/api" />
+        <option name="gradleJvm" value="temurin-17" />
         <option name="gradleHome" value="$USER_HOME$/gradle" />
-        <option name="gradleJvm" value="16" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$/api" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 799110b5..4b3a5758 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,4 +4,5 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$/api" />
   </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="temurin-17" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Start_API.xml b/.idea/runConfigurations/Start_API.xml
index e79a8ae0..a59a07c8 100644
--- a/.idea/runConfigurations/Start_API.xml
+++ b/.idea/runConfigurations/Start_API.xml
@@ -4,7 +4,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$/api" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
+      <option name="scriptParameters" value="--scan" />
       <option name="taskDescriptions">
         <list />
       </option>
diff --git a/api/config.example.json b/api/config.example.json
index 84f6c190..846afb1e 100644
--- a/api/config.example.json
+++ b/api/config.example.json
@@ -21,6 +21,11 @@
       "clientId": "",
       "clientSecret": "",
       "redirectUri": ""
+    },
+    "microsoft": {
+      "clientId": "",
+      "clientSecret": "",
+      "redirectUri": ""
     }
   },
   "database": {
diff --git a/api/src/main/kotlin/dev/synapsetech/tzdb/config/oauth.kt b/api/src/main/kotlin/dev/synapsetech/tzdb/config/oauth.kt
index 1803c8ae..fcee1328 100644
--- a/api/src/main/kotlin/dev/synapsetech/tzdb/config/oauth.kt
+++ b/api/src/main/kotlin/dev/synapsetech/tzdb/config/oauth.kt
@@ -21,6 +21,7 @@ data class OauthConfigPart(
     val github: OauthCodeGrantProvider,
     val twitch: OauthCodeGrantProvider,
     val twitter: Oauth1aProvider,
+    val microsoft: OauthCodeGrantProvider,
 )
 
 
diff --git a/api/src/main/kotlin/dev/synapsetech/tzdb/data/User.kt b/api/src/main/kotlin/dev/synapsetech/tzdb/data/User.kt
index 73312744..4dfa15b8 100644
--- a/api/src/main/kotlin/dev/synapsetech/tzdb/data/User.kt
+++ b/api/src/main/kotlin/dev/synapsetech/tzdb/data/User.kt
@@ -19,6 +19,7 @@ data class User(
     var githubId: Long? = null,
     var twitterId: Long? = null,
     var twitchId: Long? = null,
+    var minecraftUUID: String? = null,
     var zoneId: String = "UTC",
 ) {
     fun save() {
@@ -32,7 +33,7 @@ data class User(
         getCollection().deleteOneById(_id)
     }
 
-    fun toApiJson() = Json(_id, username, discordId, githubId, twitterId, twitchId, ZoneId.of(zoneId).toApiJson())
+    fun toApiJson() = Json(_id, username, discordId, githubId, twitterId, twitchId, minecraftUUID, ZoneId.of(zoneId).toApiJson())
 
     @Serializable data class Json(
         val id: Long,
@@ -41,6 +42,7 @@ data class User(
         val githubId: Long?,
         val twitterId: Long?,
         val twitchId: Long?,
+        val minecraftUUID: String?,
         val timezoneInfo: ZoneInfoJson,
     )
 
@@ -56,6 +58,7 @@ data class User(
         fun findByGithubId(githubId: Long) = getCollection().findOne(User::githubId eq githubId)
         fun findByTwitterId(twitterId: Long) = getCollection().findOne(User::twitterId eq twitterId)
         fun findByTwitchId(twitchId: Long) = getCollection().findOne(User::twitchId eq twitchId)
+        fun findByMinecraftUUID(minecraftUUID: String) = getCollection().findOne(User::minecraftUUID eq minecraftUUID)
     }
 }
 
diff --git a/api/src/main/kotlin/dev/synapsetech/tzdb/plugins/Security.kt b/api/src/main/kotlin/dev/synapsetech/tzdb/plugins/Security.kt
index 230dd113..692ced9a 100644
--- a/api/src/main/kotlin/dev/synapsetech/tzdb/plugins/Security.kt
+++ b/api/src/main/kotlin/dev/synapsetech/tzdb/plugins/Security.kt
@@ -1,9 +1,5 @@
 package dev.synapsetech.tzdb.plugins
 
-import io.ktor.server.auth.*
-import kotlinx.serialization.Serializable
-import io.ktor.http.*
-import io.ktor.server.auth.jwt.*
 import com.auth0.jwt.JWT
 import com.auth0.jwt.JWTVerifier
 import com.auth0.jwt.algorithms.Algorithm
@@ -13,9 +9,15 @@ import dev.synapsetech.tzdb.httpClient
 import dev.synapsetech.tzdb.util.TwitterTransport
 import io.ktor.client.call.*
 import io.ktor.client.request.*
+import io.ktor.client.statement.*
+import io.ktor.http.*
 import io.ktor.server.application.*
+import io.ktor.server.auth.*
+import io.ktor.server.auth.jwt.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
+import kotlinx.serialization.Serializable
+import java.math.BigInteger
 import java.util.*
 
 const val discordAuthorizeUrl = "https://discord.com/api/oauth2/authorize"
@@ -27,6 +29,9 @@ const val githubTokenUrl = "https://github.com/login/oauth/access_token"
 const val twitchAuthorizeUrl = "https://id.twitch.tv/oauth2/authorize"
 const val twitchTokenUrl = "https://id.twitch.tv/oauth2/token"
 
+const val microsoftAuthorizeUrl = "https://login.live.com/oauth20_authorize.srf"
+const val microsoftTokenUrl = "https://login.live.com/oauth20_token.srf"
+
 fun genJwt(userId: Long): String = JWT.create()
     .withAudience(MainConfig.instance.jwt.audience)
     .withIssuer(MainConfig.instance.jwt.domain)
@@ -105,6 +110,22 @@ fun Application.configureSecurity() {
             client = httpClient
         }
 
+        oauth("auth-oauth-microsoft") {
+            urlProvider = { MainConfig.instance.oauth.microsoft.redirectUri }
+            providerLookup = {
+                OAuthServerSettings.OAuth2ServerSettings(
+                    name = "microsoft",
+                    authorizeUrl = microsoftAuthorizeUrl,
+                    accessTokenUrl = microsoftTokenUrl,
+                    requestMethod = HttpMethod.Post,
+                    clientId = MainConfig.instance.oauth.microsoft.clientId,
+                    clientSecret = MainConfig.instance.oauth.microsoft.clientSecret,
+                    defaultScopes = listOf("XboxLive.signin", "Xboxlive.offline_access", "User.Read")
+                )
+            }
+            client = httpClient
+        }
+
         jwt("auth-jwt") {
             val jwtAudience = MainConfig.instance.jwt.audience
             realm = MainConfig.instance.jwt.realm
@@ -165,6 +186,7 @@ fun Application.configureSecurity() {
                 val response = httpClient.get("https://discord.com/api/users/@me") {
                     headers {
                         append("Authorization", "Bearer ${principal?.accessToken}")
+                        append("User-Agent", "TimezoneDB Authentication Agent/1.0 (+https://tzdb.synapsetech.dev)")
                     }
                 }
 
@@ -255,6 +277,7 @@ fun Application.configureSecurity() {
                     headers {
                         append("Accept", "application/vnd.github.v3+json")
                         append("Authorization", "token ${principal?.accessToken}")
+                        append("User-Agent", "TimezoneDB Authentication Agent/1.0 (+https://tzdb.synapsetech.dev)")
                     }
                 }
 
@@ -266,6 +289,7 @@ fun Application.configureSecurity() {
                         headers {
                             append("Accept", "application/vnd.github.v3+json")
                             append("Authorization", "token ${principal?.accessToken}")
+                            append("User-Agent", "TimezoneDB Authentication Agent/1.0 (+https://tzdb.synapsetech.dev)")
                         }
                     }
 
@@ -439,6 +463,7 @@ fun Application.configureSecurity() {
                         append("Accept", "application/json")
                         append("Authorization", "Bearer ${principal?.accessToken}")
                         append("Client-Id", MainConfig.instance.oauth.twitch.clientId)
+                        append("User-Agent", "TimezoneDB Authentication Agent/1.0 (+https://tzdb.synapsetech.dev)")
                     }
                 }
 
@@ -481,6 +506,133 @@ fun Application.configureSecurity() {
                 call.respondRedirect(webUri.toString())
             }
         }
+
+        get("/auth/microsoft") {
+            call.request.queryParameters["intent"]?.let { intent ->
+                if (intent == "link") {
+                    val jwt = call.request.queryParameters["token"] ?: run {
+                        call.respond(HttpStatusCode.BadRequest)
+                        return@get
+                    }
+
+                    val decoded = jwtVerifier.verify(jwt)
+                    val userId = decoded.getClaim("userId").asLong() ?: run {
+                        call.respond(HttpStatusCode.Unauthorized)
+                        return@get
+                    }
+
+                    call.response.cookies.append("tzdb-link-user", userId.toString())
+                }
+            }
+
+            call.respondRedirect("/auth/login/microsoft")
+        }
+
+        authenticate("auth-oauth-microsoft") {
+            get("/auth/login/microsoft") {
+                call.respondRedirect("/auth/callback/microsoft")
+            }
+
+            get("/auth/callback/microsoft") {
+                val principal: OAuthAccessTokenResponse.OAuth2? = call.principal()
+
+                var link = false
+                var userId: Long? = null
+
+                call.request.cookies["tzdb-link-user"]?.let {
+                    link = true
+                    userId = it.toLongOrNull()
+                }
+
+                call.response.cookies.appendExpired("tzdb-link-user")
+
+                if (link && userId == null) {
+                    call.respond(HttpStatusCode.BadRequest)
+                    return@get
+                }
+
+                val xboxTokenResponse = httpClient.post("https://user.auth.xboxlive.com:443/user/authenticate") {
+                    headers {
+                        append("x-xbl-contract-version", "1")
+                    }
+                    userAgent("TimezoneDB Authentication Agent/1.0 (+https://tzdb.synapsetech.dev)")
+                    contentType(ContentType.Application.Json)
+                    accept(ContentType.Application.Json)
+                    setBody(XboxTokenRequest(
+                        XboxTokenRequest.Companion.PropertiesData(
+                            "RPS",
+                            "user.auth.xboxlive.com",
+                            "d=${principal!!.accessToken}"
+                        ),
+                        "http://auth.xboxlive.com",
+                        "JWT"
+                    ))
+                }
+
+                val xboxTokenResponseData: XboxTokenResponse = xboxTokenResponse.body()
+                val xboxToken = xboxTokenResponseData.Token
+                val xboxUhs = xboxTokenResponseData.DisplayClaims.xui[0].uhs
+
+                val xstsTokenResponse = httpClient.post("https://xsts.auth.xboxlive.com:443/xsts/authorize") {
+                    headers {
+                        append("x-xbl-contract-version", "1")
+                    }
+                    userAgent("TimezoneDB Authentication Agent/1.0 (+https://tzdb.synapsetech.dev)")
+                    contentType(ContentType.Application.Json)
+                    accept(ContentType.Application.Json)
+                    setBody(XstsTokenRequest(
+                        XstsTokenRequest.Companion.PropertiesData("RETAIL", listOf(xboxToken)),
+                        "rp://api.minecraftservices.com/",
+                        "JWT"
+                    ))
+                }
+                val xstsTokenResponseData: XboxTokenResponse = xstsTokenResponse.body()
+                val xstsToken = xstsTokenResponseData.Token
+
+                val minecraftTokenResponse = httpClient.post("https://api.minecraftservices.com:443/authentication/login_with_xbox") {
+                    userAgent("TimezoneDB Authentication Agent/1.0 (+https://tzdb.synapsetech.dev)")
+                    contentType(ContentType.Application.Json)
+                    accept(ContentType.Application.Json)
+                    setBody(MinecraftTokenRequest(
+                        "XBL3.0 x=${xboxUhs};${xstsToken}"
+                    ))
+                }
+
+                val minecraftTokenResponseData: MinecraftTokenResponse = minecraftTokenResponse.body()
+
+                val minecraftProfileResponse = httpClient.get("https://api.minecraftservices.com:443/minecraft/profile") {
+                    headers {
+                        append("Authorization", "Bearer ${minecraftTokenResponseData.access_token}")
+                    }
+                    userAgent("TimezoneDB Authentication Agent/1.0 (+https://tzdb.synapsetech.dev)")
+                    accept(ContentType.Application.Json)
+                }
+
+                val minecraftProfile: MinecraftProfile = minecraftProfileResponse.body()
+
+                val bi1 = BigInteger(minecraftProfile.id.substring(0, 16), 16)
+                val bi2 = BigInteger(minecraftProfile.id.substring(16, 32), 16)
+                val minecraftUUID = UUID(bi1.toLong(), bi2.toLong()).toString()
+
+                val possibleOtherUser = User.findByMinecraftUUID(minecraftUUID)
+                if (link) {
+                    if (possibleOtherUser != null && possibleOtherUser._id != userId) {
+                        call.respond(HttpStatusCode.BadRequest, "Account already linked")
+                        return@get
+                    }
+
+                    val thisUser = User.findById(userId!!)!!
+                    thisUser.minecraftUUID = minecraftUUID
+                    thisUser.save()
+                } else {
+                    call.respond(HttpStatusCode.BadRequest, "Cannot use Minecraft for login.")
+                }
+//
+                val token = genJwt(userId!!)
+                val webUri = Url(MainConfig.instance.webUrl).toURI().resolve("/?token=$token")
+                call.respondRedirect(webUri.toString())
+            }
+        }
     }
 }
 
@@ -511,3 +663,62 @@ fun Application.configureSecurity() {
 @Serializable data class TwitchResponse(
     val data: List<TwitchUser>,
 )
+
+@Serializable data class XboxTokenRequest(
+    val Properties: PropertiesData,
+    val RelyingParty: String,
+    val TokenType: String,
+) {
+    companion object {
+        @Serializable data class PropertiesData(
+            val AuthMethod: String,
+            val SiteName: String,
+            val RpsTicket: String, // Microsoft naming at its finest. This is a JWT.
+        )
+    }
+}
+
+@Serializable data class XboxTokenResponse(
+    val IssueInstant: String,
+    val NotAfter: String,
+    val Token: String,
+    val DisplayClaims: DisplayClaimsData,
+) {
+    companion object {
+        @Serializable data class DisplayClaimsData(
+            val xui: List<UserHashData>,
+        )
+
+        @Serializable data class UserHashData(
+            val uhs: String,
+        )
+    }
+}
+
+@Serializable data class XstsTokenRequest(
+    val Properties: PropertiesData,
+    val RelyingParty: String,
+    val TokenType: String
+) {
+    companion object {
+        @Serializable data class PropertiesData(
+            val SandboxId: String,
+            val UserTokens: List<String>,
+        )
+    }
+}
+
+@Serializable data class MinecraftTokenRequest(
+    val identityToken: String,
+    val ensureLegacyEnabled: Boolean = true,
+)
+
+@Serializable data class MinecraftTokenResponse(
+    val username: String,
+    val access_token: String,
+)
+
+@Serializable data class MinecraftProfile(
+    val name: String,
+    val id: String,
+)
\ No newline at end of file
diff --git a/web/src/lib/data.ts b/web/src/lib/data.ts
index f0875d9d..badbd64c 100644
--- a/web/src/lib/data.ts
+++ b/web/src/lib/data.ts
@@ -10,5 +10,6 @@ export interface User {
 	discordId?: number;
 	twitterId?: number;
 	twitchId?: number;
+	minecraftUUID?: number;
 	timezoneInfo: ZoneInfo;
 }
diff --git a/web/src/views/AccountView.vue b/web/src/views/AccountView.vue
index ec351510..8f8078d7 100644
--- a/web/src/views/AccountView.vue
+++ b/web/src/views/AccountView.vue
@@ -1,72 +1,73 @@
 <script setup lang="ts">
-import {
-	faGithub,
-	faDiscord,
-	faTwitter,
-	faTwitch,
-} from '@fortawesome/free-brands-svg-icons';
-import { computed, onMounted, ref } from 'vue';
-import type { User, ZoneInfo } from '../lib/data';
-import {
-	getUser,
-	redirectLogin,
-	deleteAccount,
-	getZones,
-	patchUser,
-} from '../lib/api';
-// @ts-ignore
-import VueSelect from 'vue-multiselect';
-import Page from '../components/Page.vue';
-
-const account = ref<User | undefined>();
-const zones = ref<ZoneInfo[]>([]);
-const selectedZoneId = ref<string>('utc');
-
-const toastColor = ref<'red' | 'green'>('green');
-const toastMessage = ref<string>('');
-const showToast = ref(false);
-const toastClass = computed(() => ({
-	toast: true,
-	[toastColor.value]: true,
-}));
-
-onMounted(async () => {
-	account.value = await getUser();
-	console.log(account.value);
-	zones.value = await getZones();
-	selectedZoneId.value = account.value?.timezoneInfo.id ?? 'utc';
-});
-
-function saveAccount() {
-	patchUser({ zoneId: selectedZoneId.value })
-		.then(async () => {
-			account.value = await getUser();
-			toastColor.value = 'green';
-			toastMessage.value = 'Account saved!';
-			showToast.value = true;
-			setTimeout(() => {
-				showToast.value = false;
-			}, 3000);
-		})
-		.catch(() => {
-			toastColor.value = 'red';
-			toastMessage.value = 'Could not save account!';
-			showToast.value = true;
-			setTimeout(() => {
-				showToast.value = false;
-			}, 3000);
-		});
-}
-
-const confirmationMessage = 'delete my account';
-
-function confirmDeleteAccount() {
-	const answer = prompt(
-		`Please type "${confirmationMessage}" below to delete your account.`,
-	);
-
-	if (answer === confirmationMessage) deleteAccount();
-}
+	import {
+		faGithub,
+		faDiscord,
+		faTwitter,
+		faTwitch,
+		faXbox,
+	} from '@fortawesome/free-brands-svg-icons';
+	import { computed, onMounted, ref } from 'vue';
+	import type { User, ZoneInfo } from '../lib/data';
+	import {
+		getUser,
+		redirectLogin,
+		deleteAccount,
+		getZones,
+		patchUser,
+	} from '../lib/api';
+	// @ts-ignore
+	import VueSelect from 'vue-multiselect';
+	import Page from '../components/Page.vue';
+
+	const account = ref<User | undefined>();
+	const zones = ref<ZoneInfo[]>([]);
+	const selectedZoneId = ref<string>('utc');
+
+	const toastColor = ref<'red' | 'green'>('green');
+	const toastMessage = ref<string>('');
+	const showToast = ref(false);
+	const toastClass = computed(() => ({
+		toast: true,
+		[toastColor.value]: true,
+	}));
+
+	onMounted(async () => {
+		account.value = await getUser();
+		console.log(account.value);
+		zones.value = await getZones();
+		selectedZoneId.value = account.value?.timezoneInfo.id ?? 'utc';
+	});
+
+	function saveAccount() {
+		patchUser({ zoneId: selectedZoneId.value })
+			.then(async () => {
+				account.value = await getUser();
+				toastColor.value = 'green';
+				toastMessage.value = 'Account saved!';
+				showToast.value = true;
+				setTimeout(() => {
+					showToast.value = false;
+				}, 3000);
+			})
+			.catch(() => {
+				toastColor.value = 'red';
+				toastMessage.value = 'Could not save account!';
+				showToast.value = true;
+				setTimeout(() => {
+					showToast.value = false;
+				}, 3000);
+			});
+	}
+
+	const confirmationMessage = 'delete my account';
+
+	function confirmDeleteAccount() {
+		const answer = prompt(
+			`Please type "${confirmationMessage}" below to delete your account.`,
+		);
+
+		if (answer === confirmationMessage) deleteAccount();
+	}
 </script>
 
 <template>
@@ -131,6 +132,19 @@ function confirmDeleteAccount() {
 							account.twitchId ? 'Linked' : 'Not Linked'
 						}}</span>
 					</button>
+					<button
+						class="btn xbox"
+						@click="redirectLogin('microsoft', true)"
+					>
+						<font-awesome-icon
+							:icon="faXbox"
+							class="mr-2"
+						></font-awesome-icon>
+						Xbox/Microsoft
+						<span class="linkTag">{{
+							account.minecraftUUID ? 'Linked' : 'Not Linked'
+						}}</span>
+					</button>
 				</div>
 			</section>
 
@@ -172,49 +186,49 @@ function confirmDeleteAccount() {
 </template>
 
 <style scoped lang="scss">
-@import '../styles/button.scss';
+	@import '../styles/button.scss';
 
-.accounts {
-	@apply flex flex-wrap;
+	.accounts {
+		@apply flex flex-wrap;
 
-	.btn {
-		@apply mb-3;
+		.btn {
+			@apply mb-3;
 
-		&:last-of-type {
-			@apply mb-0 lg:mb-3;
-		}
+			&:last-of-type {
+				@apply mb-0 lg:mb-3;
+			}
 
-		&:not(:last-of-type) {
-			@apply lg:mr-3 inline-flex;
+			&:not(:last-of-type) {
+				@apply lg:mr-3 inline-flex;
+			}
 		}
 	}
-}
 
-.toast {
-	@apply bottom-2 right-2 rounded text-white px-3 py-2 absolute;
+	.toast {
+		@apply bottom-2 right-2 rounded text-white px-3 py-2 absolute;
 
-	&.red {
-		@apply bg-red-500;
-	}
+		&.red {
+			@apply bg-red-500;
+		}
 
-	&.green {
-		@apply bg-green-500;
+		&.green {
+			@apply bg-green-500;
+		}
 	}
-}
 
-.settingSection {
-	@apply flex flex-col items-center lg:items-start;
+	.settingSection {
+		@apply flex flex-col items-center lg:items-start;
 
-	&:not(:last-of-type) {
-		@apply mb-8;
-	}
+		&:not(:last-of-type) {
+			@apply mb-8;
+		}
 
-	.heading {
-		@apply text-3xl mb-4 font-bold;
-	}
+		.heading {
+			@apply text-3xl mb-4 font-bold;
+		}
 
-	.description {
-		@apply mb-2 text-center lg:text-left;
+		.description {
+			@apply mb-2 text-center lg:text-left;
+		}
 	}
-}
 </style>

From 69ffcfafcd85542bb0ba3c588fc0cefb98ba0438 Mon Sep 17 00:00:00 2001
From: Liz Ainslie <lizainslie16@gmail.com>
Date: Fri, 29 Jul 2022 00:18:58 -0700
Subject: [PATCH 3/3] Add route for fetching by mc uuid.

---
 .../main/kotlin/dev/synapsetech/tzdb/routes/user.kt   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/api/src/main/kotlin/dev/synapsetech/tzdb/routes/user.kt b/api/src/main/kotlin/dev/synapsetech/tzdb/routes/user.kt
index a52d1d63..0c3f16aa 100644
--- a/api/src/main/kotlin/dev/synapsetech/tzdb/routes/user.kt
+++ b/api/src/main/kotlin/dev/synapsetech/tzdb/routes/user.kt
@@ -100,6 +100,17 @@ fun Route.userRoutes() {
                 if (user != null) call.respond(user.toApiJson())
                 else call.respond(HttpStatusCode.NotFound)
             }
+
+            get("/minecraft/{uuid}") {
+                val minecraftUUID = call.parameters["uuid"] ?: run {
+                    call.respond(HttpStatusCode.BadRequest)
+                    return@get
+                }
+
+                val user = User.findByMinecraftUUID(minecraftUUID)
+                if (user != null) call.respond(user.toApiJson())
+                else call.respond(HttpStatusCode.NotFound)
+            }
         }
     }
 }