Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
minerva
core
Commits
cc6040ed
Commit
cc6040ed
authored
Mar 28, 2018
by
Piotr Gawron
Browse files
prevent to load logged user data twice
parent
0d41836f
Pipeline
#4370
passed with stage
in 1 minute and 24 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
frontend-js/src/main/js/ServerConnector.js
View file @
cc6040ed
...
...
@@ -971,7 +971,7 @@ ServerConnector.getLoggedUser = function () {
if
(
self
.
_loggedUser
!==
undefined
)
{
return
Promise
.
resolve
(
self
.
_loggedUser
);
}
else
{
return
self
.
getUser
(
self
.
getSessionData
().
getLogin
()).
then
(
function
(
user
)
{
self
.
_loggedUser
=
self
.
getUser
(
self
.
getSessionData
().
getLogin
()).
then
(
function
(
user
)
{
if
(
user
!==
null
)
{
self
.
_loggedUser
=
user
;
return
self
.
_loggedUser
;
...
...
@@ -979,6 +979,7 @@ ServerConnector.getLoggedUser = function () {
return
Promise
.
reject
(
new
Error
(
"
User
"
+
self
.
getSessionData
().
getLogin
()
+
"
doesn't exist
"
));
}
});
return
self
.
_loggedUser
;
}
};
...
...
frontend-js/src/test/js/ServerConnector-test.js
View file @
cc6040ed
...
...
@@ -402,5 +402,22 @@ describe('ServerConnector', function () {
});
});
it
(
'
getLoggedUser called twice
'
,
function
()
{
var
called
=
0
;
var
orginalFunction
=
ServerConnector
.
getUser
;
ServerConnector
.
getUser
=
function
(
login
)
{
called
++
;
return
Promise
.
delay
(
20
,
orginalFunction
.
call
(
ServerConnector
,
login
));
};
var
promises
=
[
ServerConnector
.
getLoggedUser
(),
ServerConnector
.
getLoggedUser
()];
return
Promise
.
all
(
promises
).
then
(
function
(
result
)
{
assert
.
ok
(
result
[
0
]
===
result
[
1
]);
assert
.
equal
(
1
,
called
);
}).
finally
(
function
()
{
ServerConnector
.
getUser
=
orginalFunction
;
});
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment