feat: append logo url to cookie (#3507)

This commit is contained in:
DacongDA
2025-01-19 08:02:44 +08:00
committed by GitHub
parent 2b89f6b37b
commit a74a004540
2 changed files with 15 additions and 10 deletions

View File

@ -30,7 +30,7 @@ func appendThemeCookie(ctx *context.Context, urlPath string) error {
return err
}
if application.ThemeData != nil {
return setThemeDataCookie(ctx, application.ThemeData)
return setThemeDataCookie(ctx, application.ThemeData, application.Logo)
}
organization := application.OrganizationObj
if organization == nil {
@ -40,7 +40,7 @@ func appendThemeCookie(ctx *context.Context, urlPath string) error {
}
}
if organization != nil {
return setThemeDataCookie(ctx, organization.ThemeData)
return setThemeDataCookie(ctx, organization.ThemeData, organization.Logo)
}
} else if strings.HasPrefix(urlPath, "/login/oauth/authorize") {
clientId := ctx.Input.Query("client_id")
@ -57,10 +57,10 @@ func appendThemeCookie(ctx *context.Context, urlPath string) error {
return err
}
if application.ThemeData != nil {
return setThemeDataCookie(ctx, application.ThemeData)
return setThemeDataCookie(ctx, application.ThemeData, application.Logo)
}
if organization != nil {
return setThemeDataCookie(ctx, organization.ThemeData)
return setThemeDataCookie(ctx, organization.ThemeData, organization.Logo)
}
}
} else if strings.HasPrefix(urlPath, "/login/") {
@ -71,7 +71,7 @@ func appendThemeCookie(ctx *context.Context, urlPath string) error {
return err
}
if application.ThemeData != nil {
return setThemeDataCookie(ctx, application.ThemeData)
return setThemeDataCookie(ctx, application.ThemeData, application.Logo)
}
organization := application.OrganizationObj
if organization == nil {
@ -81,7 +81,7 @@ func appendThemeCookie(ctx *context.Context, urlPath string) error {
}
}
if organization != nil {
return setThemeDataCookie(ctx, organization.ThemeData)
return setThemeDataCookie(ctx, organization.ThemeData, organization.Logo)
}
}
}
@ -89,11 +89,12 @@ func appendThemeCookie(ctx *context.Context, urlPath string) error {
return nil
}
func setThemeDataCookie(ctx *context.Context, themeData *object.ThemeData) error {
func setThemeDataCookie(ctx *context.Context, themeData *object.ThemeData, logoUrl string) error {
themeDataString, err := json.Marshal(themeData)
if err != nil {
return err
}
ctx.SetCookie("organizationTheme", string(themeDataString))
ctx.SetCookie("organizationLogo", logoUrl)
return nil
}