فهرست منبع

cookies work accross different subdomains, added translations middlewear into stack to render based on domain

Henry Oswald 12 سال پیش
والد
کامیت
2be22d7ca7
2فایلهای تغییر یافته به همراه8 افزوده شده و 2 حذف شده
  1. 3 2
      services/web/app/coffee/infrastructure/Server.coffee
  2. 5 0
      services/web/config/settings.defaults.coffee

+ 3 - 2
services/web/app/coffee/infrastructure/Server.coffee

@@ -18,7 +18,7 @@ oneDayInMilliseconds = 86400000
 ReferalConnect = require('../Features/Referal/ReferalConnect')
 RedirectManager = require("./RedirectManager")
 OldAssetProxy = require("./OldAssetProxy")
-translations = require "translations-sharelatex"
+translations = require("translations-sharelatex").setup(Settings.subdomainLang)
 
 metrics.mongodb.monitor(Path.resolve(__dirname + "/../../../node_modules/mongojs/node_modules/mongodb"), logger)
 metrics.mongodb.monitor(Path.resolve(__dirname + "/../../../node_modules/mongoose/node_modules/mongodb"), logger)
@@ -51,10 +51,12 @@ app.configure () ->
 	app.use express.bodyParser(uploadDir: Settings.path.uploadFolder)
 	app.use express.bodyParser(uploadDir: __dirname + "/../../../data/uploads")
 	app.use translations.expressMiddlewear
+	app.use translations.setLangBasedOnDomainMiddlewear
 	app.use cookieParser
 	app.use express.session
 		proxy: Settings.behindProxy
 		cookie:
+			domain: Settings.cookieDomain
 			maxAge: cookieSessionLength
 			secure: Settings.secureCookie
 		store: sessionStore
@@ -73,7 +75,6 @@ app.configure () ->
 
 	app.use ReferalConnect.use
 	app.use express.methodOverride()
-	app.use translations.serverStaticFiles
 
 
 expressLocals(app)

+ 5 - 0
services/web/config/settings.defaults.coffee

@@ -107,6 +107,11 @@ module.exports =
 	# that are sent out, generated links, etc.
 	siteUrl : 'http://localhost:3000'
 
+	# cooke domain
+	# use full domain for cookies to only be accesabble from that domain,
+	# replace subdomain with dot to have them accessable on all subdomains
+	# cookieDomain: ".sharelatex.dev"
+
 	# Same, but with http auth credentials.
 	httpAuthSiteUrl: 'http://#{httpAuthUser}:#{httpAuthPass}@localhost:3000'