mirror of
https://github.com/casdoor/casdoor.git
synced 2025-07-02 19:40:19 +08:00
feat: append logo url to cookie (#3507)
This commit is contained in:
@ -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
|
||||
}
|
||||
|
Reference in New Issue
Block a user