wip

Author: Bios-Marcel

internal/api/http.go

@@ -32,6 +32,7 @@ func (handler *V1Handler) SetupRoutes(rootPath string, register func(string, str
 	register("GET", path.Join(v1, "lobby", "ws"), handler.websocketUpgrade)
 
 	register("POST", path.Join(v1, "lobby", "{lobby_id}", "player"), handler.postPlayer)
+	register("POST", path.Join(v1, "discord_authenticate"), handler.discordAuthenticate)
 }
 
 // remoteAddressToSimpleIP removes unnecessary clutter from the input,

internal/api/v1.go

@@ -5,6 +5,8 @@
 package api
 
 import (
+	"bytes"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"log"
@@ -191,6 +193,57 @@ func (handler *V1Handler) postLobby(writer http.ResponseWriter, request *http.Re
 	state.AddLobby(lobby)
 }
 
+type discordAuthenticatePayload struct {
+	Code string `json:"code"`
+}
+
+type discordTokenRequest struct {
+	ClientId     string `json:"client_id"`
+	ClientSecret string `json:"client_secret"`
+	GrantType    string `json:"grant_type"`
+	Code         string `json:"code"`
+}
+type discordTokenResponse struct {
+	AccessCode string `json:"access_code"`
+}
+
+func (handler *V1Handler) discordAuthenticate(writer http.ResponseWriter, request *http.Request) {
+	decoder := json.NewDecoder(request.Body)
+	var payload discordAuthenticatePayload
+	if err := decoder.Decode(&payload); err != nil {
+		http.Error(writer, "error decoding payload", http.StatusBadRequest)
+		return
+	}
+
+	discordPayload := bytes.NewBuffer(nil)
+	if err := json.NewEncoder(discordPayload).Encode(discordTokenRequest{
+		ClientId:     "1320396325925163070",
+		ClientSecret: handler.cfg.DiscordApiKey,
+		GrantType:    "authorization_code",
+		Code:         payload.Code,
+	}); err != nil {
+		http.Error(writer, "error retrieving token from discord", http.StatusInternalServerError)
+		return
+	}
+	discordRequest, err := http.NewRequest(http.MethodPost, "https://discord.com/api/oauth2/token", discordPayload)
+	if err != nil {
+		http.Error(writer, "internal server error", http.StatusInternalServerError)
+		return
+	}
+
+	response, err := http.DefaultClient.Do(discordRequest)
+	if err != nil {
+		http.Error(writer, "error retrieving token from discord", http.StatusInternalServerError)
+		return
+	}
+
+	var discordTokenResponse discordTokenResponse
+	if err := json.NewDecoder(response.Body).Decode(&discordTokenResponse); err != nil {
+		http.Error(writer, "error retrieving token from discord", http.StatusInternalServerError)
+		return
+	}
+}
+
 func (handler *V1Handler) postPlayer(writer http.ResponseWriter, request *http.Request) {
 	lobby := state.GetLobby(request.PathValue("lobby_id"))
 	if lobby == nil {

internal/config/config.go

@@ -72,6 +72,8 @@ type Config struct {
 	Port                 uint16               `env:"PORT"`
 	CORS                 CORS                 `envPrefix:"CORS_"`
 	LobbyCleanup         LobbyCleanup         `envPrefix:"LOBBY_CLEANUP_"`
+
+	DiscordApiKey string `env:"DISCORD_API_KEY"`
 }
 
 var Default = Config{

internal/frontend/http.go

@@ -61,13 +61,15 @@ type BasePageConfig struct {
 
 var fallbackChecksum = uuid.Must(uuid.NewV4()).String()
 
-func (baseConfig *BasePageConfig) Hash(key string, bytes []byte) error {
+func (baseConfig *BasePageConfig) Hash(key string, bytes ...[]byte) error {
 	_, alreadyExists := baseConfig.checksums[key]
 	if alreadyExists {
 		return fmt.Errorf("duplicate hash key '%s'", key)
 	}
-	if _, err := baseConfig.hash.Write(bytes); err != nil {
-		return fmt.Errorf("error hashing '%s': %w", key, err)
+	for _, arr := range bytes {
+		if _, err := baseConfig.hash.Write(arr); err != nil {
+			return fmt.Errorf("error hashing '%s': %w", key, err)
+		}
 	}
 	baseConfig.checksums[key] = hex.EncodeToString(baseConfig.hash.Sum(nil))
 	baseConfig.hash.Reset()

internal/frontend/index.go

@@ -24,6 +24,18 @@ import (
 //go:embed lobby.js
 var lobbyJsRaw string
 
+//go:embed lobby-discord.js
+var lobbyDiscordJsRaw string
+
+func init() {
+	lobbyJsRaw = `
+{{if .DiscordActivity}}
+` + lobbyDiscordJsRaw + `
+{{end}}
+` + lobbyJsRaw
+	lobbyDiscordJsRaw = ""
+}
+
 //go:embed index.js
 var indexJsRaw string
 
@@ -95,7 +107,7 @@ func NewHandler(cfg *config.Config) (*SSRHandler, error) {
 	if err := basePageConfig.Hash("index.js", []byte(indexJsRaw)); err != nil {
 		return nil, fmt.Errorf("error hashing: %w", err)
 	}
-	if err := basePageConfig.Hash("lobby.js", []byte(lobbyJsRaw)); err != nil {
+	if err := basePageConfig.Hash("lobby.js", []byte(lobbyJsRaw), []byte(lobbyDiscordJsRaw)); err != nil {
 		return nil, fmt.Errorf("error hashing: %w", err)
 	}
 

internal/frontend/lobby-discord.js

@@ -0,0 +1,42 @@
+import { DiscordSDK } from '{{.RootPath}}/resources/discord-sdk.mjs';
+const clientId = "1320396325925163070"
+const discordSdk = new DiscordSDK(clientId);
+discordSdk.ready().then(() => {
+    discordSdk
+        .authorize({
+            client_id: clientId,
+            response_type: "code",
+            state: "",
+            prompt: "none",
+            scope: [
+                "identify",
+            ],
+        })
+        .then((response) => {
+            return fetch("`{{.RootPath}}/v1/discord_authenticate`", {
+                method: "POST",
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                    code: response.code,
+                }),
+            })
+        })
+        .then((response) => response.json())
+        .then((response) => {
+            discordSdk
+                .authenticate({
+                    access_token: response.access_code(),
+                })
+                .then((response) => {
+                    let name = response.user.username;
+                    if (response.user.nickname) {
+                        name = response.user.nickname;
+                    }
+                    changeName(name);
+                });
+        });
+});
+
+console.log(DiscordSDK);

internal/frontend/lobby.go

@@ -24,6 +24,7 @@ type lobbyPageData struct {
 type lobbyJsData struct {
 	*BasePageConfig
 	*api.GameConstants
+	DiscordActivity bool
 
 	Translation translations.Translation
 	Locale      string
@@ -35,18 +36,21 @@ type robotPageData struct {
 }
 
 func (handler *SSRHandler) lobbyJs(writer http.ResponseWriter, request *http.Request) {
+	discordInstanceId := api.GetDiscordInstanceId(request)
 	translation, locale := determineTranslation(request)
 	pageData := &lobbyJsData{
-		BasePageConfig: handler.basePageConfig,
-		GameConstants:  api.GameConstantsData,
-		Translation:    translation,
-		Locale:         locale,
+		BasePageConfig:  handler.basePageConfig,
+		GameConstants:   api.GameConstantsData,
+		Translation:     translation,
+		DiscordActivity: discordInstanceId != "",
+		Locale:          locale,
 	}
 
 	writer.Header().Set("Content-Type", "text/javascript")
 	// Duration of 1 year, since we use cachebusting anyway.
 	writer.Header().Set("Cache-Control", "public, max-age=31536000")
 	writer.WriteHeader(http.StatusOK)
+
 	if err := handler.lobbyJsRawTemplate.ExecuteTemplate(writer, "lobby-js", pageData); err != nil {
 		log.Printf("error templating JS: %s\n", err)
 	}

internal/frontend/resources/discord-sdk.mjs

@@ -383,7 +383,7 @@
     </div>
 
     <script type="text/javascript" src='{{.RootPath}}/resources/{{.WithCacheBust "draw.js"}}'></script>
-    <script type="text/javascript" src='{{.RootPath}}/{{.WithCacheBust "lobby.js"}}'></script>
+    <script type="module" src='{{.RootPath}}/{{.WithCacheBust "lobby.js"}}'></script>
 </body>
 
 </html>