Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

teknikattan-scoring-system
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

eb09fc46

Commit eb09fc46 authored 3 years ago by robban64

Downloads
- Plain Diff

Merge branch 'dev' of...

Merge branch 'dev' of https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system into 157-whitelist-jwt

parents 14648c60 a29a04ba

No related branches found

No related tags found

1 merge request!121Resolve "Whitelist jwt"

Pipeline #43125 passed 3 years ago

Stage: setup

Stage: test

Stage: report

Changes 32
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

client/src/pages/views/ViewSelectPage.tsx 26 additions, 38 deletions

client/src/pages/views/ViewSelectPage.tsx
client/src/pages/views/components/SocketTest.tsx 2 additions, 2 deletions

client/src/pages/views/components/SocketTest.tsx
client/src/pages/views/styled.tsx 12 additions, 2 deletions

client/src/pages/views/styled.tsx
client/src/reducers/competitionLoginReducer.ts 30 additions, 2 deletions

client/src/reducers/competitionLoginReducer.ts
client/src/sockets.ts 11 additions, 2 deletions

client/src/sockets.ts
client/src/utils/SecureRoute.tsx 28 additions, 13 deletions

client/src/utils/SecureRoute.tsx
client/src/utils/checkAuthenticationAdmin.test.ts 5 additions, 5 deletions

client/src/utils/checkAuthenticationAdmin.test.ts
client/src/utils/checkAuthenticationAdmin.ts 1 addition, 1 deletion

client/src/utils/checkAuthenticationAdmin.ts
client/src/utils/checkAuthenticationCompetition.ts 41 additions, 0 deletions

client/src/utils/checkAuthenticationCompetition.ts
server/app/apis/auth.py 16 additions, 13 deletions

server/app/apis/auth.py
server/app/apis/misc.py 0 additions, 1 deletion

server/app/apis/misc.py
server/app/core/sockets.py 37 additions, 3 deletions

server/app/core/sockets.py

with 209 additions and 82 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment