Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
compendium-v2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
geant-swd
compendium-v2
Commits
dd6a5643
Commit
dd6a5643
authored
2 years ago
by
Bjarke Madsen
Browse files
Options
Downloads
Patches
Plain Diff
use new-style query
parent
1c6f0b67
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!44
Feature/comp 208 google o auth poc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
compendium_v2/auth/session_management.py
+3
-2
3 additions, 2 deletions
compendium_v2/auth/session_management.py
with
3 additions
and
2 deletions
compendium_v2/auth/session_management.py
+
3
−
2
View file @
dd6a5643
from
sqlalchemy
import
select
from
flask
import
jsonify
from
flask
import
jsonify
from
datetime
import
datetime
from
datetime
import
datetime
from
compendium_v2.db
import
session_scope
from
compendium_v2.db
import
session_scope
...
@@ -31,7 +32,7 @@ def fetch_user(profile: dict):
...
@@ -31,7 +32,7 @@ def fetch_user(profile: dict):
with
session_scope
()
as
session
:
with
session_scope
()
as
session
:
sub_id
=
profile
[
'
sub
'
]
sub_id
=
profile
[
'
sub
'
]
user
=
session
.
query
(
User
).
filt
er
(
User
.
oidc_sub
==
sub_id
)
.
first
(
)
user
=
session
.
scalar
(
select
(
User
).
wh
er
e
(
User
.
oidc_sub
==
sub_id
))
if
user
is
None
:
if
user
is
None
:
return
None
return
None
user
.
last_login
=
datetime
.
utcnow
()
user
.
last_login
=
datetime
.
utcnow
()
...
@@ -47,7 +48,7 @@ def user_loader(user_id: str):
...
@@ -47,7 +48,7 @@ def user_loader(user_id: str):
"""
"""
with
session_scope
()
as
session
:
with
session_scope
()
as
session
:
user
=
session
.
query
(
User
).
filt
er
(
User
.
id
==
user_id
)
.
first
(
)
user
=
session
.
scalar
(
select
(
User
).
wh
er
e
(
User
.
id
==
user_id
))
if
user
is
None
:
if
user
is
None
:
return
None
return
None
user
.
last_login
=
datetime
.
utcnow
()
user
.
last_login
=
datetime
.
utcnow
()
...
...
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