diff --git a/api/account/discord.go b/api/account/discord.go index be249ae..df2e8bb 100644 --- a/api/account/discord.go +++ b/api/account/discord.go @@ -48,7 +48,7 @@ func RetrieveDiscordId(code string) (string, error) { "client_secret": {os.Getenv("DISCORD_CLIENT_SECRET")}, "grant_type": {"authorization_code"}, "code": {code}, - "redirect_uri": {os.Getenv("DISCORD_CALLBACK_URI")}, + "redirect_uri": {os.Getenv("DISCORD_CALLBACK_URL")}, "scope": {"identify"}, }) diff --git a/api/account/google.go b/api/account/google.go index b717fc9..1cf2c67 100644 --- a/api/account/google.go +++ b/api/account/google.go @@ -50,7 +50,7 @@ func RetrieveGoogleId(code string) (string, error) { "client_secret": {os.Getenv("GOOGLE_CLIENT_SECRET")}, "code": {code}, "grant_type": {"authorization_code"}, - "redirect_uri": {os.Getenv("GOOGLE_CALLBACK_URI")}, + "redirect_uri": {os.Getenv("GOOGLE_CALLBACK_URL")}, }) if err != nil { diff --git a/rogueserver.go b/rogueserver.go index debc265..4242329 100644 --- a/rogueserver.go +++ b/rogueserver.go @@ -49,7 +49,7 @@ func main() { googleclientid := flag.String("googleclientid", "gcid", "Google Oauth2 Client ID") googlesecretid := flag.String("googlesecretid", "gsid", "Google Oauth2 Secret ID") - callbackurl := flag.String("callbackurl", "http://localhost:8001/", "Callback URI for Oauth2 Client") + callbackurl := flag.String("callbackurl", "http://localhost:8001/", "Callback URL for Oauth2 Client") gameurl := flag.String("gameurl", "https://pokerogue.net", "URL for game server") @@ -58,11 +58,11 @@ func main() { // set discord client id as env variable os.Setenv("DISCORD_CLIENT_ID", *discordclientid) os.Setenv("DISCORD_CLIENT_SECRET", *discordsecretid) - os.Setenv("DISCORD_CALLBACK_URI", *callbackurl+"/auth/discord/callback") + os.Setenv("DISCORD_CALLBACK_URL", *callbackurl+"/auth/discord/callback") os.Setenv("GOOGLE_CLIENT_ID", *googleclientid) os.Setenv("GOOGLE_CLIENT_SECRET", *googlesecretid) - os.Setenv("GOOGLE_CALLBACK_URI", *callbackurl+"/auth/google/callback") + os.Setenv("GOOGLE_CALLBACK_URL", *callbackurl+"/auth/google/callback") os.Setenv("GAME_URL", *gameurl) // register gob types