diff --git a/packages/frontend/src/router/definition.ts b/packages/frontend/src/router/definition.ts
index aa7084dc7b..292c51e64a 100644
--- a/packages/frontend/src/router/definition.ts
+++ b/packages/frontend/src/router/definition.ts
@@ -7,6 +7,7 @@ import { App, AsyncComponentLoader, defineAsyncComponent, provide } from 'vue';
import type { RouteDef } from '@/nirax.js';
import { IRouter, Router } from '@/nirax.js';
import { $i, iAmModerator } from '@/account.js';
+import { fetchInstance } from '@/instance.js';
import MkLoading from '@/pages/_loading_.vue';
import MkError from '@/pages/_error_.vue';
import { setMainRouter } from '@/router/main.js';
@@ -17,6 +18,8 @@ const page = (loader: AsyncComponentLoader
) => defineAsyncComponent({
errorComponent: MkError,
});
+const instanceMeta = await fetchInstance();
+
const routes: RouteDef[] = [{
path: '/@:initUser/pages/:initPageName/view-source',
component: page(() => import('@/pages/page-editor/page-editor.vue')),
@@ -52,7 +55,7 @@ const routes: RouteDef[] = [{
path: '/settings',
component: page(() => import('@/pages/settings/index.vue')),
loginRequired: true,
- idRequired: true,
+ idRequired: $i && $i.idCheckRequired ? true : false,
children: [{
path: '/profile',
name: 'profile',
@@ -218,7 +221,6 @@ const routes: RouteDef[] = [{
path: '/theme-editor',
component: page(() => import('@/pages/theme-editor.vue')),
loginRequired: true,
- idRequired: true,
}, {
path: '/roles/:role',
component: page(() => import('@/pages/role.vue')),
@@ -255,17 +257,14 @@ const routes: RouteDef[] = [{
path: '/lookup',
component: page(() => import('@/pages/lookup.vue')),
loginRequired: true,
- idRequired: true,
}, {
path: '/share',
component: page(() => import('@/pages/share.vue')),
loginRequired: true,
- idRequired: true,
}, {
path: '/api-console',
component: page(() => import('@/pages/api-console.vue')),
loginRequired: true,
- idRequired: true,
}, {
path: '/scratchpad',
component: page(() => import('@/pages/scratchpad.vue')),
@@ -340,11 +339,11 @@ const routes: RouteDef[] = [{
}, {
path: '/channels/:channelId',
component: page(() => import('@/pages/channel.vue')),
- idRequired: true,
+ idRequired: $i && $i.idCheckRequired || !$i && instanceMeta.features.idRequired ? true : false,
}, {
path: '/channels',
component: page(() => import('@/pages/channels.vue')),
- idRequired: true,
+ idRequired: $i && $i.idCheckRequired || !$i && instanceMeta.features.idRequired ? true : false,
}, {
path: '/custom-emojis-manager',
component: page(() => import('@/pages/custom-emojis-manager.vue')),
@@ -566,12 +565,12 @@ const routes: RouteDef[] = [{
path: '/timeline/list/:listId',
component: page(() => import('@/pages/user-list-timeline.vue')),
loginRequired: true,
- idRequired: true,
+ idRequired: $i && $i.idCheckRequired || !$i && instanceMeta.features.idRequired ? true : false,
}, {
path: '/timeline/antenna/:antennaId',
component: page(() => import('@/pages/antenna-timeline.vue')),
loginRequired: true,
- idRequired: true,
+ idRequired: $i && $i.idCheckRequired || !$i && instanceMeta.features.idRequired ? true : false,
}, {
path: '/clicker',
component: page(() => import('@/pages/clicker.vue')),
@@ -595,7 +594,7 @@ const routes: RouteDef[] = [{
}, {
path: '/timeline',
component: page(() => import('@/pages/timeline.vue')),
- idRequired: true,
+ idRequired: $i && $i.idCheckRequired || !$i && instanceMeta.features.idRequired ? true : false,
}, {
name: 'index',
path: '/',
@@ -613,7 +612,7 @@ const routes: RouteDef[] = [{
}];
function createRouterImpl(path: string): IRouter {
- return new Router(routes, path, !!$i, $i?.idCheckRequired!, page(() => import('@/pages/not-found.vue')));
+ return new Router(routes, path, !!$i, $i?.idCheckRequired! || !$i && instanceMeta.features.idRequired, page(() => import('@/pages/not-found.vue')));
}
/**
diff --git a/packages/frontend/src/scripts/confirm-id.ts b/packages/frontend/src/scripts/confirm-id.ts
index 8bc8773f12..f60b79fdae 100644
--- a/packages/frontend/src/scripts/confirm-id.ts
+++ b/packages/frontend/src/scripts/confirm-id.ts
@@ -5,9 +5,25 @@
import { defineAsyncComponent } from 'vue';
import { $i } from '@/account.js';
+import { i18n } from '@/i18n.js';
import { popup } from '@/os.js';
export function confirmId(path?: string) {
+ if (!$i) {
+ const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {
+ autoSet: true,
+ message: i18n.ts.signinRequired,
+ }, {
+ cancelled: () => {
+ if (path) {
+ window.location.href = path;
+ }
+ },
+ closed: () => dispose(),
+ });
+ return new Error('User Account required for id verification');
+ };
+
if ($i && !$i.idCheckRequired) return;
const { dispose } = popup(defineAsyncComponent(() => import('@/components/SkStripeIdDialog.vue')), {
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 34b987a38a..a48d890a39 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -5117,6 +5117,7 @@ export type components = {
recaptcha: boolean;
objectStorage: boolean;
serviceWorker: boolean;
+ idRequired: boolean;
/** @default true */
miauth?: boolean;
};