Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
geomag-algorithms
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
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
ghsc
National Geomagnetism Program
geomag-algorithms
Commits
2135ba2a
Commit
2135ba2a
authored
3 years ago
by
Cain, Payton David
Browse files
Options
Downloads
Patches
Plain Diff
Document metadata ws endpoints
parent
12db1e64
No related branches found
No related tags found
2 merge requests
!146
Release CMO metadata to production
,
!111
Custom OpenAPI Titles/Descriptions
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
geomagio/api/secure/login.py
+16
-9
16 additions, 9 deletions
geomagio/api/secure/login.py
geomagio/api/secure/metadata.py
+36
-7
36 additions, 7 deletions
geomagio/api/secure/metadata.py
with
52 additions
and
16 deletions
geomagio/api/secure/login.py
+
16
−
9
View file @
2135ba2a
...
...
@@ -150,10 +150,11 @@ oauth.register(
router
=
APIRouter
()
@router.get
(
"
/authorize
"
)
@router.get
(
"
/authorize
"
,
description
=
"
Authorize callback after authenticating using OpenID
"
,
)
async
def
authorize
(
request
:
Request
):
"""
Authorize callback after authenticating using OpenID
"""
# finish login
token
=
await
oauth
.
openid
.
authorize_access_token
(
request
)
...
...
@@ -171,9 +172,11 @@ async def authorize(request: Request):
)
@router.get
(
"
/login
"
)
@router.get
(
"
/login
"
,
description
=
"
Redirect to OpenID provider.
"
,
)
async
def
login
(
request
:
Request
):
"""
Redirect to OpenID provider.
"""
redirect_uri
=
request
.
url_for
(
"
authorize
"
)
if
"
127.0.0.1
"
not
in
redirect_uri
:
# 127.0.0.1 used for local dev, all others use https
...
...
@@ -185,9 +188,11 @@ async def login(request: Request):
return
await
oauth
.
openid
.
authorize_redirect
(
request
,
redirect_uri
)
@router.get
(
"
/logout
"
)
@router.get
(
"
/logout
"
,
description
=
"
Clear session and redirect to index page.
"
,
)
async
def
logout
(
request
:
Request
):
"""
Clear session and redirect to index page.
"""
request
.
session
.
pop
(
"
token
"
,
None
)
request
.
session
.
pop
(
"
user
"
,
None
)
return
RedirectResponse
(
...
...
@@ -199,7 +204,9 @@ async def logout(request: Request):
)
@router.get
(
"
/user
"
)
@router.get
(
"
/user
"
,
description
=
"
Get currently logged in user.
"
,
)
async
def
user
(
request
:
Request
,
user
:
User
=
Depends
(
require_user
()))
->
User
:
"""
Get currently logged in user.
"""
return
user
This diff is collapsed.
Click to expand it.
geomagio/api/secure/metadata.py
+
36
−
7
View file @
2135ba2a
...
...
@@ -59,7 +59,11 @@ def get_metadata_query(
)
@router.post
(
"
/metadata
"
,
response_model
=
Metadata
)
@router.post
(
"
/metadata
"
,
description
=
"
Save metadata in database
"
,
response_model
=
Metadata
,
)
async
def
create_metadata
(
request
:
Request
,
metadata
:
Metadata
,
...
...
@@ -71,13 +75,22 @@ async def create_metadata(
return
Response
(
metadata
.
json
(),
status_code
=
201
,
media_type
=
"
application/json
"
)
@router.get
(
"
/metadata
"
,
response_model
=
List
[
Metadata
])
@router.get
(
"
/metadata
"
,
description
=
"
Search metadata by query parameters
"
,
name
=
"
Request metadata
"
,
response_model
=
List
[
Metadata
],
)
async
def
get_metadata
(
query
:
MetadataQuery
=
Depends
(
get_metadata_query
)):
metas
=
await
MetadataDatabaseFactory
(
database
=
database
).
get_metadata
(
params
=
query
)
return
metas
@router.get
(
"
/metadata/history
"
,
response_model
=
List
[
Metadata
])
@router.get
(
"
/metadata/history
"
,
description
=
"
Search historical metadata by query parameters
"
,
response_model
=
List
[
Metadata
],
)
async
def
get_metadata_history
(
query
:
MetadataQuery
=
Depends
(
get_metadata_query
)):
metas
=
await
MetadataDatabaseFactory
(
database
=
database
).
get_metadata
(
params
=
query
,
history
=
True
...
...
@@ -85,12 +98,20 @@ async def get_metadata_history(query: MetadataQuery = Depends(get_metadata_query
return
metas
@router.get
(
"
/metadata/{id}
"
,
response_model
=
Metadata
)
@router.get
(
"
/metadata/{id}
"
,
description
=
"
Search metadata by database id
"
,
response_model
=
Metadata
,
)
async
def
get_metadata_by_id
(
id
:
int
):
return
await
MetadataDatabaseFactory
(
database
=
database
).
get_metadata_by_id
(
id
=
id
)
@router.get
(
"
/metadata/{metadata_id}/history
"
,
response_model
=
List
[
Metadata
])
@router.get
(
"
/metadata/{metadata_id}/history
"
,
description
=
"
Search metadata version history by database id
"
,
response_model
=
List
[
Metadata
],
)
async
def
get_metadata_history_by_metadata_id
(
metadata_id
:
int
,
):
...
...
@@ -101,7 +122,11 @@ async def get_metadata_history_by_metadata_id(
)
@router.get
(
"
/metadata/history/{id}
"
,
response_model
=
Metadata
)
@router.get
(
"
/metadata/history/{id}
"
,
description
=
"
Search historical metadata by database id
"
,
response_model
=
Metadata
,
)
async
def
get_metadata_history_by_id
(
id
:
int
):
metadata
=
await
MetadataDatabaseFactory
(
database
=
database
...
...
@@ -111,7 +136,11 @@ async def get_metadata_history_by_id(id: int):
return
metadata
@router.put
(
"
/metadata/{id}
"
,
response_model
=
Metadata
)
@router.put
(
"
/metadata/{id}
"
,
description
=
"
Edit metadata from older version
"
,
response_model
=
Metadata
,
)
async
def
update_metadata
(
id
:
int
,
metadata
:
Metadata
=
Body
(...),
...
...
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