diff --git a/app/http/endpoints/root/callback.go b/app/http/endpoints/root/callback.go index dab67a3..83ed8f3 100644 --- a/app/http/endpoints/root/callback.go +++ b/app/http/endpoints/root/callback.go @@ -4,6 +4,11 @@ import ( "context" "errors" "fmt" + "net/http" + "strconv" + "strings" + "time" + "github.com/TicketsBot/GoPanel/app" "github.com/TicketsBot/GoPanel/app/http/session" "github.com/TicketsBot/GoPanel/config" @@ -12,10 +17,6 @@ import ( "github.com/golang-jwt/jwt" "github.com/rxdn/gdl/rest" "github.com/rxdn/gdl/rest/request" - "net/http" - "strconv" - "strings" - "time" ) func CallbackHandler(c *gin.Context) { @@ -61,7 +62,7 @@ func CallbackHandler(c *gin.Context) { HasGuilds: false, } - var guilds []utils.GuildDto + guilds := make([]utils.GuildDto, 0) if utils.Contains(scopes, "guilds") { guilds, err = utils.LoadGuilds(c, res.AccessToken, currentUser.Id) if err != nil { @@ -98,9 +99,7 @@ func CallbackHandler(c *gin.Context) { "avatar": currentUser.Avatar, "admin": utils.Contains(config.Conf.Admins, currentUser.Id), }, - } - if len(guilds) > 0 { - resMap["guilds"] = guilds + "guilds": guilds, } c.JSON(http.StatusOK, resMap) diff --git a/frontend/src/views/LoginCallback.svelte b/frontend/src/views/LoginCallback.svelte index 2649c64..40c1fb6 100644 --- a/frontend/src/views/LoginCallback.svelte +++ b/frontend/src/views/LoginCallback.svelte @@ -26,6 +26,8 @@ window.localStorage.setItem('user_data', JSON.stringify(res.data.user_data)); if (res.data.guilds) { window.localStorage.setItem('guilds', JSON.stringify(res.data.guilds)); + } else { + window.localStorage.setItem('guilds', JSON.stringify([])); } let path = '/';