Skip to content

SigNoz is an open-source, OpenTelemetry-native observability platform for your team and their AI agents. Get logs, metrics, and traces in one tool with features like APM, distributed tracing, log management, infra monitoring, etc. Combined with SigNoz MCP and a native AI teammate (in SigNoz Cloud) it helps you build more resilient apps.

chore(user): remove the deprecated user by id endpoints (#12474)

Vikrant Gupta2a2b393146e4
diff --git a/docs/api/openapi.yml b/docs/api/openapi.yml
index 0a4da46c32..16fda9f592 100644
--- a/docs/api/openapi.yml
+++ b/docs/api/openapi.yml
@@ -14468,177 +14468,6 @@ paths:
summary: List users
tags:
- users
- /api/v1/user/{id}:
- delete:
- deprecated: true
- description: This endpoint deletes the user by id
- operationId: DeleteUserDeprecated
- parameters:
- - in: path
- name: id
- required: true
- schema:
- type: string
- responses:
- "204":
- description: No Content
- "401":
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/RenderErrorResponse'
- description: Unauthorized
- "403":
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/RenderErrorResponse'
- description: Forbidden
- "404":
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/RenderErrorResponse'
- description: Not Found
- "500":
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/RenderErrorResponse'
- description: Internal Server Error
- security:
- - api_key:
- - ADMIN
- - tokenizer:
- - ADMIN
- summary: Delete user
- tags:
- - users
- get:
- deprecated: true
- description: This endpoint returns the user by id
- operationId: GetUserDeprecated
- parameters:
- - in: path
- name: id
- required: true
- schema:
- type: string
- responses:
- "200":
- content:
- application/json:
- schema:
- properties:
- data:
- $ref: '#/components/schemas/TypesDeprecatedUser'
- status:
- type: string
- required:
- - status
- - data
- type: object
- description: OK
- "401":
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/RenderErrorResponse'
- description: Unauthorized
- "403":
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/RenderErrorResponse'
- description: Forbidden
- "404":
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/RenderErrorResponse'
- description: Not Found
- "500":
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/RenderErrorResponse'
- description: Internal Server Error
- security:
- - api_key:
- - ADMIN
- - tokenizer:
- - ADMIN
- summary: Get user
- tags:
- - users
- put:
- deprecated: true
- description: This endpoint updates the user by id
- operationId: UpdateUserDeprecated
- parameters:
- - in: path
- name: id
- required: true
- schema:
- type: string
- requestBody:
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/TypesDeprecatedUser'
- responses:
- "200":
- content:
- application/json:
- schema:
- properties:
- data:
- $ref: '#/components/schemas/TypesDeprecatedUser'
- status:
- type: string
- required:
- - status
- - data
- type: object
- description: OK
- "400":
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/RenderErrorResponse'
- description: Bad Request
- "401":
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/RenderErrorResponse'
- description: Unauthorized
- "403":
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/RenderErrorResponse'
- description: Forbidden
- "404":
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/RenderErrorResponse'
- description: Not Found
- "500":
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/RenderErrorResponse'
- description: Internal Server Error
- security:
- - api_key:
- - ADMIN
- - tokenizer:
- - ADMIN
- summary: Update user
- tags:
- - users
/api/v1/user/me:
get:
deprecated: true
diff --git a/frontend/src/api/generated/services/sigNoz.schemas.ts b/frontend/src/api/generated/services/sigNoz.schemas.ts
index 25b893f0ab..99b05c9c3c 100644
--- a/frontend/src/api/generated/services/sigNoz.schemas.ts
+++ b/frontend/src/api/generated/services/sigNoz.schemas.ts
@@ -11201,31 +11201,6 @@ export type ListUsersDeprecated200 = {
status: string;
};
-export type DeleteUserDeprecatedPathParameters = {
- id: string;
-};
-export type GetUserDeprecatedPathParameters = {
- id: string;
-};
-export type GetUserDeprecated200 = {
- data: TypesDeprecatedUserDTO;
- /**
- * @type string
- */
- status: string;
-};
-
-export type UpdateUserDeprecatedPathParameters = {
- id: string;
-};
-export type UpdateUserDeprecated200 = {
- data: TypesDeprecatedUserDTO;
- /**
- * @type string
- */
- status: string;
-};
-
export type GetMyUserDeprecated200 = {
data: TypesDeprecatedUserDTO;
/**
diff --git a/frontend/src/api/generated/services/users/index.ts b/frontend/src/api/generated/services/users/index.ts
index 9b395e6a3c..cc5b692dbe 100644
--- a/frontend/src/api/generated/services/users/index.ts
+++ b/frontend/src/api/generated/services/users/index.ts
@@ -25,7 +25,6 @@ import type {
CreateResetPasswordTokenPathParameters,
CreateUser201,
CreateUserRole201,
- DeleteUserDeprecatedPathParameters,
DeleteUserPathParameters,
DeleteUserRolePathParameters,
GetMyUser200,
@@ -37,8 +36,6 @@ import type {
GetRolesByUserID200,
GetRolesByUserIDPathParameters,
GetUser200,
- GetUserDeprecated200,
- GetUserDeprecatedPathParameters,
GetUserPathParameters,
GetUserRole200,
GetUserRolePathParameters,
@@ -50,15 +47,12 @@ import type {
RenderErrorResponseDTO,
SetRoleByUserIDPathParameters,
TypesChangePasswordRequestDTO,
- TypesDeprecatedUserDTO,
TypesPostableForgotPasswordDTO,
TypesPostableInviteDTO,
TypesPostableResetPasswordDTO,
TypesPostableRoleDTO,
TypesPostableVerifyResetPasswordTokenDTO,
TypesUpdatableUserDTO,
- UpdateUserDeprecated200,
- UpdateUserDeprecatedPathParameters,
UpdateUserPathParameters,
} from '../sigNoz.schemas';
@@ -429,295 +423,6 @@ export const invalidateListUsersDeprecated = async (
return queryClient;
};
-/**
- * This endpoint deletes the user by id
- * @deprecated
- * @summary Delete user
- */
-export const deleteUserDeprecated = (
- { id }: DeleteUserDeprecatedPathParameters,
- signal?: AbortSignal,
-) => {
- return GeneratedAPIInstance<void>({
- url: `/api/v1/user/${id}`,
- method: 'DELETE',
- signal,
- });
-};
-
-export const getDeleteUserDeprecatedMutationOptions = <
- TError = ErrorType<RenderErrorResponseDTO>,
- TContext = unknown,
->(options?: {
- mutation?: UseMutationOptions<
- Awaited<ReturnType<typeof deleteUserDeprecated>>,
- TError,
- { pathParams: DeleteUserDeprecatedPathParameters },
- TContext
- >;
-}): UseMutationOptions<
- Awaited<ReturnType<typeof deleteUserDeprecated>>,
- TError,
- { pathParams: DeleteUserDeprecatedPathParameters },
- TContext
-> => {
- const mutationKey = ['deleteUserDeprecated'];
- const { mutation: mutationOptions } = options
- ? options.mutation &&
- 'mutationKey' in options.mutation &&
- options.mutation.mutationKey
- ? options
- : { ...options, mutation: { ...options.mutation, mutationKey } }
- : { mutation: { mutationKey } };
-
- const mutationFn: MutationFunction<
- Awaited<ReturnType<typeof deleteUserDeprecated>>,
- { pathParams: DeleteUserDeprecatedPathParameters }
- > = (props) => {
- const { pathParams } = props ?? {};
-
- return deleteUserDeprecated(pathParams);
- };
-
- return { mutationFn, ...mutationOptions };
-};
-
-export type DeleteUserDeprecatedMutationResult = NonNullable<
- Awaited<ReturnType<typeof deleteUserDeprecated>>
->;
-
-export type DeleteUserDeprecatedMutationError =
- ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @deprecated
- * @summary Delete user
- */
-export const useDeleteUserDeprecated = <
- TError = ErrorType<RenderErrorResponseDTO>,
- TContext = unknown,
->(options?: {
- mutation?: UseMutationOptions<
- Awaited<ReturnType<typeof deleteUserDeprecated>>,
- TError,
- { pathParams: DeleteUserDeprecatedPathParameters },
- TContext
- >;
-}): UseMutationResult<
- Awaited<ReturnType<typeof deleteUserDeprecated>>,
- TError,
- { pathParams: DeleteUserDeprecatedPathParameters },
- TContext
-> => {
- return useMutation(getDeleteUserDeprecatedMutationOptions(options));
-};
-/**
- * This endpoint returns the user by id
- * @deprecated
- * @summary Get user
- */
-export const getUserDeprecated = (
- { id }: GetUserDeprecatedPathParameters,
- signal?: AbortSignal,
-) => {
- return GeneratedAPIInstance<GetUserDeprecated200>({
- url: `/api/v1/user/${id}`,
- method: 'GET',
- signal,
- });
-};
-
-export const getGetUserDeprecatedQueryKey = ({
- id,
-}: GetUserDeprecatedPathParameters) => {
- return [`/api/v1/user/${id}`] as const;
-};
-
-export const getGetUserDeprecatedQueryOptions = <
- TData = Awaited<ReturnType<typeof getUserDeprecated>>,
- TError = ErrorType<RenderErrorResponseDTO>,
->(
- { id }: GetUserDeprecatedPathParameters,
- options?: {
- query?: UseQueryOptions<
- Awaited<ReturnType<typeof getUserDeprecated>>,
- TError,
- TData
- >;
- },
-) => {
- const { query: queryOptions } = options ?? {};
-
- const queryKey =
- queryOptions?.queryKey ?? getGetUserDeprecatedQueryKey({ id });
-
- const queryFn: QueryFunction<
- Awaited<ReturnType<typeof getUserDeprecated>>
- > = ({ signal }) => getUserDeprecated({ id }, signal);
-
- return {
- queryKey,
- queryFn,
- enabled: !!id,
- ...queryOptions,
- } as UseQueryOptions<
- Awaited<ReturnType<typeof getUserDeprecated>>,
- TError,
- TData
- > & { queryKey: QueryKey };
-};
-
-export type GetUserDeprecatedQueryResult = NonNullable<
- Awaited<ReturnType<typeof getUserDeprecated>>
->;
-export type GetUserDeprecatedQueryError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @deprecated
- * @summary Get user
- */
-
-export function useGetUserDeprecated<
- TData = Awaited<ReturnType<typeof getUserDeprecated>>,
- TError = ErrorType<RenderErrorResponseDTO>,
->(
- { id }: GetUserDeprecatedPathParameters,
- options?: {
- query?: UseQueryOptions<
- Awaited<ReturnType<typeof getUserDeprecated>>,
- TError,
- TData
- >;
- },
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
- const queryOptions = getGetUserDeprecatedQueryOptions({ id }, options);
-
- const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
- queryKey: QueryKey;
- };
-
- return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @deprecated
- * @summary Get user
- */
-export const invalidateGetUserDeprecated = async (
- queryClient: QueryClient,
- { id }: GetUserDeprecatedPathParameters,
- options?: InvalidateOptions,
-): Promise<QueryClient> => {
- await queryClient.invalidateQueries(
- { queryKey: getGetUserDeprecatedQueryKey({ id }) },
- options,
- );
-
- return queryClient;
-};
-
-/**
- * This endpoint updates the user by id
- * @deprecated
- * @summary Update user
- */
-export const updateUserDeprecated = (
- { id }: UpdateUserDeprecatedPathParameters,
- typesDeprecatedUserDTO?: BodyType<TypesDeprecatedUserDTO>,
- signal?: AbortSignal,
-) => {
- return GeneratedAPIInstance<UpdateUserDeprecated200>({
- url: `/api/v1/user/${id}`,
- method: 'PUT',
- headers: { 'Content-Type': 'application/json' },
- data: typesDeprecatedUserDTO,
- signal,
- });
-};
-
-export const getUpdateUserDeprecatedMutationOptions = <
- TError = ErrorType<RenderErrorResponseDTO>,
- TContext = unknown,
->(options?: {
- mutation?: UseMutationOptions<
- Awaited<ReturnType<typeof updateUserDeprecated>>,
- TError,
- {
- pathParams: UpdateUserDeprecatedPathParameters;
- data?: BodyType<TypesDeprecatedUserDTO>;
- },
- TContext
- >;
-}): UseMutationOptions<
- Awaited<ReturnType<typeof updateUserDeprecated>>,
- TError,
- {
- pathParams: UpdateUserDeprecatedPathParameters;
- data?: BodyType<TypesDeprecatedUserDTO>;
- },
- TContext
-> => {
- const mutationKey = ['updateUserDeprecated'];
- const { mutation: mutationOptions } = options
- ? options.mutation &&
- 'mutationKey' in options.mutation &&
- options.mutation.mutationKey
- ? options
- : { ...options, mutation: { ...options.mutation, mutationKey } }
- : { mutation: { mutationKey } };
-
- const mutationFn: MutationFunction<
- Awaited<ReturnType<typeof updateUserDeprecated>>,
- {
- pathParams: UpdateUserDeprecatedPathParameters;
- data?: BodyType<TypesDeprecatedUserDTO>;
- }
- > = (props) => {
- const { pathParams, data } = props ?? {};
-
- return updateUserDeprecated(pathParams, data);
- };
-
- return { mutationFn, ...mutationOptions };
-};
-
-export type UpdateUserDeprecatedMutationResult = NonNullable<
- Awaited<ReturnType<typeof updateUserDeprecated>>
->;
-export type UpdateUserDeprecatedMutationBody =
- | BodyType<TypesDeprecatedUserDTO>
- | undefined;
-export type UpdateUserDeprecatedMutationError =
- ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @deprecated
- * @summary Update user
- */
-export const useUpdateUserDeprecated = <
- TError = ErrorType<RenderErrorResponseDTO>,
- TContext = unknown,
->(options?: {
- mutation?: UseMutationOptions<
- Awaited<ReturnType<typeof updateUserDeprecated>>,
- TError,
- {
- pathParams: UpdateUserDeprecatedPathParameters;
- data?: BodyType<TypesDeprecatedUserDTO>;
- },
- TContext
- >;
-}): UseMutationResult<
- Awaited<ReturnType<typeof updateUserDeprecated>>,
- TError,
- {
- pathParams: UpdateUserDeprecatedPathParameters;
- data?: BodyType<TypesDeprecatedUserDTO>;
- },
- TContext
-> => {
- return useMutation(getUpdateUserDeprecatedMutationOptions(options));
-};
/**
* This endpoint returns the user I belong to
* @deprecated
diff --git a/frontend/src/mocks-server/handlers.ts b/frontend/src/mocks-server/handlers.ts
index 1239f0eea6..06131155fb 100644
--- a/frontend/src/mocks-server/handlers.ts
+++ b/frontend/src/mocks-server/handlers.ts
@@ -194,14 +194,6 @@ export const handlers = [
}),
),
),
- rest.put('http://localhost/api/v1/user/:id', (_, res, ctx) =>
- res(
- ctx.status(200),
- ctx.json({
- data: 'user updated successfully',
- }),
- ),
- ),
rest.get(
'http://localhost/api/v3/autocomplete/aggregate_attributes',
(req, res, ctx) =>
diff --git a/pkg/apiserver/signozapiserver/user.go b/pkg/apiserver/signozapiserver/user.go
index 0cd719e35c..8b16024ca9 100644
--- a/pkg/apiserver/signozapiserver/user.go
+++ b/pkg/apiserver/signozapiserver/user.go
@@ -129,23 +129,6 @@ func (provider *provider) addUserRoutes(router *mux.Router) error {
return err
}
- if err := router.Handle("/api/v1/user/{id}", handler.New(provider.authzMiddleware.SelfAccess(provider.userHandler.GetUserDeprecated), handler.OpenAPIDef{
- ID: "GetUserDeprecated",
- Tags: []string{"users"},
- Summary: "Get user",
- Description: "This endpoint returns the user by id",
- Request: nil,
- RequestContentType: "",
- Response: new(types.DeprecatedUser),
- ResponseContentType: "application/json",
- SuccessStatusCode: http.StatusOK,
- ErrorStatusCodes: []int{http.StatusNotFound},
- Deprecated: true,
- SecuritySchemes: newSecuritySchemes(types.RoleAdmin),
- })).Methods(http.MethodGet).GetError(); err != nil {
- return err
- }
-
if err := router.Handle("/api/v2/users/{id}", handler.New(provider.authzMiddleware.AdminAccess(provider.userHandler.GetUser), handler.OpenAPIDef{
ID: "GetUser",
Tags: []string{"users"},
@@ -163,23 +146,6 @@ func (provider *provider) addUserRoutes(router *mux.Router) error {
return err
}
- if err := router.Handle("/api/v1/user/{id}", handler.New(provider.authzMiddleware.SelfAccess(provider.userHandler.UpdateUserDeprecated), handler.OpenAPIDef{
- ID: "UpdateUserDeprecated",
- Tags: []string{"users"},
- Summary: "Update user",
- Description: "This endpoint updates the user by id",
- Request: new(types.DeprecatedUser),
- RequestContentType: "application/json",
- Response: new(types.DeprecatedUser),
- ResponseContentType: "application/json",
- SuccessStatusCode: http.StatusOK,
- ErrorStatusCodes: []int{http.StatusBadRequest, http.StatusNotFound},
- Deprecated: true,
- SecuritySchemes: newSecuritySchemes(types.RoleAdmin),
- })).Methods(http.MethodPut).GetError(); err != nil {
- return err
- }
-
if err := router.Handle("/api/v2/users/{id}", handler.New(provider.authzMiddleware.AdminAccess(provider.userHandler.UpdateUser), handler.OpenAPIDef{
ID: "UpdateUser",
Tags: []string{"users"},
@@ -197,23 +163,6 @@ func (provider *provider) addUserRoutes(router *mux.Router) error {
return err
}
- if err := router.Handle("/api/v1/user/{id}", handler.New(provider.authzMiddleware.AdminAccess(provider.userHandler.DeleteUser), handler.OpenAPIDef{
- ID: "DeleteUserDeprecated",
- Tags: []string{"users"},
- Summary: "Delete user",
- Description: "This endpoint deletes the user by id",
- Request: nil,
- RequestContentType: "",
- Response: nil,
- ResponseContentType: "",
- SuccessStatusCode: http.StatusNoContent,
- ErrorStatusCodes: []int{http.StatusNotFound},
- Deprecated: true,
- SecuritySchemes: newSecuritySchemes(types.RoleAdmin),
- })).Methods(http.MethodDelete).GetError(); err != nil {
- return err
- }
-
if err := router.Handle("/api/v2/users/{id}", handler.New(provider.authzMiddleware.AdminAccess(provider.userHandler.DeleteUser), handler.OpenAPIDef{
ID: "DeleteUser",
Tags: []string{"users"},
diff --git a/pkg/http/middleware/authz.go b/pkg/http/middleware/authz.go
index dd747ccb1f..b9952f9517 100644
--- a/pkg/http/middleware/authz.go
+++ b/pkg/http/middleware/authz.go
@@ -14,7 +14,6 @@ import (
"github.com/SigNoz/signoz/pkg/types/authtypes"
"github.com/SigNoz/signoz/pkg/types/coretypes"
"github.com/SigNoz/signoz/pkg/valuer"
- "github.com/gorilla/mux"
)
const (
@@ -151,40 +150,6 @@ func (middleware *AuthZ) AdminAccess(next http.HandlerFunc) http.HandlerFunc {
})
}
-func (middleware *AuthZ) SelfAccess(next http.HandlerFunc) http.HandlerFunc {
- return http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
- claims, err := authtypes.ClaimsFromContext(req.Context())
- if err != nil {
- render.Error(rw, err)
- return
- }
-
- selectors := []coretypes.Selector{
- coretypes.TypeRole.MustSelector(authtypes.SigNozAdminRoleName),
- }
-
- err = middleware.authzService.CheckWithTupleCreation(
- req.Context(),
- claims,
- valuer.MustNewUUID(claims.OrgID),
- authtypes.Relation{Verb: coretypes.VerbAssignee},
- coretypes.NewResourceRole(),
- selectors,
- selectors,
- )
-
- if err != nil {
- id := mux.Vars(req)["id"]
- if err := claims.IsSelfAccess(id); err != nil {
- middleware.logger.WarnContext(req.Context(), authzDeniedMessage, slog.Any("claims", claims))
- render.Error(rw, err)
- return
- }
- }
- next(rw, req)
- })
-}
-
func (middleware *AuthZ) OpenAccess(next http.HandlerFunc) http.HandlerFunc {
return http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
next(rw, req)
diff --git a/pkg/modules/user/impluser/handler.go b/pkg/modules/user/impluser/handler.go
index 1c1453b5cc..ec6d061a18 100644
--- a/pkg/modules/user/impluser/handler.go
+++ b/pkg/modules/user/impluser/handler.go
@@ -88,27 +88,6 @@ func (handler *handler) CreateInvite(rw http.ResponseWriter, r *http.Request) {
render.Success(rw, http.StatusCreated, invites[0])
}
-func (handler *handler) GetUserDeprecated(w http.ResponseWriter, r *http.Request) {
- ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
- defer cancel()
-
- id := mux.Vars(r)["id"]
-
- claims, err := authtypes.ClaimsFromContext(ctx)
- if err != nil {
- render.Error(w, err)
- return
- }
-
- user, err := handler.getter.GetDeprecatedUserByOrgIDAndID(ctx, valuer.MustNewUUID(claims.OrgID), valuer.MustNewUUID(id))
- if err != nil {
- render.Error(w, err)
- return
- }
-
- render.Success(w, http.StatusOK, user)
-}
-
func (handler *handler) GetUser(w http.ResponseWriter, r *http.Request) {
ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
defer cancel()
@@ -253,33 +232,6 @@ func (handler *handler) ListUsers(w http.ResponseWriter, r *http.Request) {
render.Success(w, http.StatusOK, users)
}
-func (handler *handler) UpdateUserDeprecated(w http.ResponseWriter, r *http.Request) {
- ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
- defer cancel()
-
- id := mux.Vars(r)["id"]
-
- claims, err := authtypes.ClaimsFromContext(ctx)
- if err != nil {
- render.Error(w, err)
- return
- }
-
- user := types.DeprecatedUser{User: &types.User{}}
- if err := json.NewDecoder(r.Body).Decode(&user); err != nil {
- render.Error(w, err)
- return
- }
-
- updatedUser, err := handler.setter.UpdateUserDeprecated(ctx, valuer.MustNewUUID(claims.OrgID), id, &user)
- if err != nil {
- render.Error(w, err)
- return
- }
-
- render.Success(w, http.StatusOK, updatedUser)
-}
-
func (handler *handler) UpdateUser(w http.ResponseWriter, r *http.Request) {
ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
defer cancel()
diff --git a/pkg/modules/user/impluser/setter.go b/pkg/modules/user/impluser/setter.go
index 265a9aa47f..25d22cf434 100644
--- a/pkg/modules/user/impluser/setter.go
+++ b/pkg/modules/user/impluser/setter.go
@@ -276,92 +276,6 @@ func (module *setter) CreatePendingInviteUser(ctx context.Context, identityID va
return user, nil
}
-func (module *setter) UpdateUserDeprecated(ctx context.Context, orgID valuer.UUID, id string, user *types.DeprecatedUser) (*types.DeprecatedUser, error) {
- claims, err := authtypes.ClaimsFromContext(ctx)
- if err != nil {
- return nil, err
- }
-
- existingUser, err := module.getter.GetDeprecatedUserByOrgIDAndID(ctx, orgID, valuer.MustNewUUID(id))
- if err != nil {
- return nil, err
- }
-
- if err := existingUser.ErrIfRoot(); err != nil {
- return nil, errors.WithAdditionalf(err, "cannot update root user")
- }
-
- if err := existingUser.ErrIfDeleted(); err != nil {
- return nil, errors.WithAdditionalf(err, "cannot update deleted user")
- }
-
- roleChange := user.Role != "" && user.Role != existingUser.Role
-
- if roleChange {
- selectors := []coretypes.Selector{
- coretypes.TypeRole.MustSelector(authtypes.SigNozAdminRoleName),
- }
- err = module.authz.CheckWithTupleCreation(
- ctx,
- claims,
- valuer.MustNewUUID(claims.OrgID),
- authtypes.Relation{Verb: coretypes.VerbAssignee},
- coretypes.NewResourceRole(),
- selectors,
- selectors,
- )
-
- if err != nil {
- return nil, errors.New(errors.TypeForbidden, errors.CodeForbidden, "only admins can change roles")
- }
- }
-
- // make sure the user is not demoting self from admin
- if roleChange && existingUser.ID == valuer.MustNewUUID(claims.IdentityID()) && existingUser.Role == types.RoleAdmin && user.Role != types.RoleAdmin {
- return nil, errors.New(errors.TypeForbidden, errors.CodeForbidden, "cannot change self role")
- }
-
- if roleChange {
- err = module.authz.ModifyGrant(ctx,
- orgID,
- []string{authtypes.MustGetSigNozManagedRoleFromExistingRole(existingUser.Role)},
- []string{authtypes.MustGetSigNozManagedRoleFromExistingRole(user.Role)},
- authtypes.MustNewSubject(coretypes.NewResourceUser(), id, orgID, nil),
- )
- if err != nil {
- return nil, err
- }
- }
-
- existingUser.Update(user.DisplayName, user.Role)
-
- // update the user - idempotent (this does analytics too so keeping it outside txn)
- if err := module.UpdateAnyUserDeprecated(ctx, orgID, existingUser); err != nil {
- return nil, err
- }
-
- err = module.store.RunInTx(ctx, func(ctx context.Context) error {
- if roleChange {
- // delete old role entries and create new ones
- if err := module.userRoleStore.DeleteUserRoles(ctx, existingUser.ID); err != nil {
- return err
- }
-
- // create new ones
- if err := module.createUserRoleEntries(ctx, existingUser.OrgID, existingUser.ID, []string{authtypes.MustGetSigNozManagedRoleFromExistingRole(user.Role)}); err != nil {
- return err
- }
- }
-
- return nil
- })
- if err != nil {
- return nil, err
- }
-
- return existingUser, nil
-}
-
func (module *setter) UpdateUser(ctx context.Context, orgID valuer.UUID, userID valuer.UUID, updatable *types.UpdatableUser) (*types.User, error) {
existingUser, err := module.getter.GetUserByOrgIDAndID(ctx, orgID, userID)
if err != nil {
@@ -401,23 +315,6 @@ func (module *setter) UpdateAnyUser(ctx context.Context, orgID valuer.UUID, user
return nil
}
-func (module *setter) UpdateAnyUserDeprecated(ctx context.Context, orgID valuer.UUID, deprecateUser *types.DeprecatedUser) error {
- user := types.NewUserFromDeprecatedUser(deprecateUser)
- if err := module.store.UpdateUser(ctx, orgID, user); err != nil {
- return err
- }
-
- traits := types.NewTraitsFromDeprecatedUser(deprecateUser)
- module.analytics.IdentifyUser(ctx, user.OrgID.String(), user.ID.String(), traits)
- module.analytics.TrackUser(ctx, user.OrgID.String(), user.ID.String(), "User Updated", traits)
-
- if err := module.tokenizer.DeleteIdentity(ctx, user.ID); err != nil {
- return err
- }
-
- return nil
-}
-
func (module *setter) DeleteUser(ctx context.Context, orgID valuer.UUID, id string, deletedBy string) error {
user, err := module.store.GetUser(ctx, valuer.MustNewUUID(id))
if err != nil {
diff --git a/pkg/modules/user/user.go b/pkg/modules/user/user.go
index 9285ade464..7ff6af5da9 100644
--- a/pkg/modules/user/user.go
+++ b/pkg/modules/user/user.go
@@ -34,11 +34,9 @@ type Setter interface {
// Initiate forgot password flow for a user
ForgotPassword(ctx context.Context, orgID valuer.UUID, email valuer.Email, frontendBaseURL string) error
- UpdateUserDeprecated(ctx context.Context, orgID valuer.UUID, id string, user *types.DeprecatedUser) (*types.DeprecatedUser, error)
UpdateUser(ctx context.Context, orgID valuer.UUID, userID valuer.UUID, updatable *types.UpdatableUser) (*types.User, error)
// UpdateAnyUser updates a user and persists the changes to the database along with the analytics and identity deletion.
- UpdateAnyUserDeprecated(ctx context.Context, orgID valuer.UUID, deprecateUser *types.DeprecatedUser) error
UpdateAnyUser(ctx context.Context, orgID valuer.UUID, user *types.User) error
DeleteUser(ctx context.Context, orgID valuer.UUID, id string, deletedBy string) error
@@ -114,10 +112,8 @@ type Handler interface {
ListUsersDeprecated(http.ResponseWriter, *http.Request)
ListUsers(http.ResponseWriter, *http.Request)
CreateUser(http.ResponseWriter, *http.Request)
- UpdateUserDeprecated(http.ResponseWriter, *http.Request)
UpdateUser(http.ResponseWriter, *http.Request)
DeleteUser(http.ResponseWriter, *http.Request)
- GetUserDeprecated(http.ResponseWriter, *http.Request)
GetUser(http.ResponseWriter, *http.Request)
GetMyUserDeprecated(http.ResponseWriter, *http.Request)
GetMyUser(http.ResponseWriter, *http.Request)
diff --git a/pkg/types/authtypes/claims.go b/pkg/types/authtypes/claims.go
index 18d0ebf73e..8add09f493 100644
--- a/pkg/types/authtypes/claims.go
+++ b/pkg/types/authtypes/claims.go
@@ -72,14 +72,6 @@ func (c *Claims) LogValue() slog.Value {
)
}
-func (c *Claims) IsSelfAccess(id string) error {
- if c.UserID == id {
- return nil
- }
-
- return errors.NewForbiddenf(errors.CodeForbidden, "only the user/admin can access their own resource")
-}
-
func (c *Claims) IdentityID() string {
if c.Principal == PrincipalUser {
return c.UserID
diff --git a/pkg/types/user.go b/pkg/types/user.go
index 0e8c22d3c4..00c9e26474 100644
--- a/pkg/types/user.go
+++ b/pkg/types/user.go
@@ -128,18 +128,6 @@ func NewDeprecatedUserFromUserAndRole(user *User, role Role) *DeprecatedUser {
}
}
-func NewUserFromDeprecatedUser(deprecatedUser *DeprecatedUser) *User {
- return &User{
- Identifiable: deprecatedUser.Identifiable,
- DisplayName: deprecatedUser.DisplayName,
- Email: deprecatedUser.Email,
- OrgID: deprecatedUser.OrgID,
- IsRoot: deprecatedUser.IsRoot,
- Status: deprecatedUser.Status,
- TimeAuditable: deprecatedUser.TimeAuditable,
- }
-}
-
// Update applies mutable fields from the input to the user. Immutable fields
// (email, is_root, org_id, id) are preserved. Only non-zero input fields are applied.
func (u *User) Update(displayName string) {
@@ -149,16 +137,6 @@ func (u *User) Update(displayName string) {
u.UpdatedAt = time.Now()
}
-func (u *DeprecatedUser) Update(displayName string, role Role) {
- if displayName != "" {
- u.DisplayName = displayName
- }
- if role != "" {
- u.Role = role
- }
- u.UpdatedAt = time.Now()
-}
-
func (u *User) UpdateStatus(status valuer.String) error {
// no updates allowed if user is in delete state
if err := u.ErrIfDeleted(); err != nil {
@@ -234,17 +212,6 @@ func NewTraitsFromUser(user *User) map[string]any {
}
}
-func NewTraitsFromDeprecatedUser(user *DeprecatedUser) map[string]any {
- return map[string]any{
- "name": user.DisplayName,
- "role": user.Role,
- "email": user.Email.String(),
- "display_name": user.DisplayName,
- "status": user.Status,
- "created_at": user.CreatedAt,
- }
-}
-
func (request *PostableRegisterOrgAndAdmin) UnmarshalJSON(data []byte) error {
type Alias PostableRegisterOrgAndAdmin
diff --git a/tests/integration/tests/callbackauthn/02_saml.py b/tests/integration/tests/callbackauthn/02_saml.py
index fca49bea5d..492cbd7378 100644
--- a/tests/integration/tests/callbackauthn/02_saml.py
+++ b/tests/integration/tests/callbackauthn/02_saml.py
@@ -566,7 +566,7 @@ def test_saml_sso_deleted_user_gets_new_user_on_login(
# --- Step 2: Soft delete via DB using API
response = requests.delete(
- signoz.self.host_configs["8080"].get(f"/api/v1/user/{user_id}"),
+ signoz.self.host_configs["8080"].get(f"/api/v2/users/{user_id}"),
headers={"Authorization": f"Bearer {admin_token}"},
timeout=2,
)
diff --git a/tests/integration/tests/passwordauthn/01_register.py b/tests/integration/tests/passwordauthn/01_register.py
index cc03af7733..0f97f234d8 100644
--- a/tests/integration/tests/passwordauthn/01_register.py
+++ b/tests/integration/tests/passwordauthn/01_register.py
@@ -141,7 +141,7 @@ def test_revoke_invite(signoz: types.SigNoz, get_token: Callable[[str, str], str
# Delete the pending invite user (revoke the invite)
response = requests.delete(
- signoz.self.host_configs["8080"].get(f"/api/v1/user/{invited_user['id']}"),
+ signoz.self.host_configs["8080"].get(f"/api/v2/users/{invited_user['id']}"),
timeout=2,
headers={"Authorization": f"Bearer {admin_token}"},
)
diff --git a/tests/integration/tests/passwordauthn/06_invite_status.py b/tests/integration/tests/passwordauthn/06_invite_status.py
index 6da9bc8b64..a8c87df2a7 100644
--- a/tests/integration/tests/passwordauthn/06_invite_status.py
+++ b/tests/integration/tests/passwordauthn/06_invite_status.py
@@ -51,7 +51,7 @@ def test_reinvite_deleted_user(
# call the delete api which now soft deletes the user
response = requests.delete(
- signoz.self.host_configs["8080"].get(f"/api/v1/user/{invited_user['id']}"),
+ signoz.self.host_configs["8080"].get(f"/api/v2/users/{invited_user['id']}"),
headers={"Authorization": f"Bearer {admin_token}"},
timeout=2,
)
@@ -123,7 +123,7 @@ def test_delete_user(
# delete the user
response = requests.delete(
- signoz.self.host_configs["8080"].get(f"/api/v1/user/{user_id}"),
+ signoz.self.host_configs["8080"].get(f"/api/v2/users/{user_id}"),
headers={"Authorization": f"Bearer {admin_token}"},
timeout=5,
)
diff --git a/tests/integration/tests/passwordauthn/07_user_unique_index.py b/tests/integration/tests/passwordauthn/07_user_unique_index.py
index 7d0cdf0c1e..6671e1d1b3 100644
--- a/tests/integration/tests/passwordauthn/07_user_unique_index.py
+++ b/tests/integration/tests/passwordauthn/07_user_unique_index.py
@@ -54,7 +54,7 @@ def test_unique_index_allows_multiple_deleted_rows(
first_user_id = resp.json()["data"]["id"]
resp = requests.delete(
- signoz.self.host_configs["8080"].get(f"/api/v1/user/{first_user_id}"),
+ signoz.self.host_configs["8080"].get(f"/api/v2/users/{first_user_id}"),
headers={"Authorization": f"Bearer {admin_token}"},
timeout=2,
)
@@ -76,7 +76,7 @@ def test_unique_index_allows_multiple_deleted_rows(
assert second_user_id != first_user_id
resp = requests.delete(
- signoz.self.host_configs["8080"].get(f"/api/v1/user/{second_user_id}"),
+ signoz.self.host_configs["8080"].get(f"/api/v2/users/{second_user_id}"),
headers={"Authorization": f"Bearer {admin_token}"},
timeout=2,
)