Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Χάρης Παπαδόπουλος
e-epal
Commits
2eddb0e7
Commit
2eddb0e7
authored
Apr 28, 2017
by
Open Source Developer
Browse files
trans
parent
af1f9efc
Changes
2
Hide whitespace changes
Inline
Side-by-side
drupal/modules/epal/src/Controller/CurrentUser.php
View file @
2eddb0e7
...
...
@@ -34,7 +34,7 @@ class CurrentUser extends ControllerBase
$container
->
get
(
'entity_type.manager'
),
$container
->
get
(
'database'
),
$container
->
get
(
'logger.factory'
)
);
);
}
public
function
getLoginInfo
(
Request
$request
)
...
...
@@ -51,14 +51,14 @@ class CurrentUser extends ControllerBase
$userRoles
=
$user
->
getRoles
();
foreach
(
$userRoles
as
$userRole
)
{
if
(
$userRole
===
'epal'
)
{
if
(
(
$userRole
===
'epal'
)
||
(
$userRole
===
'regioneduadmin'
)
||
(
$userRole
===
'eduadmin'
))
{
return
$this
->
respondWithStatus
([
'name'
=>
$user
->
mail
->
value
,
'title'
=>
$user
->
init
->
value
,
],
Response
::
HTTP_OK
);
}
else
if
(
$userRole
===
'applicant'
)
{
break
;
}
}
}
...
...
source/services/auth.service.ts
View file @
2eddb0e7
...
...
@@ -22,6 +22,7 @@ export class AuthService {
}).
subscribe
(
loginInfo
=>
{
if
(
loginInfo
.
size
>
0
)
{
loginInfo
.
reduce
(({},
loginInfoToken
)
=>
{
console
.
log
(
loginInfoToken
.
auth_role
,
"
aaaaaaa
"
);
if
(
loginInfoToken
.
auth_token
&&
loginInfoToken
.
auth_token
.
length
>
0
&&
loginInfoToken
.
auth_role
===
role
)
{
resolve
(
true
);
}
...
...
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