Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: logto-io/logto
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8c4dab5878c77e8b54b3b983cda8753bbedab4bb
Choose a base ref
..
head repository: logto-io/logto
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: de4ae29489e5613a1dd617f7615e61e03dea6a2f
Choose a head ref
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -74,7 +74,7 @@
"@types/tar": "^6.1.12",
"@types/yargs": "^17.0.13",
"@vitest/coverage-v8": "^2.0.0",
"@withtyped/server": "^0.13.6",
"@withtyped/server": "^0.14.0",
"eslint": "^8.56.0",
"lint-staged": "^15.0.0",
"prettier": "^3.0.0",
2 changes: 1 addition & 1 deletion packages/connectors/connector-logto-email/package.json
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@
"access": "public"
},
"devDependencies": {
"@logto/cloud": "0.2.5-3452c56",
"@logto/cloud": "0.2.5-582d792",
"@silverhand/eslint-config": "6.0.1",
"@silverhand/ts-config": "6.0.0",
"@types/node": "^20.11.20",
4 changes: 2 additions & 2 deletions packages/console/package.json
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
"devDependencies": {
"@fontsource/roboto-mono": "^5.0.0",
"@jest/types": "^29.5.0",
"@logto/cloud": "0.2.5-9a1b047",
"@logto/cloud": "0.2.5-582d792",
"@logto/connector-kit": "workspace:^4.0.0",
"@logto/core-kit": "workspace:^2.5.0",
"@logto/elements": "workspace:^0.0.0",
@@ -59,7 +59,7 @@
"@types/react-modal": "^3.13.1",
"@types/react-syntax-highlighter": "^15.5.1",
"@vitejs/plugin-react": "^4.3.1",
"@withtyped/client": "^0.8.7",
"@withtyped/client": "^0.8.8",
"classnames": "^2.3.1",
"clean-deep": "^3.4.0",
"date-fns": "^2.29.3",
6 changes: 3 additions & 3 deletions packages/console/src/pages/UserDetails/UserSettings/index.tsx
Original file line number Diff line number Diff line change
@@ -26,10 +26,10 @@ import { uriValidator } from '@/utils/validator';
import { type UserDetailsForm, type UserDetailsOutletContext } from '../types';
import { userDetailsParser } from '../utils';

import PersonalAccessTokens from './PersonalAccessTokens';
import UserMfaVerifications from './UserMfaVerifications';
import PersonalAccessTokens from './components/PersonalAccessTokens';
import UserSocialIdentities from './components/UserSocialIdentities';
import UserSsoIdentities from './components/UserSsoIdentities';
import UserSocialIdentities from './UserSocialIdentities';
import UserSsoIdentities from './UserSsoIdentities';

function UserSettings() {
const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@
"@silverhand/essentials": "^2.9.1",
"@silverhand/slonik": "31.0.0-beta.2",
"@simplewebauthn/server": "^10.0.0",
"@withtyped/client": "^0.8.7",
"@withtyped/client": "^0.8.8",
"camelcase": "^8.0.0",
"camelcase-keys": "^9.1.3",
"chalk": "^5.3.0",
@@ -96,7 +96,7 @@
"zod": "^3.23.8"
},
"devDependencies": {
"@logto/cloud": "0.2.5-a6cff75",
"@logto/cloud": "0.2.5-582d792",
"@silverhand/eslint-config": "6.0.1",
"@silverhand/ts-config": "6.0.0",
"@types/adm-zip": "^0.5.5",
6 changes: 3 additions & 3 deletions packages/core/src/libraries/quota.ts
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ import {
reportSubscriptionUpdates,
isReportSubscriptionUpdatesUsageKey,
} from '#src/utils/subscription/index.js';
import { type SubscriptionQuota } from '#src/utils/subscription/types.js';
import { type SubscriptionQuota, type SubscriptionUsage } from '#src/utils/subscription/types.js';

import { type CloudConnectionLibrary } from './cloud-connection.js';

@@ -24,7 +24,7 @@ const shouldReportSubscriptionUpdates = (planId: string, key: keyof Subscription
planId === ReservedPlanId.Pro && isReportSubscriptionUpdatesUsageKey(key);

export const createQuotaLibrary = (cloudConnection: CloudConnectionLibrary) => {
const guardTenantUsageByKey = async (key: keyof SubscriptionQuota) => {
const guardTenantUsageByKey = async (key: keyof SubscriptionUsage) => {
const { isCloud, isIntegrationTest } = EnvSet.values;

// Cloud only feature, skip in non-cloud environments
@@ -146,7 +146,7 @@ export const createQuotaLibrary = (cloudConnection: CloudConnectionLibrary) => {
);
};

const reportSubscriptionUpdatesUsage = async (key: keyof SubscriptionQuota) => {
const reportSubscriptionUpdatesUsage = async (key: keyof SubscriptionUsage) => {
const { isCloud, isIntegrationTest } = EnvSet.values;

// Cloud only feature, skip in non-cloud environments
4 changes: 2 additions & 2 deletions packages/core/src/middleware/koa-quota-guard.ts
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@ import { type Nullable } from '@silverhand/essentials';
import type { MiddlewareType } from 'koa';

import { type QuotaLibrary } from '#src/libraries/quota.js';
import { type SubscriptionQuota } from '#src/utils/subscription/types.js';
import { type SubscriptionUsage } from '#src/utils/subscription/types.js';

type Method = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'COPY' | 'HEAD' | 'OPTIONS';

type UsageGuardConfig = {
key: keyof SubscriptionQuota;
key: keyof SubscriptionUsage;
quota: QuotaLibrary;
/** Guard usage only for the specified method types. Guard all if not provided. */
methods?: Method[];
1 change: 0 additions & 1 deletion packages/core/src/utils/subscription/types.ts
Original file line number Diff line number Diff line change
@@ -38,7 +38,6 @@ export type ReportSubscriptionUpdatesUsageKey = RouteRequestBodyType<

// Have to manually define this variable since we can only get the literal union from the @logto/cloud/routes module.
export const allReportSubscriptionUpdatesUsageKeys = Object.freeze([
'tokenLimit',
'machineToMachineLimit',
'resourcesLimit',
'mfaEnabled',
4 changes: 2 additions & 2 deletions packages/toolkit/connector-kit/package.json
Original file line number Diff line number Diff line change
@@ -36,8 +36,8 @@
"dependencies": {
"@logto/language-kit": "workspace:^1.1.0",
"@silverhand/essentials": "^2.9.1",
"@withtyped/client": "^0.8.7",
"@withtyped/server": "^0.13.6"
"@withtyped/client": "^0.8.8",
"@withtyped/server": "^0.14.0"
},
"optionalDependencies": {
"zod": "^3.23.8"
Loading