From 93411b8c7029e60526b0a3940128387ade694f0f Mon Sep 17 00:00:00 2001
From: Sivert Kronen Hatteberg <skh@uio.no>
Date: Mon, 6 Dec 2021 22:04:16 +0100
Subject: [PATCH] Add a session type info to the user info endpoint
---
frontend/src/contexts/userContext.ts | 1 +
frontend/src/interfaces/index.ts | 1 +
frontend/src/providers/userProvider.tsx | 5 +++++
gregui/api/views/userinfo.py | 5 +++++
4 files changed, 12 insertions(+)
diff --git a/frontend/src/contexts/userContext.ts b/frontend/src/contexts/userContext.ts
index 6fcc23f1..ed002945 100644
--- a/frontend/src/contexts/userContext.ts
+++ b/frontend/src/contexts/userContext.ts
@@ -12,6 +12,7 @@ function noop() {}
export const UserContext = createContext<IUserContext>({
user: {
auth: false,
+ auth_type: '',
fetched: false,
first_name: '',
last_name: '',
diff --git a/frontend/src/interfaces/index.ts b/frontend/src/interfaces/index.ts
index 9cd159ff..ff8f15f2 100644
--- a/frontend/src/interfaces/index.ts
+++ b/frontend/src/interfaces/index.ts
@@ -64,6 +64,7 @@ export type FetchedRole = {
export interface User {
auth: boolean
+ auth_type: string
fetched: boolean
person_id: string
sponsor_id: string
diff --git a/frontend/src/providers/userProvider.tsx b/frontend/src/providers/userProvider.tsx
index 2d1d17a1..3a17e9d8 100644
--- a/frontend/src/providers/userProvider.tsx
+++ b/frontend/src/providers/userProvider.tsx
@@ -10,6 +10,7 @@ function UserProvider(props: UserProviderProps) {
const { children } = props
const [user, setUser] = useState({
auth: false,
+ auth_type: '',
fetched: false,
first_name: '',
last_name: '',
@@ -31,6 +32,7 @@ function UserProvider(props: UserProviderProps) {
if (response.ok) {
setUser({
auth: true,
+ auth_type: data.auth_type,
fetched: true,
first_name: data.first_name,
last_name: data.last_name,
@@ -46,6 +48,7 @@ function UserProvider(props: UserProviderProps) {
} else {
setUser({
auth: false,
+ auth_type: '',
fetched: true,
first_name: '',
last_name: '',
@@ -62,6 +65,7 @@ function UserProvider(props: UserProviderProps) {
} catch (error) {
setUser({
auth: false,
+ auth_type: '',
fetched: true,
first_name: '',
last_name: '',
@@ -92,6 +96,7 @@ function UserProvider(props: UserProviderProps) {
const clearUserInfo = () => {
setUser({
auth: false,
+ auth_type: '',
fetched: false,
first_name: '',
last_name: '',
diff --git a/gregui/api/views/userinfo.py b/gregui/api/views/userinfo.py
index b2e17997..bba967c5 100644
--- a/gregui/api/views/userinfo.py
+++ b/gregui/api/views/userinfo.py
@@ -34,6 +34,10 @@ class UserInfoView(APIView):
user = request.user
invite_id = request.session.get("invite_id")
+ auth_type = "invite"
+ if "oidc_states" in request.session.keys():
+ auth_type = "oidc"
+
person = None
sponsor = None
content = {
@@ -41,6 +45,7 @@ class UserInfoView(APIView):
"sponsor_id": None,
"person_id": None,
"roles": [],
+ "auth_type": auth_type,
}
# Fetch sponsor and/or person object from profile of authenticated user
--
GitLab