YunoHost/SSOwat
1
0
Fork 0
mirror of https://github.com/YunoHost/SSOwat.git synced 2024-09-03 20:06:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] dash filename, mime types, ynh_userinfo.json

Browse source
This commit is contained in:
ljf 2021-06-29 18:34:40 +02:00
parent 92728ac6cb
commit b3741580da
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
access.lua
View file

@ -208,6 +208,7 @@ end
if is_logged_in then if is_logged_in then
assets = { assets = {
["/ynh_portal.js"] = "js/ynh_portal.js", ["/ynh_portal.js"] = "js/ynh_portal.js",
["/ynh_userinfo.js"] = "ynh_userinfo.json",
["/ynh_overlay.css"] = "css/ynh_overlay.css" ["/ynh_overlay.css"] = "css/ynh_overlay.css"
} }
theme_dir = "/usr/share/ssowat/portal/assets/themes/"..conf.theme theme_dir = "/usr/share/ssowat/portal/assets/themes/"..conf.theme
@ -218,7 +219,7 @@ if is_logged_in then
pfile:close() pfile:close()
for shortcut, full in pairs(assets) do for shortcut, full in pairs(assets) do
if string.match(ngx.var.uri, "^"..shortcut.."$") then if ngx.var.uri == shortcut then
logger.debug("Serving static asset "..full) logger.debug("Serving static asset "..full)
return hlp.serve("/yunohost/sso/assets/"..full, "static_asset") return hlp.serve("/yunohost/sso/assets/"..full, "static_asset")
end end

22
helpers.lua
View file

@ -550,13 +550,24 @@ function serve(uri, cache)
png = "image/png", png = "image/png",
svg = "image/svg+xml", svg = "image/svg+xml",
ico = "image/vnd.microsoft.icon", ico = "image/vnd.microsoft.icon",
woff = "application/x-font-woff", woff = "font/woff",
woff2 = "font/woff2",
ttf = "font/ttf",
json = "application/json" json = "application/json"
} }
-- Allow .ms to specify mime type
mime = ext
if ext == "ms" then
subext = string.match(file, "^.+%.(.+)%.ms$")
if subext then
mime = subext
end
end
-- Set Content-Type -- Set Content-Type
if mime_types[ext] then if mime_types[mime] then
ngx.header["Content-Type"] = mime_types[ext] ngx.header["Content-Type"] = mime_types[mime]
else else
ngx.header["Content-Type"] = "text/plain" ngx.header["Content-Type"] = "text/plain"
end end
@ -570,9 +581,10 @@ function serve(uri, cache)
elseif ext == "ms" then elseif ext == "ms" then
local data = get_data_for(file) local data = get_data_for(file)
content = lustache:render(content, data) content = lustache:render(content, data)
elseif ext == "json" then elseif uri == "/ynh_userinfo.json" then
local data = get_data_for(file) local data = get_data_for(file)
content = json.encode(data) content = json.encode(data)
cache = "dynamic"
end end
-- Reset flash messages -- Reset flash messages
@ -612,7 +624,7 @@ function get_data_for(view)
elseif view == "portal.html" elseif view == "portal.html"
or view == "edit.html" or view == "edit.html"
or view == "password.html" or view == "password.html"
or view == "ynhpanel.json" then or view == "ynh_userinfo.json" then
-- Invalidate cache before loading these views. -- Invalidate cache before loading these views.
-- Needed if the LDAP db is changed outside ssowat (from the cli for example). -- Needed if the LDAP db is changed outside ssowat (from the cli for example).