Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-08 15:25:22 +02:00
Code Issues Releases Activity

refactor(auth): cache user data [EE-4935] (#8380)

Browse source
This commit is contained in:
Chaim Lev-Ari 2023-01-26 07:40:05 +05:30 • committed by GitHub
parent a748e15c16
commit 00bbf4ac63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 59 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/portainer/services/api/userService.js
View file

@ -1,6 +1,8 @@
import _ from 'lodash-es';
import { UserTokenModel, UserViewModel } from '@/portainer/models/user';
import { getUser, getUsers } from '@/portainer/users/user.service';
import { getUsers } from '@/portainer/users/user.service';
import { getUser } from '@/portainer/users/queries/useUser';
import { TeamMembershipModel } from '../../models/teamMembership';
@ -15,8 +17,8 @@ export function UserService($q, Users, TeamService, TeamMembershipService) {
return users.map((u) => new UserViewModel(u));
};
service.user = async function (includeAdministrators) {
const user = await getUser(includeAdministrators);
service.user = async function (userId) {
const user = await getUser(userId);
return new UserViewModel(user);
};

27
app/portainer/users/queries/useUser.ts Normal file
View file

@ -0,0 +1,27 @@
import { useQuery } from 'react-query';
import axios, { parseAxiosError } from '@/portainer/services/axios';
import { withError } from '@/react-tools/react-query';
import { buildUrl } from '../user.service';
import { User, UserId } from '../types';
export function useUser(
id: UserId,
{ staleTime }: { staleTime?: number } = {}
) {
return useQuery(['users', id], () => getUser(id), {
...withError('Unable to retrieve user details'),
staleTime,
});
}
export async function getUser(id: UserId) {
try {
const { data: user } = await axios.get<User>(buildUrl(id));
return user;
} catch (e) {
throw parseAxiosError(e as Error, 'Unable to retrieve user details');
}
}

12
app/portainer/users/user.service.ts
View file

@ -19,16 +19,6 @@ export async function getUsers(
}
}
export async function getUser(id: UserId) {
try {
const { data: user } = await axios.get<User>(buildUrl(id));
return user;
} catch (e) {
throw parseAxiosError(e as Error, 'Unable to retrieve user details');
}
}
export async function getUserMemberships(id: UserId) {
try {
const { data } = await axios.get<TeamMembership[]>(
@ -40,7 +30,7 @@ export async function getUserMemberships(id: UserId) {
}
}
function buildUrl(id?: UserId, entity?: string) {
export function buildUrl(id?: UserId, entity?: string) {
let url = '/users';
if (id) {