Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Leymonerie
slapos.core
Commits
241cacfd
Commit
241cacfd
authored
4 years ago
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio: Get token ids before validate it
parent
fbb05398
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/Base_getComputerToken.py
...rtal_skins/slapos_hal_json_style/Base_getComputerToken.py
+2
-1
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/Base_getCredentialToken.py
...al_skins/slapos_hal_json_style/Base_getCredentialToken.py
+2
-1
No files found.
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/Base_getComputerToken.py
View file @
241cacfd
...
...
@@ -17,6 +17,7 @@ access_token = portal.access_token_module.newContent(
url_string
=
request_url
,
url_method
=
request_method
)
access_token_id
=
access_token
.
getId
()
access_token
.
validate
()
slapos_master_api
=
web_site
.
getLayoutProperty
(
...
...
@@ -29,7 +30,7 @@ computer_install_command_line = web_site.getLayoutProperty(
request
=
context
.
REQUEST
response
=
request
.
RESPONSE
response
.
setHeader
(
'Content-Type'
,
"application/json"
)
return
json
.
dumps
({
'access_token'
:
access_token
.
getId
()
,
return
json
.
dumps
({
'access_token'
:
access_token
_id
,
'command_line'
:
computer_install_command_line
,
'slapos_master_web'
:
slapos_master_web_url
,
'slapos_master_api'
:
slapos_master_api
})
This diff is collapsed.
Click to expand it.
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/Base_getCredentialToken.py
View file @
241cacfd
...
...
@@ -20,10 +20,11 @@ access_token = portal.access_token_module.newContent(
url_string
=
request_url
,
url_method
=
request_method
)
access_token_id
=
access_token
.
getId
()
access_token
.
validate
()
request
=
context
.
REQUEST
response
=
request
.
RESPONSE
response
.
setHeader
(
'Content-Type'
,
"application/json"
)
return
json
.
dumps
({
'access_token'
:
access_token
.
getId
()
,
return
json
.
dumps
({
'access_token'
:
access_token
_id
,
'command_line'
:
"slapos configure client"
})
This diff is collapsed.
Click to expand it.
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