From bdc0c4f72c8dde49f7d61c3432e998a1cb832ea9 Mon Sep 17 00:00:00 2001 From: TheCactusBlue Date: Tue, 25 Mar 2025 13:43:04 -0700 Subject: [PATCH] fix typeerr --- .../apps/implementations/admin-app-impl.ts | 38 +++++++++---------- .../apps/implementations/server-app-impl.ts | 6 +-- .../stack-app/apps/interfaces/admin-app.ts | 10 ++--- packages/template/src/lib/stack-app/index.ts | 8 ++-- .../src/lib/stack-app/permissions/index.ts | 14 +++---- 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/packages/template/src/lib/stack-app/apps/implementations/admin-app-impl.ts b/packages/template/src/lib/stack-app/apps/implementations/admin-app-impl.ts index f28ebbee3..8cf699af8 100644 --- a/packages/template/src/lib/stack-app/apps/implementations/admin-app-impl.ts +++ b/packages/template/src/lib/stack-app/apps/implementations/admin-app-impl.ts @@ -12,7 +12,7 @@ import { AdminSentEmail } from "../.."; import { ApiKey, ApiKeyBase, ApiKeyBaseCrudRead, ApiKeyCreateOptions, ApiKeyFirstView, apiKeyCreateOptionsToCrud } from "../../api-keys"; import { EmailConfig, stackAppInternalsSymbol } from "../../common"; import { AdminEmailTemplate, AdminEmailTemplateUpdateOptions, adminEmailTemplateUpdateOptionsToCrud } from "../../email-templates"; -import { AdminTeamPermission, AdminTeamPermissionDefinition, AdminTeamPermissionDefinitionCreateOptions, AdminTeamPermissionDefinitionUpdateOptions, AdminUserPermission, AdminUserPermissionDefinition, AdminUserPermissionDefinitionCreateOptions, AdminUserPermissionDefinitionUpdateOptions, adminTeamPermissionDefinitionCreateOptionsToCrud, adminTeamPermissionDefinitionUpdateOptionsToCrud, adminUserPermissionDefinitionCreateOptionsToCrud, adminUserPermissionDefinitionUpdateOptionsToCrud } from "../../permissions"; +import { AdminTeamPermission, AdminTeamPermissionDefinition, AdminTeamPermissionDefinitionCreateOptions, AdminTeamPermissionDefinitionUpdateOptions, AdminProjectPermission, AdminProjectPermissionDefinition, AdminProjectPermissionDefinitionCreateOptions, AdminProjectPermissionDefinitionUpdateOptions, adminTeamPermissionDefinitionCreateOptionsToCrud, adminTeamPermissionDefinitionUpdateOptionsToCrud, adminProjectPermissionDefinitionCreateOptionsToCrud, adminProjectPermissionDefinitionUpdateOptionsToCrud } from "../../permissions"; import { AdminOwnedProject, AdminProject, AdminProjectUpdateOptions, adminProjectUpdateOptionsToCrud } from "../../projects"; import { StackAdminApp, StackAdminAppConstructorOptions } from "../interfaces/admin-app"; import { clientVersion, createCache, getBaseUrl, getDefaultProjectId, getDefaultPublishableClientKey, getDefaultSecretServerKey, getDefaultSuperSecretAdminKey } from "./common"; @@ -37,8 +37,8 @@ export class _StackAdminAppImplIncomplete { return await this._interface.listTeamPermissionDefinitions(); }); - private readonly _adminUserPermissionDefinitionsCache = createCache(async () => { - return await this._interface.listUserPermissionDefinitions(); + private readonly _adminProjectPermissionDefinitionsCache = createCache(async () => { + return await this._interface.listProjectPermissionDefinitions(); }); private readonly _svixTokenCache = createCache(async () => { return await this._interface.getSvixToken(); @@ -296,32 +296,32 @@ export class _StackAdminAppImplIncomplete { - const crud = await this._interface.createUserPermissionDefinition(adminUserPermissionDefinitionCreateOptionsToCrud(data)); - await this._adminUserPermissionDefinitionsCache.refresh([]); - return this._serverUserPermissionDefinitionFromCrud(crud); + async createProjectPermissionDefinition(data: AdminProjectPermissionDefinitionCreateOptions): Promise { + const crud = await this._interface.createProjectPermissionDefinition(adminProjectPermissionDefinitionCreateOptionsToCrud(data)); + await this._adminProjectPermissionDefinitionsCache.refresh([]); + return this._serverProjectPermissionDefinitionFromCrud(crud); } - async updateUserPermissionDefinition(permissionId: string, data: AdminUserPermissionDefinitionUpdateOptions) { - await this._interface.updateUserPermissionDefinition(permissionId, adminUserPermissionDefinitionUpdateOptionsToCrud(data)); - await this._adminUserPermissionDefinitionsCache.refresh([]); + async updateProjectPermissionDefinition(permissionId: string, data: AdminProjectPermissionDefinitionUpdateOptions) { + await this._interface.updateProjectPermissionDefinition(permissionId, adminProjectPermissionDefinitionUpdateOptionsToCrud(data)); + await this._adminProjectPermissionDefinitionsCache.refresh([]); } - async deleteUserPermissionDefinition(permissionId: string): Promise { - await this._interface.deleteUserPermissionDefinition(permissionId); - await this._adminUserPermissionDefinitionsCache.refresh([]); + async deleteProjectPermissionDefinition(permissionId: string): Promise { + await this._interface.deleteProjectPermissionDefinition(permissionId); + await this._adminProjectPermissionDefinitionsCache.refresh([]); } - async listUserPermissionDefinitions(): Promise { - const crud = Result.orThrow(await this._adminUserPermissionDefinitionsCache.getOrWait([], "write-only")); - return crud.map((p) => this._serverUserPermissionDefinitionFromCrud(p)); + async listProjectPermissionDefinitions(): Promise { + const crud = Result.orThrow(await this._adminProjectPermissionDefinitionsCache.getOrWait([], "write-only")); + return crud.map((p) => this._serverProjectPermissionDefinitionFromCrud(p)); } // IF_PLATFORM react-like - useUserPermissionDefinitions(): AdminUserPermissionDefinition[] { - const crud = useAsyncCache(this._adminUserPermissionDefinitionsCache, [], "useUserPermissions()"); + useProjectPermissionDefinitions(): AdminProjectPermissionDefinition[] { + const crud = useAsyncCache(this._adminProjectPermissionDefinitionsCache, [], "useProjectPermissions()"); return useMemo(() => { - return crud.map((p) => this._serverUserPermissionDefinitionFromCrud(p)); + return crud.map((p) => this._serverProjectPermissionDefinitionFromCrud(p)); }, [crud]); } // END_PLATFORM diff --git a/packages/template/src/lib/stack-app/apps/implementations/server-app-impl.ts b/packages/template/src/lib/stack-app/apps/implementations/server-app-impl.ts index 38ffe0128..1d249e616 100644 --- a/packages/template/src/lib/stack-app/apps/implementations/server-app-impl.ts +++ b/packages/template/src/lib/stack-app/apps/implementations/server-app-impl.ts @@ -3,7 +3,7 @@ import { ContactChannelsCrud } from "@stackframe/stack-shared/dist/interface/cru import { TeamInvitationCrud } from "@stackframe/stack-shared/dist/interface/crud/team-invitation"; import { TeamMemberProfilesCrud } from "@stackframe/stack-shared/dist/interface/crud/team-member-profiles"; import { TeamPermissionDefinitionsCrud, TeamPermissionsCrud } from "@stackframe/stack-shared/dist/interface/crud/team-permissions"; -import { UserPermissionDefinitionsCrud } from "@stackframe/stack-shared/dist/interface/crud/user-permissions"; +import { ProjectPermissionDefinitionsCrud } from "@stackframe/stack-shared/dist/interface/crud/project-permissions"; import { TeamsCrud } from "@stackframe/stack-shared/dist/interface/crud/teams"; import { UsersCrud } from "@stackframe/stack-shared/dist/interface/crud/users"; import { InternalSession } from "@stackframe/stack-shared/dist/sessions"; @@ -17,7 +17,7 @@ import { constructRedirectUrl } from "../../../../utils/url"; import { GetUserOptions, HandlerUrls, OAuthScopesOnSignIn, TokenStoreInit } from "../../common"; import { OAuthConnection } from "../../connected-accounts"; import { ServerContactChannel, ServerContactChannelCreateOptions, ServerContactChannelUpdateOptions, serverContactChannelCreateOptionsToCrud, serverContactChannelUpdateOptionsToCrud } from "../../contact-channels"; -import { AdminTeamPermission, AdminTeamPermissionDefinition, AdminUserPermissionDefinition } from "../../permissions"; +import { AdminTeamPermission, AdminTeamPermissionDefinition, AdminProjectPermissionDefinition } from "../../permissions"; import { EditableTeamMemberProfile, ServerListUsersOptions, ServerTeam, ServerTeamCreateOptions, ServerTeamUpdateOptions, ServerTeamUser, Team, TeamInvitation, serverTeamCreateOptionsToCrud, serverTeamUpdateOptionsToCrud } from "../../teams"; import { ProjectCurrentServerUser, ServerUser, ServerUserCreateOptions, ServerUserUpdateOptions, serverUserCreateOptionsToCrud, serverUserUpdateOptionsToCrud } from "../../users"; import { StackServerAppConstructorOptions } from "../interfaces/server-app"; @@ -640,7 +640,7 @@ export class _StackServerAppImplIncomplete & AsyncStoreProperty<"apiKeys", [], ApiKey[], true> & AsyncStoreProperty<"teamPermissionDefinitions", [], AdminTeamPermissionDefinition[], true> - & AsyncStoreProperty<"userPermissionDefinitions", [], AdminUserPermissionDefinition[], true> + & AsyncStoreProperty<"projectPermissionDefinitions", [], AdminProjectPermissionDefinition[], true> & { useEmailTemplates(): AdminEmailTemplate[], // THIS_LINE_PLATFORM react-like listEmailTemplates(): Promise, @@ -44,9 +44,9 @@ export type StackAdminApp, deleteTeamPermissionDefinition(permissionId: string): Promise, - createUserPermissionDefinition(data: AdminUserPermissionDefinitionCreateOptions): Promise, - updateUserPermissionDefinition(permissionId: string, data: AdminUserPermissionDefinitionUpdateOptions): Promise, - deleteUserPermissionDefinition(permissionId: string): Promise, + createProjectPermissionDefinition(data: AdminProjectPermissionDefinitionCreateOptions): Promise, + updateProjectPermissionDefinition(permissionId: string, data: AdminProjectPermissionDefinitionUpdateOptions): Promise, + deleteProjectPermissionDefinition(permissionId: string): Promise, useSvixToken(): string, // THIS_LINE_PLATFORM react-like diff --git a/packages/template/src/lib/stack-app/index.ts b/packages/template/src/lib/stack-app/index.ts index 84dbeaa9c..c6e206f9f 100644 --- a/packages/template/src/lib/stack-app/index.ts +++ b/packages/template/src/lib/stack-app/index.ts @@ -52,10 +52,10 @@ export type { AdminTeamPermissionDefinition, AdminTeamPermissionDefinitionCreateOptions, AdminTeamPermissionDefinitionUpdateOptions, - AdminUserPermission, - AdminUserPermissionDefinition, - AdminUserPermissionDefinitionCreateOptions, - AdminUserPermissionDefinitionUpdateOptions, + AdminProjectPermission, + AdminProjectPermissionDefinition, + AdminProjectPermissionDefinitionCreateOptions, + AdminProjectPermissionDefinitionUpdateOptions, } from "./permissions"; export type { diff --git a/packages/template/src/lib/stack-app/permissions/index.ts b/packages/template/src/lib/stack-app/permissions/index.ts index 7ce69f83a..c6dd154f1 100644 --- a/packages/template/src/lib/stack-app/permissions/index.ts +++ b/packages/template/src/lib/stack-app/permissions/index.ts @@ -38,24 +38,24 @@ export function adminTeamPermissionDefinitionUpdateOptionsToCrud(options: AdminT }; } -export type UserPermission = { +export type ProjectPermission = { id: string, }; -export type AdminUserPermission = UserPermission; +export type AdminProjectPermission = ProjectPermission; -export type AdminUserPermissionDefinition = { +export type AdminProjectPermissionDefinition = { id: string, description?: string, containedPermissionIds: string[], }; -export type AdminUserPermissionDefinitionCreateOptions = { +export type AdminProjectPermissionDefinitionCreateOptions = { id: string, description?: string, containedPermissionIds: string[], }; -export function adminUserPermissionDefinitionCreateOptionsToCrud(options: AdminUserPermissionDefinitionCreateOptions): ProjectPermissionDefinitionsCrud["Admin"]["Create"] { +export function adminProjectPermissionDefinitionCreateOptionsToCrud(options: AdminProjectPermissionDefinitionCreateOptions): ProjectPermissionDefinitionsCrud["Admin"]["Create"] { return { id: options.id, description: options.description, @@ -63,8 +63,8 @@ export function adminUserPermissionDefinitionCreateOptionsToCrud(options: AdminU }; } -export type AdminUserPermissionDefinitionUpdateOptions = Partial; -export function adminUserPermissionDefinitionUpdateOptionsToCrud(options: AdminUserPermissionDefinitionUpdateOptions): ProjectPermissionDefinitionsCrud["Admin"]["Update"] { +export type AdminProjectPermissionDefinitionUpdateOptions = Partial; +export function adminProjectPermissionDefinitionUpdateOptionsToCrud(options: AdminProjectPermissionDefinitionUpdateOptions): ProjectPermissionDefinitionsCrud["Admin"]["Update"] { return { id: options.id, description: options.description,