Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RAP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IA2
RAP
Commits
f6387d8f
Commit
f6387d8f
authored
Sep 11, 2019
by
Sonia Zorba
Browse files
Options
Downloads
Patches
Plain Diff
Added refresh token in check token response and minor fix
parent
66d0f69b
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
classes/IdTokenBuilder.php
+2
-2
2 additions, 2 deletions
classes/IdTokenBuilder.php
classes/OAuth2RequestHandler.php
+5
-0
5 additions, 0 deletions
classes/OAuth2RequestHandler.php
with
7 additions
and
2 deletions
classes/IdTokenBuilder.php
+
2
−
2
View file @
f6387d8f
...
@@ -28,8 +28,8 @@ class IdTokenBuilder {
...
@@ -28,8 +28,8 @@ class IdTokenBuilder {
$payloadArr
=
array
(
$payloadArr
=
array
(
'iss'
=>
$this
->
locator
->
config
->
jwtIssuer
,
'iss'
=>
$this
->
locator
->
config
->
jwtIssuer
,
'sub'
=>
$user
->
id
,
'sub'
=>
$user
->
id
,
'iat'
=>
$accessToken
->
creationTime
,
'iat'
=>
intval
(
$accessToken
->
creationTime
)
,
'exp'
=>
$accessToken
->
expirationTime
,
'exp'
=>
intval
(
$accessToken
->
expirationTime
)
,
'name'
=>
$user
->
getCompleteName
(),
'name'
=>
$user
->
getCompleteName
(),
'aud'
=>
$accessToken
->
clientId
'aud'
=>
$accessToken
->
clientId
);
);
...
...
This diff is collapsed.
Click to expand it.
classes/OAuth2RequestHandler.php
+
5
−
0
View file @
f6387d8f
...
@@ -202,12 +202,17 @@ class OAuth2RequestHandler {
...
@@ -202,12 +202,17 @@ class OAuth2RequestHandler {
public
function
handleCheckTokenRequest
(
$token
):
array
{
public
function
handleCheckTokenRequest
(
$token
):
array
{
$accessToken
=
$this
->
locator
->
getAccessTokenDAO
()
->
getAccessToken
(
$token
);
$accessToken
=
$this
->
locator
->
getAccessTokenDAO
()
->
getAccessToken
(
$token
);
if
(
$accessToken
===
null
)
{
throw
new
UnauthorizedException
(
"Invalid access token"
);
}
$user
=
$this
->
locator
->
getUserDAO
()
->
findUserById
(
$accessToken
->
userId
);
$user
=
$this
->
locator
->
getUserDAO
()
->
findUserById
(
$accessToken
->
userId
);
$result
=
[];
$result
=
[];
$result
[
'exp'
]
=
$accessToken
->
expirationTime
-
time
();
$result
[
'exp'
]
=
$accessToken
->
expirationTime
-
time
();
$result
[
'user_name'
]
=
$user
->
id
;
$result
[
'user_name'
]
=
$user
->
id
;
$result
[
'client_id'
]
=
$accessToken
->
clientId
;
$result
[
'client_id'
]
=
$accessToken
->
clientId
;
$result
[
'refresh_token'
]
=
$this
->
getNewRefreshToken
(
$accessToken
);
if
(
$accessToken
->
scope
!==
null
)
{
if
(
$accessToken
->
scope
!==
null
)
{
$result
[
'scope'
]
=
$accessToken
->
scope
;
$result
[
'scope'
]
=
$accessToken
->
scope
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment