Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
nomad-lab
nomad-FAIR
Commits
47168f13
Commit
47168f13
authored
Dec 20, 2019
by
Markus Scheidgen
Browse files
Fixed failed auth after implicit logout
#224
.
parent
72843a27
Pipeline
#65861
failed with stages
in 7 minutes and 59 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
gui/src/components/api.js
View file @
47168f13
...
@@ -171,7 +171,17 @@ class Api {
...
@@ -171,7 +171,17 @@ class Api {
})
})
})
})
}
else
{
}
else
{
return
this
.
_swaggerClient
const
self
=
this
return
new
Promise
((
resolve
,
reject
)
=>
{
self
.
_swaggerClient
.
then
(
swaggerClient
=>
{
swaggerClient
.
authorizations
=
{}
resolve
(
swaggerClient
)
})
.
catch
(()
=>
{
reject
(
new
ApiError
())
})
})
}
}
}
}
...
...
nomad/app/api/auth.py
View file @
47168f13
...
@@ -143,7 +143,7 @@ def authenticate(
...
@@ -143,7 +143,7 @@ def authenticate(
abort
(
401
,
'Invalid token'
)
abort
(
401
,
'Invalid token'
)
elif
'token'
in
request
.
args
:
elif
'token'
in
request
.
args
:
abort
(
401
,
'Quer
am
param token not supported for this endpoint'
)
abort
(
401
,
'Quer
y
param token not supported for this endpoint'
)
else
:
else
:
error
=
infrastructure
.
keycloak
.
authorize_flask
(
basic
=
basic
)
error
=
infrastructure
.
keycloak
.
authorize_flask
(
basic
=
basic
)
...
...
nomad/config.py
View file @
47168f13
...
@@ -195,7 +195,7 @@ datacite = NomadConfig(
...
@@ -195,7 +195,7 @@ datacite = NomadConfig(
password
=
'*'
password
=
'*'
)
)
version
=
'0.7.
1
'
version
=
'0.7.
2
'
commit
=
gitinfo
.
commit
commit
=
gitinfo
.
commit
release
=
'devel'
release
=
'devel'
domain
=
'DFT'
domain
=
'DFT'
...
...
ops/helm/nomad/Chart.yaml
View file @
47168f13
apiVersion
:
v1
apiVersion
:
v1
appVersion
:
"
0.7.
1
"
appVersion
:
"
0.7.
2
"
description
:
A Helm chart for Kubernetes that only runs nomad services and uses externally hosted databases.
description
:
A Helm chart for Kubernetes that only runs nomad services and uses externally hosted databases.
name
:
nomad
name
:
nomad
version
:
0.7.
1
version
:
0.7.
2
setup.py
View file @
47168f13
...
@@ -12,7 +12,7 @@ reqs = [str(ir.req) for ir in install_reqs if 'sphinxcontrib.httpdomain' not in
...
@@ -12,7 +12,7 @@ reqs = [str(ir.req) for ir in install_reqs if 'sphinxcontrib.httpdomain' not in
setup
(
setup
(
name
=
'nomad'
,
name
=
'nomad'
,
version
=
'0.7.
1
'
,
version
=
'0.7.
2
'
,
description
=
'The nomad@FAIRDI infrastructure python package'
,
description
=
'The nomad@FAIRDI infrastructure python package'
,
py_modules
=
[
'nomad'
],
py_modules
=
[
'nomad'
],
install_requires
=
reqs
,
install_requires
=
reqs
,
...
...
Write
Preview
Supports
Markdown
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