diff --git a/pkg/server/connect_interceptors/authorization.go b/pkg/server/connect_interceptors/authorization.go index 611bd094d..43e782c36 100644 --- a/pkg/server/connect_interceptors/authorization.go +++ b/pkg/server/connect_interceptors/authorization.go @@ -995,6 +995,10 @@ var authorizationValidationMap = map[string]func(ctx context.Context, handler *v pbReq := req.(*connect.Request[frontierv1beta1.SearchOrganizationInvoicesRequest]) return handler.IsAuthorized(ctx, relation.Object{Namespace: schema.OrganizationNamespace, ID: pbReq.Msg.GetId()}, schema.UpdatePermission, req) }, + "/raystack.frontier.v1beta1.FrontierService/SearchOrganizationTokens": func(ctx context.Context, handler *v1beta1connect.ConnectHandler, req connect.AnyRequest) error { + pbReq := req.(*connect.Request[frontierv1beta1.SearchOrganizationTokensRequest]) + return handler.IsAuthorized(ctx, relation.Object{Namespace: schema.OrganizationNamespace, ID: pbReq.Msg.GetId()}, schema.UpdatePermission, req) + }, "/raystack.frontier.v1beta1.FrontierService/GetUpcomingInvoice": func(ctx context.Context, handler *v1beta1connect.ConnectHandler, req connect.AnyRequest) error { pbReq := req.(*connect.Request[frontierv1beta1.GetUpcomingInvoiceRequest]) return handler.IsAuthorized(ctx, relation.Object{Namespace: schema.OrganizationNamespace, ID: pbReq.Msg.GetOrgId()}, schema.UpdatePermission, req) @@ -1028,9 +1032,6 @@ var authorizationValidationMap = map[string]func(ctx context.Context, handler *v "/raystack.frontier.v1beta1.AdminService/SearchProjectUsers": func(ctx context.Context, handler *v1beta1connect.ConnectHandler, req connect.AnyRequest) error { return handler.IsSuperUser(ctx, req) }, - "/raystack.frontier.v1beta1.AdminService/SearchOrganizationTokens": func(ctx context.Context, handler *v1beta1connect.ConnectHandler, req connect.AnyRequest) error { - return handler.IsSuperUser(ctx, req) - }, "/raystack.frontier.v1beta1.AdminService/SearchOrganizationPATs": func(ctx context.Context, handler *v1beta1connect.ConnectHandler, req connect.AnyRequest) error { return handler.IsSuperUser(ctx, req) }, diff --git a/web/apps/admin/package.json b/web/apps/admin/package.json index 1a320f152..711be9ecf 100644 --- a/web/apps/admin/package.json +++ b/web/apps/admin/package.json @@ -19,7 +19,7 @@ "@radix-ui/react-icons": "^1.3.0", "@raystack/apsara": "0.56.6", "@raystack/frontier": "workspace:^", - "@raystack/proton": "0.1.0-432d98ce56451cd9461a755d8db4842ec4354669", + "@raystack/proton": "0.1.0-3b6b44c18601494a2e8201f26cbf9c8335f0f0ea", "@stitches/react": "^1.2.8", "@tanstack/react-query": "^5.90.2", "@tanstack/react-query-devtools": "^5.90.2", diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 075d7ca24..72ee1be25 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -61,8 +61,8 @@ importers: specifier: workspace:^ version: link:../../sdk '@raystack/proton': - specifier: 0.1.0-432d98ce56451cd9461a755d8db4842ec4354669 - version: 0.1.0-432d98ce56451cd9461a755d8db4842ec4354669(@tanstack/query-core@5.90.20)(@tanstack/react-query@5.90.21(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + specifier: 0.1.0-3b6b44c18601494a2e8201f26cbf9c8335f0f0ea + version: 0.1.0-3b6b44c18601494a2e8201f26cbf9c8335f0f0ea(@tanstack/query-core@5.90.20)(@tanstack/react-query@5.90.21(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4) '@stitches/react': specifier: ^1.2.8 version: 1.2.8(react@19.2.4) @@ -228,8 +228,8 @@ importers: specifier: npm:@raystack/apsara@1.0.0-rc.2 version: '@raystack/apsara@1.0.0-rc.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)' '@raystack/proton': - specifier: 0.1.0-432d98ce56451cd9461a755d8db4842ec4354669 - version: 0.1.0-432d98ce56451cd9461a755d8db4842ec4354669(@tanstack/query-core@5.90.20)(@tanstack/react-query@5.90.21(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + specifier: 0.1.0-3b6b44c18601494a2e8201f26cbf9c8335f0f0ea + version: 0.1.0-3b6b44c18601494a2e8201f26cbf9c8335f0f0ea(@tanstack/query-core@5.90.20)(@tanstack/react-query@5.90.21(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4) '@tanstack/react-query': specifier: ^5.90.2 version: 5.90.21(react@19.2.4) @@ -2234,8 +2234,8 @@ packages: '@types/react': optional: true - '@raystack/proton@0.1.0-432d98ce56451cd9461a755d8db4842ec4354669': - resolution: {integrity: sha512-IDGmiUDxE/8joCGSUfgUSflUoqnM2GUyIgrwmqkSFseyXC463O5lpWPW8XRwh5KF392BbwokdtznMOymjTUaTw==} + '@raystack/proton@0.1.0-3b6b44c18601494a2e8201f26cbf9c8335f0f0ea': + resolution: {integrity: sha512-aoPnLJ/DwA72Fmd86J2cUqoOCHVFGedeQnyQrfBXmy0sp/Um3CDOhnki4g1huZhIo14faG6lO/N/UVcKq6b9QA==} peerDependencies: '@tanstack/react-query': ^5.0.0 peerDependenciesMeta: @@ -9542,7 +9542,7 @@ snapshots: transitivePeerDependencies: - '@types/react-dom' - '@raystack/proton@0.1.0-432d98ce56451cd9461a755d8db4842ec4354669(@tanstack/query-core@5.90.20)(@tanstack/react-query@5.90.21(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': + '@raystack/proton@0.1.0-3b6b44c18601494a2e8201f26cbf9c8335f0f0ea(@tanstack/query-core@5.90.20)(@tanstack/react-query@5.90.21(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': dependencies: '@bufbuild/protobuf': 2.11.0 '@connectrpc/connect': 2.1.1(@bufbuild/protobuf@2.11.0) diff --git a/web/sdk/admin/views/organizations/details/layout/add-tokens-dialog.tsx b/web/sdk/admin/views/organizations/details/layout/add-tokens-dialog.tsx index 0ba9cc1e7..99080704a 100644 --- a/web/sdk/admin/views/organizations/details/layout/add-tokens-dialog.tsx +++ b/web/sdk/admin/views/organizations/details/layout/add-tokens-dialog.tsx @@ -16,7 +16,7 @@ import { zodResolver } from "@hookform/resolvers/zod"; import { defaultConfig } from "../../../../utils/constants"; import { useMutation, createConnectQueryKey, useTransport } from "@connectrpc/connect-query"; import { useQueryClient } from "@tanstack/react-query"; -import { AdminServiceQueries, CheckoutProductBodySchema, DelegatedCheckoutRequestSchema } from "@raystack/proton/frontier"; +import { AdminServiceQueries, CheckoutProductBodySchema, DelegatedCheckoutRequestSchema, FrontierServiceQueries } from "@raystack/proton/frontier"; import { create } from "@bufbuild/protobuf"; interface InviteUsersDialogProps { @@ -58,7 +58,7 @@ export const AddTokensDialog = ({ onOpenChange }: InviteUsersDialogProps) => { onSuccess: () => { queryClient.invalidateQueries({ queryKey: createConnectQueryKey({ - schema: AdminServiceQueries.searchOrganizationTokens, + schema: FrontierServiceQueries.searchOrganizationTokens, transport, input: { id: organisationId }, cardinality: "infinite", diff --git a/web/sdk/admin/views/organizations/details/tokens/index.tsx b/web/sdk/admin/views/organizations/details/tokens/index.tsx index da2d523ec..5ec5786a4 100644 --- a/web/sdk/admin/views/organizations/details/tokens/index.tsx +++ b/web/sdk/admin/views/organizations/details/tokens/index.tsx @@ -6,7 +6,7 @@ import { ExclamationTriangleIcon } from "@radix-ui/react-icons"; import { useContext, useEffect, useMemo, useState } from "react"; import { OrganizationContext } from "../contexts/organization-context"; import { PageTitle } from "../../../../components/PageTitle"; -import { AdminServiceQueries } from "@raystack/proton/frontier"; +import { FrontierServiceQueries } from "@raystack/proton/frontier"; import { useInfiniteQuery } from "@connectrpc/connect-query"; import { getConnectNextPageParam, DEFAULT_PAGE_SIZE } from "../../../../utils/connect-pagination"; import { transformDataTableQueryToRQLRequest } from "../../../../utils/transform-query"; @@ -92,7 +92,7 @@ export function OrganizationTokensView() { hasNextPage, isError, } = useInfiniteQuery( - AdminServiceQueries.searchOrganizationTokens, + FrontierServiceQueries.searchOrganizationTokens, { id: organizationId, query: query }, { enabled: !!organizationId, diff --git a/web/sdk/package.json b/web/sdk/package.json index e5ca7a2f0..59a18e1f0 100644 --- a/web/sdk/package.json +++ b/web/sdk/package.json @@ -102,7 +102,7 @@ "@connectrpc/connect-web": "2.1.1", "@hookform/resolvers": "^3.10.0", "@raystack/apsara-v1": "npm:@raystack/apsara@1.0.0-rc.2", - "@raystack/proton": "0.1.0-432d98ce56451cd9461a755d8db4842ec4354669", + "@raystack/proton": "0.1.0-3b6b44c18601494a2e8201f26cbf9c8335f0f0ea", "@tanstack/react-query": "^5.90.2", "@tanstack/react-router": "^1.168.3", "axios": "^1.9.0",