This commit is contained in:
kakkokari-gtyih 2024-10-03 22:24:49 +09:00
parent 374e7d5c32
commit 1134187741
3 changed files with 27 additions and 9 deletions

View File

@ -627,6 +627,21 @@ export const packedMeDetailedOnlySchema = {
nullable: false, optional: false, nullable: false, optional: false,
ref: 'RolePolicies', ref: 'RolePolicies',
}, },
twoFactorEnabled: {
type: 'boolean',
nullable: false, optional: false,
default: false,
},
usePasswordLessLogin: {
type: 'boolean',
nullable: false, optional: false,
default: false,
},
securityKeys: {
type: 'boolean',
nullable: false, optional: false,
default: false,
},
//#region secrets //#region secrets
email: { email: {
type: 'string', type: 'string',

View File

@ -85,10 +85,6 @@ describe('ユーザー', () => {
followersVisibility: user.followersVisibility, followersVisibility: user.followersVisibility,
roles: user.roles, roles: user.roles,
memo: user.memo, memo: user.memo,
// 自分とモデレーターのみが取得可能な値
twoFactorEnabled: user.twoFactorEnabled,
usePasswordLessLogin: user.usePasswordLessLogin,
securityKeys: user.securityKeys,
}); });
}; };
@ -150,6 +146,9 @@ describe('ユーザー', () => {
achievements: user.achievements, achievements: user.achievements,
loggedInDays: user.loggedInDays, loggedInDays: user.loggedInDays,
policies: user.policies, policies: user.policies,
twoFactorEnabled: user.twoFactorEnabled,
usePasswordLessLogin: user.usePasswordLessLogin,
securityKeys: user.securityKeys,
...(security ? { ...(security ? {
email: user.email, email: user.email,
emailVerified: user.emailVerified, emailVerified: user.emailVerified,
@ -347,11 +346,6 @@ describe('ユーザー', () => {
assert.deepStrictEqual(response.roles, []); assert.deepStrictEqual(response.roles, []);
assert.strictEqual(response.memo, null); assert.strictEqual(response.memo, null);
// UserDetailedNotMeOnlyであるが自分もしくはモデレーターのみが取得可能な値
assert.strictEqual(response.twoFactorEnabled, false);
assert.strictEqual(response.usePasswordLessLogin, false);
assert.strictEqual(response.securityKeys, false);
// MeDetailedOnly // MeDetailedOnly
assert.strictEqual(response.avatarId, null); assert.strictEqual(response.avatarId, null);
assert.strictEqual(response.bannerId, null); assert.strictEqual(response.bannerId, null);
@ -388,6 +382,9 @@ describe('ユーザー', () => {
assert.deepStrictEqual(response.achievements, []); assert.deepStrictEqual(response.achievements, []);
assert.deepStrictEqual(response.loggedInDays, 0); assert.deepStrictEqual(response.loggedInDays, 0);
assert.deepStrictEqual(response.policies, DEFAULT_POLICIES); assert.deepStrictEqual(response.policies, DEFAULT_POLICIES);
assert.strictEqual(response.twoFactorEnabled, false);
assert.strictEqual(response.usePasswordLessLogin, false);
assert.strictEqual(response.securityKeys, false);
assert.notStrictEqual(response.email, undefined); assert.notStrictEqual(response.email, undefined);
assert.strictEqual(response.emailVerified, false); assert.strictEqual(response.emailVerified, false);
assert.deepStrictEqual(response.securityKeysList, []); assert.deepStrictEqual(response.securityKeysList, []);

View File

@ -3969,6 +3969,12 @@ export type components = {
}[]; }[];
loggedInDays: number; loggedInDays: number;
policies: components['schemas']['RolePolicies']; policies: components['schemas']['RolePolicies'];
/** @default false */
twoFactorEnabled: boolean;
/** @default false */
usePasswordLessLogin: boolean;
/** @default false */
securityKeys: boolean;
email?: string | null; email?: string | null;
emailVerified?: boolean | null; emailVerified?: boolean | null;
securityKeysList?: { securityKeysList?: {