Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2024-12-16 20:26:19 -05:00
Code Issues Activity

refactor(schemas): update schema to fit cloud

Browse source
This commit is contained in:
Gao Sun 2024-03-01 14:56:32 +08:00
parent 16ca8b2a98
commit 0a1ad74691
No known key found for this signature in database
GPG key ID: 13EBE123E4773688
3 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/schemas/package.json
View file

@ -86,7 +86,7 @@
"@logto/phrases": "workspace:^1.9.0", "@logto/phrases": "workspace:^1.9.0",
"@logto/phrases-experience": "workspace:^1.6.0", "@logto/phrases-experience": "workspace:^1.6.0",
"@logto/shared": "workspace:^3.1.0", "@logto/shared": "workspace:^3.1.0",
"@withtyped/server": "^0.12.9" "@withtyped/server": "^0.13.1"
}, },
"peerDependencies": { "peerDependencies": {
"zod": "^3.22.4" "zod": "^3.22.4"

14
packages/schemas/src/types/organization.ts
View file

@ -11,6 +11,10 @@ import {
import { type UserInfo, type FeaturedUser, userInfoGuard } from './user.js'; import { type UserInfo, type FeaturedUser, userInfoGuard } from './user.js';
type ToZodObject<T> = z.ZodObject<{
[K in keyof T]: z.ZodType<T[K]>;
}>;
/** /**
* The simplified organization scope entity that is returned for some endpoints. * The simplified organization scope entity that is returned for some endpoints.
*/ */
@ -23,7 +27,7 @@ export type OrganizationRoleWithScopes = OrganizationRole & {
scopes: OrganizationScopeEntity[]; scopes: OrganizationScopeEntity[];
}; };
export const organizationRoleWithScopesGuard: z.ZodType<OrganizationRoleWithScopes> = export const organizationRoleWithScopesGuard: ToZodObject<OrganizationRoleWithScopes> =
OrganizationRoles.guard.extend({ OrganizationRoles.guard.extend({
scopes: z scopes: z
.object({ .object({
@ -42,7 +46,7 @@ export type OrganizationRoleEntity = {
name: string; name: string;
}; };
const organizationRoleEntityGuard: z.ZodType<OrganizationRoleEntity> = z.object({ const organizationRoleEntityGuard: ToZodObject<OrganizationRoleEntity> = z.object({
id: z.string(), id: z.string(),
name: z.string(), name: z.string(),
}); });
@ -56,7 +60,7 @@ export type OrganizationWithRoles = Organization & {
organizationRoles: OrganizationRoleEntity[]; organizationRoles: OrganizationRoleEntity[];
}; };
export const organizationWithOrganizationRolesGuard: z.ZodType<OrganizationWithRoles> = export const organizationWithOrganizationRolesGuard: ToZodObject<OrganizationWithRoles> =
Organizations.guard.extend({ Organizations.guard.extend({
organizationRoles: organizationRoleEntityGuard.array(), organizationRoles: organizationRoleEntityGuard.array(),
}); });
@ -70,7 +74,7 @@ export type UserWithOrganizationRoles = UserInfo & {
organizationRoles: OrganizationRoleEntity[]; organizationRoles: OrganizationRoleEntity[];
}; };
export const userWithOrganizationRolesGuard: z.ZodType<UserWithOrganizationRoles> = export const userWithOrganizationRolesGuard: ToZodObject<UserWithOrganizationRoles> =
userInfoGuard.extend({ userInfoGuard.extend({
organizationRoles: organizationRoleEntityGuard.array(), organizationRoles: organizationRoleEntityGuard.array(),
}); });
@ -93,7 +97,7 @@ export type OrganizationInvitationEntity = OrganizationInvitation & {
organizationRoles: OrganizationRoleEntity[]; organizationRoles: OrganizationRoleEntity[];
}; };
export const organizationInvitationEntityGuard: z.ZodType<OrganizationInvitationEntity> = export const organizationInvitationEntityGuard: ToZodObject<OrganizationInvitationEntity> =
OrganizationInvitations.guard.extend({ OrganizationInvitations.guard.extend({
organizationRoles: organizationRoleEntityGuard.array(), organizationRoles: organizationRoleEntityGuard.array(),
}); });

14
pnpm-lock.yaml
View file

@ -3997,8 +3997,8 @@ importers:
specifier: workspace:^3.1.0 specifier: workspace:^3.1.0
version: link:../shared version: link:../shared
'@withtyped/server': '@withtyped/server':
specifier: ^0.12.9 specifier: ^0.13.1
version: 0.12.9(zod@3.22.4) version: 0.13.1(zod@3.22.4)
zod: zod:
specifier: ^3.22.4 specifier: ^3.22.4
version: 3.22.4 version: 3.22.4
@ -10547,6 +10547,16 @@ packages:
'@withtyped/shared': 0.2.2 '@withtyped/shared': 0.2.2
zod: 3.22.4 zod: 3.22.4
/@withtyped/server@0.13.1(zod@3.22.4):
resolution: {integrity: sha512-Fmmlw/7f3oidMS2tjgOx82BIkNEDBpHbFPj4oghXbyaZ8bgskLjKoLE0Qscbua6vhWUG4EgAmfR5ijSfg3bw2Q==}
peerDependencies:
zod: ^3.19.1
dependencies:
'@silverhand/essentials': 2.9.0
'@withtyped/shared': 0.2.2
zod: 3.22.4
dev: false
/@withtyped/shared@0.2.2: /@withtyped/shared@0.2.2:
resolution: {integrity: sha512-Vpcj12NqaoZ8M5Z/1kffheI9FBZEm9goed0THmgTcMKXLHjXSRbMZMp0olVxovEgaTIAydshqJOQUXKZMctIZw==} resolution: {integrity: sha512-Vpcj12NqaoZ8M5Z/1kffheI9FBZEm9goed0THmgTcMKXLHjXSRbMZMp0olVxovEgaTIAydshqJOQUXKZMctIZw==}