Skip to content

refactor: move SearchOrganizationTokens to FrontierService #1564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rohilsurana merged 4 commits into from
Apr 24, 2026
Merged

refactor: move SearchOrganizationTokens to FrontierService #1564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
16c3f49
refactor: move SearchOrganizationTokens to FrontierService
paanSinghCoder Apr 22, 2026
277e4e7
chore: bump @raystack/proton and PROTON_COMMIT to main (#482)
paanSinghCoder Apr 22, 2026
fb0ace5
Merge branch 'main' into refactor/search-org-tokens-to-frontier-service
paanSinghCoder Apr 22, 2026
c0e134a
Merge branch 'main' into refactor/search-org-tokens-to-frontier-service
paanSinghCoder Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pkg/server/connect_interceptors/authorization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
},
Expand Down
2 changes: 1 addition & 1 deletion web/apps/admin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions web/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions web/sdk/admin/views/organizations/details/layout/add-tokens-dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions web/sdk/admin/views/organizations/details/tokens/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -92,7 +92,7 @@ export function OrganizationTokensView() {
hasNextPage,
isError,
} = useInfiniteQuery(
AdminServiceQueries.searchOrganizationTokens,
FrontierServiceQueries.searchOrganizationTokens,
{ id: organizationId, query: query },
{
enabled: !!organizationId,
Expand Down
2 changes: 1 addition & 1 deletion web/sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading