Fixed: setUserTimeZone should ran only once based on error

(OFBIZ-11329)

This will be notably useful when committing CSRF solution as explained in
OFBIZ-11306:

SetTimeZoneFromBrowser when starting gives a  RequestHandlerException:
Invalid or missing CSRF token for AJAX call to path '/SetTimeZoneFromBrowser'.
Also not only when starting.

Thanks: James Yong for review
This commit is contained in:
Jacques Le Roux
2020-02-05 09:32:42 +01:00
parent 218d5a07a2
commit 91cdc817e1
2 changed files with 7 additions and 7 deletions
@@ -20,13 +20,14 @@
import org.apache.ofbiz.service.ServiceUtil
public Map SetTimeZoneFromBrowser() {
Map results = ServiceUtil.returnSuccess()
userLogin = from("UserLogin").where("userLoginId", parameters.userLogin.userLoginId).queryFirst();
if (userLogin) {
if (!userLogin.lastTimeZone || "null".equals(userLogin.lastTimeZone)) {
userLogin.lastTimeZone = parameters.localeName
userLogin.store()
return ServiceUtil.returnSuccess()
}
} else {
return ServiceUtil.returnError()
}
return results
}
@@ -17,18 +17,17 @@ specific language governing permissions and limitations
under the License.
*/
// Only once by session
// Only once by session (ref https://developer.mozilla.org/en-US/docs/Web/API/Window/sessionStorage)
if (sessionStorage.getItem("SetTimeZoneFromBrowser") === null || sessionStorage.getItem("SetTimeZoneFromBrowser") !== "done") {
sessionStorage.setItem("SetTimeZoneFromBrowser", "done");
var timezone = moment.tz.guess();
$.ajax({
url: "SetTimeZoneFromBrowser",
type: "POST",
async: false,
data: "localeName=" + timezone,
error: function(error) {
if (error != "") {
console.error("Error while setting user locale: ", error);
success: function(success) {
if (success._ERROR_MESSAGE_ === undefined && success._ERROR_MESSAGE_LIST_ === undefined) {
sessionStorage.setItem("SetTimeZoneFromBrowser", "done");
}
}
});