mirrors/netbird-dashboard
1
0
Fork 0
mirror of https://github.com/netbirdio/dashboard.git synced 2026-01-26 01:21:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fetch userID from user list and not oidc by default (#161)

Browse Source
This commit is contained in:
pascal-fischer
2023-04-03 16:52:42 +02:00
committed by GitHub
parent dff0313f82
commit 444e9ec44a
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/Settings.tsx
View File

@@ -49,7 +49,7 @@ export const Settings = () => {
useEffect(() => {
if(users && oidcUser) {
let currentUser = users.find((user) => user.id === oidcUser.sub)
let currentUser = users.find((user) => user.is_current)
if(currentUser) {
setIsAdmin(currentUser.role === 'admin');
}

12
src/views/SettingsPersonal.tsx
View File

@@ -110,11 +110,12 @@ export const SettingsPersonal = () => {
useEffect(() => {
if(oidcUser) {
let currentUserId = users.find((user) => user.is_current) ? users.find((user) => user.is_current)?.id : oidcUser.sub;
dispatch(personalAccessTokenActions.getPersonalAccessTokens.request({
getAccessTokenSilently: getTokenSilently,
payload: oidcUser.sub}));
payload: currentUserId}));
}
}, [oidcUser])
}, [oidcUser, users])
useEffect(() => {
dispatch(userActions.getUsers.request({getAccessTokenSilently: getTokenSilently, payload: null}));
@@ -218,10 +219,11 @@ export const SettingsPersonal = () => {
<Paragraph>Are you sure you want to delete this token?</Paragraph>
</Space>,
onOk() {
let currentUserId = users.find((user) => user.is_current) ? users.find((user) => user.is_current)?.id : oidcUser.sub;
dispatch(personalAccessTokenActions.deletePersonalAccessToken.request({
getAccessTokenSilently: getTokenSilently,
payload: {
user_id: oidcUser.sub,
user_id: currentUserId,
id: personalAccessTokenToDelete ? personalAccessTokenToDelete.id : null,
name: personalAccessTokenToDelete ? personalAccessTokenToDelete.name : null,
} as SpecificPAT
@@ -265,9 +267,9 @@ export const SettingsPersonal = () => {
}
const createPersonalAccessTokenToSave = (): PersonalAccessTokenCreate => {
console.log(formPersonalAccessToken.name)
let currentUserId = users.find((user) => user.is_current) ? users.find((user) => user.is_current)?.id : oidcUser.sub;
return {
user_id: oidcUser.sub,
user_id: currentUserId,
name: formPersonalAccessToken.name,
expires_in: formPersonalAccessToken.expires_in,
} as PersonalAccessTokenCreate