diff --git a/docker-compose.example-nodejs.mongo.yml b/docker-compose.example-nodejs.mongo.yml
index 2561208d8..3161bbb51 100644
--- a/docker-compose.example-nodejs.mongo.yml
+++ b/docker-compose.example-nodejs.mongo.yml
@@ -22,7 +22,7 @@ services:
       - $PWD/example/nodejs/cert:/viron/example/nodejs/cert
       - $PWD/packages/nodejs:/viron/packages/nodejs
       - $PWD/packages/linter:/viron/packages/linter
-    command: run dev
+    command: npm run dev
 
   mongo:
     extends:
diff --git a/docker-compose.example-nodejs.mysql.yml b/docker-compose.example-nodejs.mysql.yml
index 855fbc948..d8e4e9654 100644
--- a/docker-compose.example-nodejs.mysql.yml
+++ b/docker-compose.example-nodejs.mysql.yml
@@ -22,7 +22,7 @@ services:
       - $PWD/example/nodejs/cert:/viron/example/nodejs/cert
       - $PWD/packages/nodejs:/viron/packages/nodejs
       - $PWD/packages/linter:/viron/packages/linter
-    command: run dev
+    command: npm run dev
 
   mysql:
     extends:
diff --git a/example/nodejs/.env.template b/example/nodejs/.env.template
index 1c957edd1..a98c15346 100644
--- a/example/nodejs/.env.template
+++ b/example/nodejs/.env.template
@@ -1,13 +1,4 @@
 GOOGLE_OAUTH2_CLIENT_ID=
 GOOGLE_OAUTH2_CLIENT_SECRET=
-GOOGLE_OAUTH2_USER_HOSTED_DOMAINS=
-OIDC_CLIENT_ID=
-OIDC_CLIENT_SECRET=
-OIDC_CLIENT_CONFIGURATION_URL=
-OIDC_USER_HOSTED_DOMAINS=
 AWS_S3_ACCESS_KEY_ID=
 AWS_S3_SECRET_KEY=
-SSL_CERTIFICATE=
-SSL_PRIVATE_KEY=
-SERVICE_ENV=
-MODE=
\ No newline at end of file
diff --git a/example/nodejs/docker-compose.mongo.yml b/example/nodejs/docker-compose.mongo.yml
index 57033dcf9..7f7b64516 100644
--- a/example/nodejs/docker-compose.mongo.yml
+++ b/example/nodejs/docker-compose.mongo.yml
@@ -18,7 +18,7 @@ services:
       - $PWD/package.json:/example/nodejs/package.json
       - $PWD/src:/example/nodejs/src
       - $PWD/cert:/example/nodejs/cert
-    command: run dev
+    command: npm run dev
 
   mongo:
     image: mongo
diff --git a/example/nodejs/docker-compose.mysql.yml b/example/nodejs/docker-compose.mysql.yml
index 53c3f4b8a..7d86f2f27 100644
--- a/example/nodejs/docker-compose.mysql.yml
+++ b/example/nodejs/docker-compose.mysql.yml
@@ -19,10 +19,10 @@ services:
       - $PWD/package.json:/example/nodejs/package.json
       - $PWD/src:/example/nodejs/src
       - $PWD/cert:/example/nodejs/cert
-    command: run dev
+    command: npm run dev
 
   mysql:
-    image: mysql:8.0
+    image: mysql
     restart: always
     ports:
       - 3306:3306
diff --git a/example/nodejs/package.json b/example/nodejs/package.json
index 87f3a39b2..4626e9772 100644
--- a/example/nodejs/package.json
+++ b/example/nodejs/package.json
@@ -5,7 +5,7 @@
   "main": "dist/server.js",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.451.0",
-    "@viron/lib": "2.4.0-alpha.0",
+    "@viron/lib": "^2.0.2",
     "accepts": "^1.3.7",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.5",
@@ -20,7 +20,6 @@
     "multer": "^1.4.3",
     "multer-s3": "^3.0.1",
     "mysql2": "^2.2.5",
-    "openid-client": "^4.7.4",
     "pino": "^7.6.4",
     "pino-http": "^6.6.0",
     "sequelize": "^6.5.0",
diff --git a/example/nodejs/src/config/development.ts b/example/nodejs/src/config/development.ts
index 756919a00..34f404757 100644
--- a/example/nodejs/src/config/development.ts
+++ b/example/nodejs/src/config/development.ts
@@ -45,18 +45,7 @@ export const get = (): Config => {
         clientId: process.env.GOOGLE_OAUTH2_CLIENT_ID ?? '',
         clientSecret: process.env.GOOGLE_OAUTH2_CLIENT_SECRET ?? '',
         additionalScopes: [],
-        userHostedDomains: process.env.GOOGLE_OAUTH2_USER_HOSTED_DOMAINS
-          ? process.env.GOOGLE_OAUTH2_USER_HOSTED_DOMAINS.split(',')
-          : [],
-      },
-      oidc: {
-        clientId: process.env.OIDC_CLIENT_ID ?? '',
-        clientSecret: process.env.OIDC_CLIENT_SECRET ?? '',
-        configurationUrl: process.env.OIDC_CLIENT_CONFIGURATION_URL ?? '',
-        additionalScopes: [],
-        userHostedDomains: process.env.OIDC_USER_HOSTED_DOMAINS
-          ? process.env.OIDC_USER_HOSTED_DOMAINS.split(',')
-          : [],
+        userHostedDomains: ['cam-inc.co.jp', 'cyberagent.co.jp'],
       },
     },
     aws: {
diff --git a/example/nodejs/src/config/index.ts b/example/nodejs/src/config/index.ts
index afc023402..fa84fd2b9 100644
--- a/example/nodejs/src/config/index.ts
+++ b/example/nodejs/src/config/index.ts
@@ -48,7 +48,6 @@ export interface Config {
   auth: {
     jwt: domainsAuth.JwtConfig;
     googleOAuth2: domainsAuth.GoogleOAuthConfig;
-    oidc: domainsAuth.OidcConfig;
   };
   aws: AWSConfig;
   oas: OasConfig;
diff --git a/example/nodejs/src/config/local.ts b/example/nodejs/src/config/local.ts
index 2cc9e805c..a019293d8 100644
--- a/example/nodejs/src/config/local.ts
+++ b/example/nodejs/src/config/local.ts
@@ -56,18 +56,7 @@ export const get = (mode: Mode): Config => {
         clientId: process.env.GOOGLE_OAUTH2_CLIENT_ID ?? '',
         clientSecret: process.env.GOOGLE_OAUTH2_CLIENT_SECRET ?? '',
         additionalScopes: [],
-        userHostedDomains: process.env.GOOGLE_OAUTH2_USER_HOSTED_DOMAINS
-          ? process.env.GOOGLE_OAUTH2_USER_HOSTED_DOMAINS.split(',')
-          : [],
-      },
-      oidc: {
-        clientId: process.env.OIDC_CLIENT_ID ?? '',
-        clientSecret: process.env.OIDC_CLIENT_SECRET ?? '',
-        configurationUrl: process.env.OIDC_CLIENT_CONFIGURATION_URL ?? '',
-        additionalScopes: [],
-        userHostedDomains: process.env.OIDC_USER_HOSTED_DOMAINS
-          ? process.env.OIDC_USER_HOSTED_DOMAINS.split(',')
-          : [],
+        userHostedDomains: ['cam-inc.co.jp', 'cyberagent.co.jp'],
       },
     },
     aws: {
diff --git a/example/nodejs/src/config/production.ts b/example/nodejs/src/config/production.ts
index 0e930850f..b28aeaabc 100644
--- a/example/nodejs/src/config/production.ts
+++ b/example/nodejs/src/config/production.ts
@@ -39,19 +39,10 @@ export const get = (): Config => {
       },
       googleOAuth2: {
         clientId: process.env.GOOGLE_OAUTH2_CLIENT_ID ?? '',
+
         clientSecret: process.env.GOOGLE_OAUTH2_CLIENT_SECRET ?? '',
         additionalScopes: [],
-        userHostedDomains: process.env.GOOGLE_OAUTH2_USER_HOSTED_DOMAINS
-          ? process.env.GOOGLE_OAUTH2_USER_HOSTED_DOMAINS.split(',')
-          : [],
-      },
-      // 本番demoではOIDCのIdpが準備できないので設定なしにする
-      oidc: {
-        clientId: '',
-        clientSecret: '',
-        configurationUrl: '',
-        additionalScopes: [],
-        userHostedDomains: [],
+        userHostedDomains: ['gmail.com', 'cam-inc.co.jp', 'cyberagent.co.jp'],
       },
     },
     aws: {
diff --git a/example/nodejs/src/constants.ts b/example/nodejs/src/constants.ts
index 60e83c963..ac3e3da56 100644
--- a/example/nodejs/src/constants.ts
+++ b/example/nodejs/src/constants.ts
@@ -2,7 +2,7 @@ export const MODE = {
   MYSQL: 'mysql',
   MONGO: 'mongo',
 } as const;
-export type Mode = (typeof MODE)[keyof typeof MODE];
+export type Mode = typeof MODE[keyof typeof MODE];
 export type StoreType = Mode;
 
 export const SERVICE_ENV = {
@@ -10,7 +10,7 @@ export const SERVICE_ENV = {
   DEVELOPMENT: 'development',
   PRODUCTION: 'production',
 };
-export type ServiceEnv = (typeof SERVICE_ENV)[keyof typeof SERVICE_ENV];
+export type ServiceEnv = typeof SERVICE_ENV[keyof typeof SERVICE_ENV];
 
 export const AUTHENTICATION_RESULT_TYPE = {
   SUCCESS: 'success',
diff --git a/example/nodejs/src/controllers/auth.ts b/example/nodejs/src/controllers/auth.ts
index 87b497a95..bfd22b8bb 100644
--- a/example/nodejs/src/controllers/auth.ts
+++ b/example/nodejs/src/controllers/auth.ts
@@ -2,8 +2,6 @@ import {
   domainsAuth,
   genAuthorizationCookie,
   genOAuthStateCookie,
-  genOidcStateCookie,
-  genOidcCodeVerifierCookie,
   mismatchState,
   COOKIE_KEY,
   HTTP_HEADER,
@@ -30,73 +28,6 @@ export const signinEmail = async (context: RouteContext): Promise<void> => {
   context.res.status(204).end();
 };
 
-// OIDCの認証画面へリダイレクト
-export const oidcAuthorization = async (
-  context: RouteContext
-): Promise<void> => {
-  const { redirectUri } = context.params.query;
-  const state = domainsAuth.genState();
-  const client = await domainsAuth.genOidcClient(
-    ctx.config.auth.oidc,
-    redirectUri
-  );
-
-  // PKCE用のCodeVerifierを生成
-  const codeVerifier = await domainsAuth.genOidcCodeVerifier();
-
-  // OIDC認証画面URLを取得
-  const authorizationUrl = await domainsAuth.getOidcAuthorizationUrl(
-    ctx.config.auth.oidc,
-    client,
-    codeVerifier,
-    state
-  );
-
-  // CookieにOIDCのStateとPKCE用のCodeVerifierをセット
-  const cookies = [
-    genOidcStateCookie(state),
-    genOidcCodeVerifierCookie(codeVerifier),
-  ];
-  context.res.setHeader(HTTP_HEADER.SET_COOKIE, cookies);
-  context.res.setHeader(HTTP_HEADER.LOCATION, authorizationUrl);
-  context.res.status(301).end();
-};
-
-// OIDCのコールバック
-export const oidcCallback = async (context: RouteContext): Promise<void> => {
-  const codeVerifier = context.req.cookies[COOKIE_KEY.OIDC_CODE_VERIFIER];
-  const cookieState = context.req.cookies[COOKIE_KEY.OIDC_STATE];
-  const { state, redirectUri } = context.requestBody;
-
-  if (!codeVerifier || !cookieState || !state || cookieState !== state) {
-    throw mismatchState();
-  }
-
-  // OIDC Clientを取得
-  const client = await domainsAuth.genOidcClient(
-    ctx.config.auth.oidc,
-    redirectUri
-  );
-  const params = client.callbackParams(context.req);
-  const token = await domainsAuth.signinOidc(
-    client,
-    codeVerifier as string,
-    redirectUri,
-    params,
-    ctx.config.auth.oidc
-  );
-  context.res.setHeader(
-    HTTP_HEADER.SET_COOKIE,
-    genAuthorizationCookie(token, {
-      maxAge: ctx.config.auth.jwt.expirationSec,
-    })
-  );
-  context.origRes.clearCookie(COOKIE_KEY.OIDC_STATE);
-  context.origRes.clearCookie(COOKIE_KEY.OIDC_CODE_VERIFIER);
-
-  context.res.status(204).end();
-};
-
 // GoogleOAuth2の認可画面へリダイレクト
 export const oauth2GoogleAuthorization = async (
   context: RouteContext
diff --git a/example/nodejs/src/controllers/authconfigs.ts b/example/nodejs/src/controllers/authconfigs.ts
index 8c70a08c9..ab628b874 100644
--- a/example/nodejs/src/controllers/authconfigs.ts
+++ b/example/nodejs/src/controllers/authconfigs.ts
@@ -7,11 +7,8 @@ import {
   SIGNOUT_PATH,
   OAUTH2_GOOGLE_AUTHORIZATION_PATH,
   OAUTH2_GOOGLE_CALLBACK_PATH,
-  OIDC_AUTHORIZATION_PATH,
-  OIDC_CALLBACK_PATH,
 } from '@viron/lib';
 import { RouteContext } from '../application';
-import { ctx } from '../context';
 
 const { genAuthConfigs } = domainsAuthConfig;
 
@@ -20,57 +17,30 @@ export const listVironAuthconfigs = async (
   context: RouteContext
 ): Promise<void> => {
   const authConfigDefinitions = [
-    // メール認証は必須
     {
       provider: AUTH_CONFIG_PROVIDER.VIRON,
       type: AUTH_CONFIG_TYPE.EMAIL,
       method: API_METHOD.POST,
       path: EMAIL_SIGNIN_PATH,
     },
-    // サインアウトは必須
+    {
+      provider: AUTH_CONFIG_PROVIDER.GOOGLE,
+      type: AUTH_CONFIG_TYPE.OAUTH,
+      method: API_METHOD.GET,
+      path: OAUTH2_GOOGLE_AUTHORIZATION_PATH,
+    },
+    {
+      provider: AUTH_CONFIG_PROVIDER.GOOGLE,
+      type: AUTH_CONFIG_TYPE.OAUTH_CALLBACK,
+      method: API_METHOD.POST,
+      path: OAUTH2_GOOGLE_CALLBACK_PATH,
+    },
     {
       provider: AUTH_CONFIG_PROVIDER.SIGNOUT,
       type: AUTH_CONFIG_TYPE.SIGNOUT,
       method: API_METHOD.POST,
       path: SIGNOUT_PATH,
     },
-    // Google認証設定がある場合のみ追加
-    ...(ctx.config.auth.googleOAuth2.clientId &&
-    ctx.config.auth.googleOAuth2.clientSecret
-      ? [
-          {
-            provider: AUTH_CONFIG_PROVIDER.GOOGLE,
-            type: AUTH_CONFIG_TYPE.OAUTH,
-            method: API_METHOD.GET,
-            path: OAUTH2_GOOGLE_AUTHORIZATION_PATH,
-          },
-          {
-            provider: AUTH_CONFIG_PROVIDER.GOOGLE,
-            type: AUTH_CONFIG_TYPE.OAUTH_CALLBACK,
-            method: API_METHOD.POST,
-            path: OAUTH2_GOOGLE_CALLBACK_PATH,
-          },
-        ]
-      : []),
-    // OIDC認証設定がある場合のみ追加
-    ...(ctx.config.auth.oidc.clientId &&
-    ctx.config.auth.oidc.clientSecret &&
-    ctx.config.auth.oidc.configurationUrl
-      ? [
-          {
-            provider: AUTH_CONFIG_PROVIDER.OIDC,
-            type: AUTH_CONFIG_TYPE.OIDC,
-            method: API_METHOD.GET,
-            path: OIDC_AUTHORIZATION_PATH,
-          },
-          {
-            provider: AUTH_CONFIG_PROVIDER.OIDC,
-            type: AUTH_CONFIG_TYPE.OIDC_CALLBACK,
-            method: API_METHOD.POST,
-            path: OIDC_CALLBACK_PATH,
-          },
-        ]
-      : []),
   ];
   const result = genAuthConfigs(
     authConfigDefinitions,
diff --git a/example/nodejs/src/infrastructures/mysql/models/index.ts b/example/nodejs/src/infrastructures/mysql/models/index.ts
index 29e3b25ca..7990cc47c 100644
--- a/example/nodejs/src/infrastructures/mysql/models/index.ts
+++ b/example/nodejs/src/infrastructures/mysql/models/index.ts
@@ -5,7 +5,6 @@ import * as articles from './articles';
 import * as items from './items';
 import * as itemDetails from './item_details';
 import * as medias from './medias';
-import { mysql } from '@viron/lib';
 
 export interface MysqlModels {
   [users.name]: users.UserModelStatic;
@@ -14,12 +13,6 @@ export interface MysqlModels {
   [items.name]: items.ItemModelStatic;
   [itemDetails.name]: itemDetails.ItemDetailModelStatic;
   [medias.name]: medias.MediaModelStatic;
-  [mysql.models.adminUsers
-    .name]: mysql.MysqlModels[typeof mysql.models.adminUsers.name];
-  [mysql.models.auditLogs
-    .name]: mysql.MysqlModels[typeof mysql.models.auditLogs.name];
-  [mysql.models.revokedTokens
-    .name]: mysql.MysqlModels[typeof mysql.models.revokedTokens.name];
 }
 
 // Get models
@@ -31,10 +24,6 @@ export const models = (s: Sequelize): MysqlModels => {
     [items.name]: items.createModel(s),
     [itemDetails.name]: itemDetails.createModel(s),
     [medias.name]: medias.createModel(s),
-    [mysql.models.adminUsers.name]: mysql.models.adminUsers.createModel(s),
-    [mysql.models.auditLogs.name]: mysql.models.auditLogs.createModel(s),
-    [mysql.models.revokedTokens.name]:
-      mysql.models.revokedTokens.createModel(s),
   };
 
   mysqlModels[items.name].belongsTo(mysqlModels[itemDetails.name], {
diff --git a/example/nodejs/src/security_handlers/jwt.ts b/example/nodejs/src/security_handlers/jwt.ts
index 751aff11a..1cf3de130 100644
--- a/example/nodejs/src/security_handlers/jwt.ts
+++ b/example/nodejs/src/security_handlers/jwt.ts
@@ -89,21 +89,6 @@ export const jwt = async (
           }
           break;
         }
-        case AUTH_TYPE.OIDC: {
-          // OIDC認証の場合はアクセストークンの検証
-          const client = await domainsAuth.genOidcClient(ctx.config.auth.oidc);
-          if (
-            await domainsAuth.verifyOidcAccessToken(
-              client,
-              ctx.config.auth.oidc,
-              userId,
-              user
-            )
-          ) {
-            return authSuccess(user);
-          }
-          break;
-        }
         default:
           return authSuccess(user);
       }
diff --git a/package-lock.json b/package-lock.json
index cb101d6a5..47b1f8f9b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,7 @@
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.451.0",
-        "@viron/lib": "2.4.0-alpha.0",
+        "@viron/lib": "^2.0.2",
         "accepts": "^1.3.7",
         "compression": "^1.7.4",
         "cookie-parser": "^1.4.5",
@@ -46,7 +46,6 @@
         "multer": "^1.4.3",
         "multer-s3": "^3.0.1",
         "mysql2": "^2.2.5",
-        "openid-client": "^4.7.4",
         "pino": "^7.6.4",
         "pino-http": "^6.6.0",
         "sequelize": "^6.5.0",
@@ -416,11 +415,37 @@
         "@types/yargs-parser": "*"
       }
     },
+    "example/nodejs/node_modules/@viron/lib": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@viron/lib/-/lib-2.1.1.tgz",
+      "integrity": "sha512-zUJBJftIJgZEUhKEjvkl+Zkx4FVe/waZj6G/1AaPlvAwhlixs6Ylyr13t2c1G38FExvc7oe1Ynax1T7iCA6a0Q==",
+      "dependencies": {
+        "@viron/linter": "*",
+        "casbin": "^5.6.1",
+        "casbin-mongoose-adapter": "^5.3.0",
+        "casbin-sequelize-adapter": "^2.2.0",
+        "cookie": "^0.4.1",
+        "debug": "^4.3.1",
+        "deepmerge": "^4.2.2",
+        "fast-copy": "^2.1.1",
+        "googleapis": "^92.0.0",
+        "json-pointer": "^0.6.1",
+        "json-schema-ref-parser": "^9.0.7",
+        "json-schema-traverse": "^1.0.0",
+        "jsonwebtoken": "^8.5.1",
+        "mongoose": "^7.3.4",
+        "path-to-regexp": "^6.2.0",
+        "sequelize": "^6.12.5",
+        "uuid": "^8.3.2"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "example/nodejs/node_modules/@viron/lib/node_modules/mongoose": {
       "version": "7.6.8",
       "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-7.6.8.tgz",
       "integrity": "sha512-q9zAySH+UtOK5yonWyNcLfq3PxrY6s4gdta4qNGKNOE2yTVoY9FP4hQtvWYnv4rkdk7T8QmQMC7bbhJjDxIunw==",
-      "extraneous": true,
       "dependencies": {
         "bson": "^5.5.0",
         "kareem": "2.5.1",
@@ -505,6 +530,14 @@
         "@babel/core": "^7.0.0"
       }
     },
+    "example/nodejs/node_modules/bson": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-5.5.1.tgz",
+      "integrity": "sha512-ix0EwukN2EpC0SRWIj/7B5+A6uQMQy6KMREI9qQqvgpkV2frH63T0UDVd1SYedL6dNCmDBYB3QtXi4ISk9YT+g==",
+      "engines": {
+        "node": ">=14.20.1"
+      }
+    },
     "example/nodejs/node_modules/camelcase": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
@@ -1131,59 +1164,126 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "example/nodejs/node_modules/jose": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/jose/-/jose-2.0.7.tgz",
-      "integrity": "sha512-5hFWIigKqC+e/lRyQhfnirrAqUdIPMB7SJRqflJaO29dW7q5DFvH1XCSTmv6PQ6pb++0k6MJlLRoS0Wv4s38Wg==",
+    "example/nodejs/node_modules/jsonwebtoken": {
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
+      "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
       "dependencies": {
-        "@panva/asn1.js": "^1.0.0"
+        "jws": "^3.2.2",
+        "lodash.includes": "^4.3.0",
+        "lodash.isboolean": "^3.0.3",
+        "lodash.isinteger": "^4.0.4",
+        "lodash.isnumber": "^3.0.3",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.isstring": "^4.0.1",
+        "lodash.once": "^4.0.0",
+        "ms": "^2.1.1",
+        "semver": "^5.6.0"
       },
       "engines": {
-        "node": ">=10.13.0 < 13 || >=13.7.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/panva"
+        "node": ">=4",
+        "npm": ">=1.4.28"
       }
     },
-    "example/nodejs/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+    "example/nodejs/node_modules/jsonwebtoken/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "example/nodejs/node_modules/jwa": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
+      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
       "dependencies": {
-        "yallist": "^4.0.0"
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "example/nodejs/node_modules/jws": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+      "dependencies": {
+        "jwa": "^1.4.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "example/nodejs/node_modules/kareem": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.5.1.tgz",
+      "integrity": "sha512-7jFxRVm+jD+rkq3kY0iZDJfsO2/t4BBPeEb2qKn2lR/9KhuksYk5hxzfRYWMPV8P/x2d0kHD306YyWLzjjH+uA==",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "example/nodejs/node_modules/mongodb": {
+      "version": "5.9.1",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.9.1.tgz",
+      "integrity": "sha512-NBGA8AfJxGPeB12F73xXwozt8ZpeIPmCUeWRwl9xejozTXFes/3zaep9zhzs1B/nKKsw4P3I4iPfXl3K7s6g+Q==",
+      "dependencies": {
+        "bson": "^5.5.0",
+        "mongodb-connection-string-url": "^2.6.0",
+        "socks": "^2.7.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=14.20.1"
+      },
+      "optionalDependencies": {
+        "@mongodb-js/saslprep": "^1.1.0"
+      },
+      "peerDependencies": {
+        "@aws-sdk/credential-providers": "^3.188.0",
+        "@mongodb-js/zstd": "^1.0.0",
+        "kerberos": "^1.0.0 || ^2.0.0",
+        "mongodb-client-encryption": ">=2.3.0 <3",
+        "snappy": "^7.2.2"
+      },
+      "peerDependenciesMeta": {
+        "@aws-sdk/credential-providers": {
+          "optional": true
+        },
+        "@mongodb-js/zstd": {
+          "optional": true
+        },
+        "kerberos": {
+          "optional": true
+        },
+        "mongodb-client-encryption": {
+          "optional": true
+        },
+        "snappy": {
+          "optional": true
+        }
       }
     },
-    "example/nodejs/node_modules/object-hash": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz",
-      "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==",
+    "example/nodejs/node_modules/mpath": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.9.0.tgz",
+      "integrity": "sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew==",
       "engines": {
-        "node": ">= 6"
+        "node": ">=4.0.0"
       }
     },
-    "example/nodejs/node_modules/openid-client": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-4.9.1.tgz",
-      "integrity": "sha512-DYUF07AHjI3QDKqKbn2F7RqozT4hyi4JvmpodLrq0HHoNP7t/AjeG/uqiBK1/N2PZSAQEThVjDLHSmJN4iqu/w==",
+    "example/nodejs/node_modules/mquery": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/mquery/-/mquery-5.0.0.tgz",
+      "integrity": "sha512-iQMncpmEK8R8ncT8HJGsGc9Dsp8xcgYMVSbs5jgnm1lFHTZqMJTUWTDx1LBO8+mK3tPNZWFLBghQEIOULSTHZg==",
       "dependencies": {
-        "aggregate-error": "^3.1.0",
-        "got": "^11.8.0",
-        "jose": "^2.0.5",
-        "lru-cache": "^6.0.0",
-        "make-error": "^1.3.6",
-        "object-hash": "^2.0.1",
-        "oidc-token-hash": "^5.0.1"
+        "debug": "4.x"
       },
       "engines": {
-        "node": "^10.19.0 || >=12.0.0 < 13 || >=13.7.0 < 14 || >= 14.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/panva"
+        "node": ">=14.0.0"
       }
     },
+    "example/nodejs/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
     "example/nodejs/node_modules/p-limit": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -1240,6 +1340,11 @@
         "node": ">=10"
       }
     },
+    "example/nodejs/node_modules/sift": {
+      "version": "16.0.1",
+      "resolved": "https://registry.npmjs.org/sift/-/sift-16.0.1.tgz",
+      "integrity": "sha512-Wv6BjQ5zbhW7VFefWusVP33T/EM0vYikCaQ2qR8yULbsilAT8/wQaXvuQ3ptGLpoKx+lihJE3y2UTgKDyyNHZQ=="
+    },
     "example/nodejs/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -1360,11 +1465,6 @@
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
-    "example/nodejs/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "example/nodejs/node_modules/yargs-parser": {
       "version": "21.1.1",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
@@ -13076,6 +13176,15 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/@mongodb-js/saslprep": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.4.tgz",
+      "integrity": "sha512-8zJ8N1x51xo9hwPh6AWnKdLGEC5N3lDa6kms1YHmFBoRhTpJR6HG8wWk0td1MVCu9cD4YBrvjZEtd5Obw0Fbnw==",
+      "optional": true,
+      "dependencies": {
+        "sparse-bitfield": "^3.0.3"
+      }
+    },
     "node_modules/@mrmlnc/readdir-enhanced": {
       "version": "2.2.1",
       "dev": true,
@@ -13241,14 +13350,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@panva/asn1.js": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@panva/asn1.js/-/asn1.js-1.0.0.tgz",
-      "integrity": "sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw==",
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
     "node_modules/@parcel/bundler-default": {
       "version": "2.8.3",
       "resolved": "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.8.3.tgz",
@@ -24902,6 +25003,126 @@
         "minimatch": "^7.4.2"
       }
     },
+    "node_modules/casbin-mongoose-adapter": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/casbin-mongoose-adapter/-/casbin-mongoose-adapter-5.3.1.tgz",
+      "integrity": "sha512-bF7Ff7kTedBrHkqFoBpFe222VzlNHack+3Gy8P/qaShCSBZHoVW2eN3HKK2A5rH4mjyK+NSY0CO7dP0/FsIEfg==",
+      "dependencies": {
+        "mongoose": "^7.3.4"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "casbin": "^5.13.2"
+      }
+    },
+    "node_modules/casbin-mongoose-adapter/node_modules/bson": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-5.5.1.tgz",
+      "integrity": "sha512-ix0EwukN2EpC0SRWIj/7B5+A6uQMQy6KMREI9qQqvgpkV2frH63T0UDVd1SYedL6dNCmDBYB3QtXi4ISk9YT+g==",
+      "engines": {
+        "node": ">=14.20.1"
+      }
+    },
+    "node_modules/casbin-mongoose-adapter/node_modules/kareem": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.5.1.tgz",
+      "integrity": "sha512-7jFxRVm+jD+rkq3kY0iZDJfsO2/t4BBPeEb2qKn2lR/9KhuksYk5hxzfRYWMPV8P/x2d0kHD306YyWLzjjH+uA==",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/casbin-mongoose-adapter/node_modules/mongodb": {
+      "version": "5.9.1",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.9.1.tgz",
+      "integrity": "sha512-NBGA8AfJxGPeB12F73xXwozt8ZpeIPmCUeWRwl9xejozTXFes/3zaep9zhzs1B/nKKsw4P3I4iPfXl3K7s6g+Q==",
+      "dependencies": {
+        "bson": "^5.5.0",
+        "mongodb-connection-string-url": "^2.6.0",
+        "socks": "^2.7.1"
+      },
+      "engines": {
+        "node": ">=14.20.1"
+      },
+      "optionalDependencies": {
+        "@mongodb-js/saslprep": "^1.1.0"
+      },
+      "peerDependencies": {
+        "@aws-sdk/credential-providers": "^3.188.0",
+        "@mongodb-js/zstd": "^1.0.0",
+        "kerberos": "^1.0.0 || ^2.0.0",
+        "mongodb-client-encryption": ">=2.3.0 <3",
+        "snappy": "^7.2.2"
+      },
+      "peerDependenciesMeta": {
+        "@aws-sdk/credential-providers": {
+          "optional": true
+        },
+        "@mongodb-js/zstd": {
+          "optional": true
+        },
+        "kerberos": {
+          "optional": true
+        },
+        "mongodb-client-encryption": {
+          "optional": true
+        },
+        "snappy": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/casbin-mongoose-adapter/node_modules/mongoose": {
+      "version": "7.6.8",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-7.6.8.tgz",
+      "integrity": "sha512-q9zAySH+UtOK5yonWyNcLfq3PxrY6s4gdta4qNGKNOE2yTVoY9FP4hQtvWYnv4rkdk7T8QmQMC7bbhJjDxIunw==",
+      "dependencies": {
+        "bson": "^5.5.0",
+        "kareem": "2.5.1",
+        "mongodb": "5.9.1",
+        "mpath": "0.9.0",
+        "mquery": "5.0.0",
+        "ms": "2.1.3",
+        "sift": "16.0.1"
+      },
+      "engines": {
+        "node": ">=14.20.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mongoose"
+      }
+    },
+    "node_modules/casbin-mongoose-adapter/node_modules/mpath": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.9.0.tgz",
+      "integrity": "sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew==",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/casbin-mongoose-adapter/node_modules/mquery": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/mquery/-/mquery-5.0.0.tgz",
+      "integrity": "sha512-iQMncpmEK8R8ncT8HJGsGc9Dsp8xcgYMVSbs5jgnm1lFHTZqMJTUWTDx1LBO8+mK3tPNZWFLBghQEIOULSTHZg==",
+      "dependencies": {
+        "debug": "4.x"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/casbin-mongoose-adapter/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/casbin-mongoose-adapter/node_modules/sift": {
+      "version": "16.0.1",
+      "resolved": "https://registry.npmjs.org/sift/-/sift-16.0.1.tgz",
+      "integrity": "sha512-Wv6BjQ5zbhW7VFefWusVP33T/EM0vYikCaQ2qR8yULbsilAT8/wQaXvuQ3ptGLpoKx+lihJE3y2UTgKDyyNHZQ=="
+    },
     "node_modules/casbin-sequelize-adapter": {
       "version": "2.7.0",
       "dependencies": {
@@ -26969,9 +27190,8 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "version": "7.0.3",
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -39750,20 +39970,14 @@
       }
     },
     "node_modules/jsonwebtoken": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
-      "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
+      "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==",
       "dependencies": {
         "jws": "^3.2.2",
-        "lodash.includes": "^4.3.0",
-        "lodash.isboolean": "^3.0.3",
-        "lodash.isinteger": "^4.0.4",
-        "lodash.isnumber": "^3.0.3",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.isstring": "^4.0.1",
-        "lodash.once": "^4.0.0",
+        "lodash": "^4.17.21",
         "ms": "^2.1.1",
-        "semver": "^7.5.4"
+        "semver": "^7.3.8"
       },
       "engines": {
         "node": ">=12",
@@ -40776,6 +40990,7 @@
     },
     "node_modules/make-error": {
       "version": "1.3.6",
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/makeerror": {
@@ -45638,14 +45853,6 @@
       "version": "1.1.2",
       "license": "MIT"
     },
-    "node_modules/oidc-token-hash": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/oidc-token-hash/-/oidc-token-hash-5.0.3.tgz",
-      "integrity": "sha512-IF4PcGgzAr6XXSff26Sk/+P4KZFJVuHAJZj3wgO3vX2bMdNVp/QXTP3P7CEm9V1IdG8lDLY3HhiqpsE/nOwpPw==",
-      "engines": {
-        "node": "^10.13.0 || >=12.0.0"
-      }
-    },
     "node_modules/on-exit-leak-free": {
       "version": "0.2.0",
       "license": "MIT"
@@ -58554,7 +58761,7 @@
     },
     "packages/nodejs": {
       "name": "@viron/lib",
-      "version": "2.4.0-alpha.0",
+      "version": "2.3.1",
       "license": "MIT",
       "dependencies": {
         "@apidevtools/json-schema-ref-parser": "^11.1.0",
@@ -58570,9 +58777,8 @@
         "json-pointer": "^0.6.1",
         "json-schema-ref-parser": "^9.0.7",
         "json-schema-traverse": "^1.0.0",
-        "jsonwebtoken": "^9.0.2",
+        "jsonwebtoken": "^9.0.0",
         "mongoose": "^7.3.4",
-        "openid-client": "^4.7.4",
         "path-to-regexp": "^6.2.0",
         "sequelize": "^6.12.5",
         "uuid": "^8.3.2"
@@ -59696,20 +59902,6 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "packages/nodejs/node_modules/jose": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/jose/-/jose-2.0.7.tgz",
-      "integrity": "sha512-5hFWIigKqC+e/lRyQhfnirrAqUdIPMB7SJRqflJaO29dW7q5DFvH1XCSTmv6PQ6pb++0k6MJlLRoS0Wv4s38Wg==",
-      "dependencies": {
-        "@panva/asn1.js": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=10.13.0 < 13 || >=13.7.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/panva"
-      }
-    },
     "packages/nodejs/node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -59729,17 +59921,6 @@
         "node": ">=12.0.0"
       }
     },
-    "packages/nodejs/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "packages/nodejs/node_modules/mongodb": {
       "version": "5.6.0",
       "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.6.0.tgz",
@@ -59817,34 +59998,6 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
-    "packages/nodejs/node_modules/object-hash": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz",
-      "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "packages/nodejs/node_modules/openid-client": {
-      "version": "4.7.4",
-      "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-4.7.4.tgz",
-      "integrity": "sha512-n+RURXYuR0bBZo9i0pn+CXZSyg5JYQ1nbwEwPQvLE7EcJt/vMZ2iIMjLehl5DvCN53XUoPVZs9KAE5r6d9fxsw==",
-      "dependencies": {
-        "aggregate-error": "^3.1.0",
-        "got": "^11.8.0",
-        "jose": "^2.0.5",
-        "lru-cache": "^6.0.0",
-        "make-error": "^1.3.6",
-        "object-hash": "^2.0.1",
-        "oidc-token-hash": "^5.0.1"
-      },
-      "engines": {
-        "node": "^10.19.0 || >=12.0.0 < 13 || >=13.7.0 < 14 || >= 14.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/panva"
-      }
-    },
     "packages/nodejs/node_modules/p-limit": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -60026,11 +60179,6 @@
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
-    "packages/nodejs/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "packages/nodejs/node_modules/yargs-parser": {
       "version": "21.1.1",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
diff --git a/packages/app/src/components/Skelton/index.tsx b/packages/app/src/components/Skelton/index.tsx
index 32fa372ef..613340c58 100644
--- a/packages/app/src/components/Skelton/index.tsx
+++ b/packages/app/src/components/Skelton/index.tsx
@@ -16,7 +16,7 @@ const Skelton: React.FC<BaseProps & { variant: variant }> = ({
           'rounded-full': variant === 'circular',
           rounded: variant === 'rounded',
           // For variant="text", adjust the height via font-size
-          "h-auto rounded before:content-['\\200B']": variant === 'text',
+          "h-auto rounded before:content-['\\00a0']": variant === 'text',
         },
         `bg-thm-on-${on}-slight animate-pulse`,
         className
diff --git a/packages/app/src/components/button/index.tsx b/packages/app/src/components/button/index.tsx
index 428705126..d18e16f8d 100644
--- a/packages/app/src/components/button/index.tsx
+++ b/packages/app/src/components/button/index.tsx
@@ -55,7 +55,7 @@ const Button = function <T = null>({
   size = SIZE.SM,
   data,
   onClick,
-  rounded = variant !== 'text',
+  rounded = variant === 'text' ? false : true,
 }: React.PropsWithChildren<Props<T>>): JSX.Element {
   return (
     <button
diff --git a/packages/app/src/components/google/index.tsx b/packages/app/src/components/google/index.tsx
deleted file mode 100644
index 4cee38d85..000000000
--- a/packages/app/src/components/google/index.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import React from 'react';
-
-const GoogleLogo: React.FC<
-  Omit<React.ComponentProps<'svg'>, 'viewBox' | 'fill' | 'xmlns'>
-> = (props) => {
-  return (
-    <svg
-      {...props}
-      viewBox="0 0 40 40"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <rect x="0.5" y="0.5" width="39" height="39" rx="19.5" fill="white" />
-      <g clipPath="url(#clip0_710_6217)">
-        <path
-          d="M29.6 20.2273C29.6 19.5182 29.5364 18.8364 29.4182 18.1818H20V22.05H25.3818C25.15 23.3 24.4455 24.3591 23.3864 25.0682V27.5773H26.6182C28.5091 25.8364 29.6 23.2727 29.6 20.2273Z"
-          fill="#4285F4"
-        />
-        <path
-          d="M20 30C22.7 30 24.9636 29.1045 26.6181 27.5773L23.3863 25.0682C22.4909 25.6682 21.3454 26.0227 20 26.0227C17.3954 26.0227 15.1909 24.2636 14.4045 21.9H11.0636V24.4909C12.7091 27.7591 16.0909 30 20 30Z"
-          fill="#34A853"
-        />
-        <path
-          d="M14.4045 21.9C14.2045 21.3 14.0909 20.6591 14.0909 20C14.0909 19.3409 14.2045 18.7 14.4045 18.1V15.5091H11.0636C10.3864 16.8591 10 18.3864 10 20C10 21.6136 10.3864 23.1409 11.0636 24.4909L14.4045 21.9Z"
-          fill="#FBBC04"
-        />
-        <path
-          d="M20 13.9773C21.4681 13.9773 22.7863 14.4818 23.8227 15.4727L26.6909 12.6045C24.9591 10.9909 22.6954 10 20 10C16.0909 10 12.7091 12.2409 11.0636 15.5091L14.4045 18.1C15.1909 15.7364 17.3954 13.9773 20 13.9773Z"
-          fill="#E94235"
-        />
-      </g>
-      <rect x="0.5" y="0.5" width="39" height="39" rx="19.5" />
-      <defs>
-        <clipPath id="clip0_710_6217">
-          <rect
-            width="20"
-            height="20"
-            fill="white"
-            transform="translate(10 10)"
-          />
-        </clipPath>
-      </defs>
-    </svg>
-  );
-};
-
-export default GoogleLogo;
diff --git a/packages/app/src/components/icon/key/outline/index.tsx b/packages/app/src/components/icon/key/outline/index.tsx
deleted file mode 100644
index 588ee0297..000000000
--- a/packages/app/src/components/icon/key/outline/index.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-import { VscKey } from '@react-icons/all-files/vsc/VscKey';
-export default VscKey;
diff --git a/packages/app/src/components/icon/login/outline/index.tsx b/packages/app/src/components/icon/login/outline/index.tsx
new file mode 100644
index 000000000..bafc758f0
--- /dev/null
+++ b/packages/app/src/components/icon/login/outline/index.tsx
@@ -0,0 +1,2 @@
+import { LoginIcon } from '@heroicons/react/outline';
+export default LoginIcon;
diff --git a/packages/app/src/components/icon/mail/outline/index.tsx b/packages/app/src/components/icon/mail/outline/index.tsx
deleted file mode 100644
index c162cccff..000000000
--- a/packages/app/src/components/icon/mail/outline/index.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-import { FiMail } from '@react-icons/all-files/fi/FiMail';
-export default FiMail;
diff --git a/packages/app/src/constants/index.ts b/packages/app/src/constants/index.ts
index 35f651e6e..8a57d70bf 100644
--- a/packages/app/src/constants/index.ts
+++ b/packages/app/src/constants/index.ts
@@ -20,7 +20,6 @@ export type Url = (typeof URL)[keyof typeof URL];
 export const ENVIRONMENTAL_VARIABLE = {
   AUTOCOMPLETE_VALUE: '${autocompleteValue}',
   OAUTH_REDIRECT_URI: '${oauthRedirectURI}',
-  OIDC_REDIRECT_URI: '${oidcRedirectURI}',
 } as const;
 export type EnvironmentalVariable =
   (typeof ENVIRONMENTAL_VARIABLE)[keyof typeof ENVIRONMENTAL_VARIABLE];
@@ -37,13 +36,6 @@ export const OAUTH_REDIRECT_URI = (function () {
   return `${globalThis.location.origin}/oauthredirect`;
 })();
 
-export const OIDC_REDIRECT_URI = (function () {
-  if (isSSR) {
-    return '';
-  }
-  return `${globalThis.location.origin}/oidcredirect`;
-})();
-
 export const HTTP_STATUS = {
   CONTINUE: {
     name: 'Continue',
diff --git a/packages/app/src/hooks/endpoint.ts b/packages/app/src/hooks/endpoint.ts
index 19428076a..a3b67cf63 100644
--- a/packages/app/src/hooks/endpoint.ts
+++ b/packages/app/src/hooks/endpoint.ts
@@ -4,7 +4,6 @@ import {
   HTTP_STATUS,
   ENVIRONMENTAL_VARIABLE,
   OAUTH_REDIRECT_URI,
-  OIDC_REDIRECT_URI,
 } from '~/constants';
 import {
   BaseError,
@@ -103,22 +102,6 @@ export type UseEndpointReturn = {
           requestValue: RequestValue
         ) => Promise<{ error: BaseError } | { error: null }>;
       };
-  prepareSigninOidc: (
-    endpoint: Endpoint,
-    authentication: Authentication,
-    defaultValues?: RequestValue
-  ) =>
-    | { error: BaseError }
-    | {
-        error: null;
-        endpoint: Endpoint;
-        document: Document;
-        request: Request;
-        defaultValues: RequestValue;
-        execute: (
-          requestValue: RequestValue
-        ) => Promise<{ error: BaseError } | { error: null }>;
-      };
   prepareSigninOAuth: (
     endpoint: Endpoint,
     authentication: Authentication,
@@ -158,29 +141,6 @@ export type UseEndpointReturn = {
             }
         >;
       };
-  prepareSigninOidcCallback: (
-    endpoint: Endpoint,
-    authentication: Authentication,
-    defaultValues?: RequestValue
-  ) =>
-    | {
-        error: BaseError;
-      }
-    | {
-        error: null;
-        endpoint: Endpoint;
-        document: Document;
-        request: Request;
-        defaultValues: RequestValue;
-        execute: (requestValue: RequestValue) => Promise<
-          | {
-              error: BaseError;
-            }
-          | {
-              error: null;
-            }
-        >;
-      };
   prepareSignout: (
     endpoint: Endpoint,
     authentication: Authentication,
@@ -528,79 +488,6 @@ export const useEndpoint = (): UseEndpointReturn => {
     };
   }, []);
 
-  const prepareSigninOidc = useCallback<UseEndpointReturn['prepareSigninOidc']>(
-    (endpoint, authentication, defaultValues = {}) => {
-      const authConfig = authentication.list.find(
-        (item) => item.type === 'oidc'
-      );
-      if (!authConfig) {
-        return {
-          error: new BaseError('AuthConfig for OIDC not found.'),
-        };
-      }
-      const getRequestResult = extractRequest(
-        authentication.oas,
-        authConfig.operationId
-      );
-      if (getRequestResult.isFailure()) {
-        return {
-          error: new OASError('Request object not found.'),
-        };
-      }
-      const request = getRequestResult.value;
-      defaultValues = _.merge(
-        {},
-        {
-          parameters: replaceWithEnvironmentalVariables<RequestParametersValue>(
-            authConfig.defaultParametersValue || {},
-            {
-              [ENVIRONMENTAL_VARIABLE.OIDC_REDIRECT_URI]: OIDC_REDIRECT_URI,
-            }
-          ),
-          requestBody: authConfig.defaultRequestBodyValue,
-        },
-        cleanupRequestValue(request, defaultValues)
-      );
-      const execute = async (requestValue: RequestValue) => {
-        const requestPayloads = constructRequestPayloads(
-          request.operation,
-          requestValue
-        );
-        const requestInfo = constructRequestInfo(
-          endpoint,
-          authentication.oas,
-          request,
-          requestPayloads
-        );
-        try {
-          set(KEY.OIDC_ENDPOINT_ID, endpoint.id);
-          globalThis.location.href = requestInfo.toString();
-        } catch (e: unknown) {
-          remove(KEY.OIDC_ENDPOINT_ID);
-          let message = '';
-          if (e instanceof Error) {
-            message = e.message;
-          }
-          return {
-            error: new BaseError(message),
-          };
-        }
-        return {
-          error: null,
-        };
-      };
-      return {
-        error: null,
-        endpoint,
-        document: authentication.oas,
-        request,
-        defaultValues,
-        execute,
-      };
-    },
-    []
-  );
-
   const prepareSigninOAuth = useCallback<
     UseEndpointReturn['prepareSigninOAuth']
   >((endpoint, authentication, defaultValues = {}) => {
@@ -746,79 +633,6 @@ export const useEndpoint = (): UseEndpointReturn => {
     };
   }, []);
 
-  const prepareSigninOidcCallback = useCallback<
-    UseEndpointReturn['prepareSigninOidcCallback']
-  >((endpoint, authentication, defaultValues = {}) => {
-    const authConfig = authentication.list.find(
-      (item) => item.type === 'oidccallback'
-    );
-    if (!authConfig) {
-      return {
-        error: new BaseError('AuthConfig for OIDC callback not found.'),
-      };
-    }
-    const getRequestResult = extractRequest(
-      authentication.oas,
-      authConfig.operationId
-    );
-    if (getRequestResult.isFailure()) {
-      return {
-        error: new OASError('Request object not found.'),
-      };
-    }
-    const request = getRequestResult.value;
-    defaultValues = _.merge(
-      {},
-      {
-        parameters: authConfig.defaultParametersValue,
-        requestBody: replaceWithEnvironmentalVariables<RequestRequestBodyValue>(
-          authConfig.defaultRequestBodyValue || {},
-          {
-            [ENVIRONMENTAL_VARIABLE.OIDC_REDIRECT_URI]: OIDC_REDIRECT_URI,
-          }
-        ),
-      },
-      cleanupRequestValue(request, defaultValues)
-    );
-    const execute = async (requestValue: RequestValue) => {
-      const requestPayloads = constructRequestPayloads(
-        request.operation,
-        requestValue
-      );
-      const requestInfo = constructRequestInfo(
-        endpoint,
-        authentication.oas,
-        request,
-        requestPayloads
-      );
-      const requestInit = constructRequestInit(request, requestPayloads);
-      const [response, responseError] = await promiseErrorHandler(
-        globalThis.fetch(requestInfo, requestInit)
-      );
-      if (!!responseError) {
-        return {
-          error: new NetworkError(responseError.message),
-        };
-      }
-      if (!response.ok) {
-        return {
-          error: await getHTTPError(response),
-        };
-      }
-      return {
-        error: null,
-      };
-    };
-    return {
-      error: null,
-      endpoint,
-      document: authentication.oas,
-      request,
-      defaultValues,
-      execute,
-    };
-  }, []);
-
   const prepareSignout = useCallback<UseEndpointReturn['prepareSignout']>(
     (endpoint, authentication, defaultValues = {}) => {
       const authConfig = authentication.list.find(
@@ -1125,8 +939,6 @@ export const useEndpoint = (): UseEndpointReturn => {
       fetchDocument,
       navigate,
       prepareSigninEmail,
-      prepareSigninOidc,
-      prepareSigninOidcCallback,
       prepareSigninOAuth,
       prepareSigninOAuthCallback,
       prepareSignout,
@@ -1150,8 +962,6 @@ export const useEndpoint = (): UseEndpointReturn => {
       fetchDocument,
       navigate,
       prepareSigninEmail,
-      prepareSigninOidc,
-      prepareSigninOidcCallback,
       prepareSigninOAuth,
       prepareSigninOAuthCallback,
       prepareSignout,
diff --git a/packages/app/src/locales/en/common.json b/packages/app/src/locales/en/common.json
index bd9fec408..40793aaf5 100644
--- a/packages/app/src/locales/en/common.json
+++ b/packages/app/src/locales/en/common.json
@@ -52,9 +52,8 @@
   "importEndpoints": "Import $t(endpoints)",
   "enterEndpoint": "Enter",
   "signout": "Signout",
-  "oidc": "SSO",
-  "oAuth": "Google",
-  "email": "Sign in",
+  "oAuth": "OAuth",
+  "email": "Email",
   "addEndpoint": {
     "title": "Create an $t(endpoint)",
     "idInputLabel": "ID",
diff --git a/packages/app/src/locales/ja/common.json b/packages/app/src/locales/ja/common.json
index 592c56782..cf25f12ec 100644
--- a/packages/app/src/locales/ja/common.json
+++ b/packages/app/src/locales/ja/common.json
@@ -52,9 +52,8 @@
   "importEndpoints": "$t(endpoint)リストのインポート",
   "enterEndpoint": "管理画面",
   "signout": "サインアウト",
-  "oidc": "SSO",
-  "oAuth": "Google",
-  "email": "サインイン",
+  "oAuth": "OAuth",
+  "email": "Email",
   "addEndpoint": {
     "title": "$t(endpoint)の追加",
     "idInputLabel": "タイトル",
diff --git a/packages/app/src/pages/dashboard/endpoints/_/body/item/index.tsx b/packages/app/src/pages/dashboard/endpoints/_/body/item/index.tsx
index 6c6a84850..7728e608e 100644
--- a/packages/app/src/pages/dashboard/endpoints/_/body/item/index.tsx
+++ b/packages/app/src/pages/dashboard/endpoints/_/body/item/index.tsx
@@ -94,7 +94,7 @@ const Item: React.FC<Props> = ({ endpoint }) => {
 
   return (
     <article
-      className={classNames('p-5 border rounded-lg h-full', {
+      className={classNames('p-5 border rounded-2xl h-full', {
         'bg-thm-background border-thm-on-background-low': !error,
         'bg-thm-surface border-transparent': !!error,
       })}
@@ -291,23 +291,13 @@ const SkeltonItem: React.FC<BaseProps> = ({ on }) => {
         <Skelton className="w-10 h-10" on={on} variant="rounded" />
         <Skelton className="text-base w-full flex-1" on={on} variant="text" />
       </div>
-      <div className="flex flex-col mt-6 space-y-1">
+      <div className="flex flex-col mt-4 space-y-1">
         <Skelton className="text-xxs" on={on} variant="text" />
         <Skelton className="text-xxs" on={on} variant="text" />
       </div>
-      <div className="flex justify-center gap-4 mt-2">
-        <div className="flex basis-15 flex-col items-center gap-1">
-          <Skelton className="w-11 h-11" on={on} variant="circular" />
-          <Skelton className="w-full text-xs" on={on} variant="text" />
-        </div>
-        <div className="flex basis-15 flex-col items-center gap-1">
-          <Skelton className="w-11 h-11" on={on} variant="circular" />
-          <Skelton className="w-full text-xs" on={on} variant="text" />
-        </div>
-        <div className="flex basis-15 flex-col items-center gap-1">
-          <Skelton className="w-11 h-11" on={on} variant="circular" />
-          <Skelton className="w-full text-xs" on={on} variant="text" />
-        </div>
+      <div className="mt-4 flex gap-2">
+        <Skelton className="w-full h-8" on={on} variant="circular" />
+        <Skelton className="w-full h-8" on={on} variant="circular" />
       </div>
     </div>
   );
diff --git a/packages/app/src/pages/dashboard/endpoints/_/body/item/signin/index.tsx b/packages/app/src/pages/dashboard/endpoints/_/body/item/signin/index.tsx
index ca49166b8..6e396b7de 100644
--- a/packages/app/src/pages/dashboard/endpoints/_/body/item/signin/index.tsx
+++ b/packages/app/src/pages/dashboard/endpoints/_/body/item/signin/index.tsx
@@ -1,9 +1,7 @@
 import React, { useCallback, useMemo } from 'react';
-import IconButton, { Props as ButtonProps } from '~/components/button/icon';
+import Button, { Props as ButtonProps } from '~/components/button';
 import Error, { useError } from '~/components/error/';
-import GoogleLogo from '~/components/google';
-import Key from '~/components/icon/key/outline';
-import Mail from '~/components/icon/mail/outline';
+import LoginIcon from '~/components/icon/login/outline';
 import Request from '~/components/request';
 import { useEndpoint, UseEndpointReturn } from '~/hooks/endpoint';
 import { useTranslation } from '~/hooks/i18n';
@@ -17,10 +15,6 @@ export type Props = {
 };
 const Signin: React.FC<Props> = ({ endpoint, authentication }) => {
   const { t } = useTranslation();
-  const authConfigOidc = useMemo<AuthConfig | null>(
-    () => authentication.list.find((item) => item.type === 'oidc') || null,
-    [authentication]
-  );
   const authConfigOAuth = useMemo<AuthConfig | null>(
     () => authentication.list.find((item) => item.type === 'oauth') || null,
     [authentication]
@@ -30,11 +24,6 @@ const Signin: React.FC<Props> = ({ endpoint, authentication }) => {
     [authentication]
   );
 
-  const drawerOidc = useDrawer();
-  const handleOidcClick = useCallback<ButtonProps['onClick']>(() => {
-    drawerOidc.open();
-  }, [drawerOidc]);
-
   const drawerOAuth = useDrawer();
   const handleOAuthClick = useCallback<ButtonProps['onClick']>(() => {
     drawerOAuth.open();
@@ -45,114 +34,44 @@ const Signin: React.FC<Props> = ({ endpoint, authentication }) => {
     drawerEmail.open();
   }, [drawerEmail]);
 
-  return (
-    <div className="flex justify-center gap-4">
-      {authConfigEmail && (
-        <>
-          <label className="flex basis-15 flex-col items-center gap-1">
-            <IconButton
-              className="border border-thm-on-background-low"
-              on={COLOR_SYSTEM.BACKGROUND}
-              onClick={handleEmailClick}
-              rounded
-            >
-              <Mail />
-            </IconButton>
-            <span className="text-xs">{t('email')}</span>
-          </label>
-          <Drawer {...drawerEmail.bind}>
-            <Email endpoint={endpoint} authentication={authentication} />
-          </Drawer>
-        </>
-      )}
-      {authConfigOAuth && (
-        <>
-          <label className="flex basis-15 flex-col items-center gap-1">
-            <IconButton
-              className="border border-thm-on-background-low"
-              on={COLOR_SYSTEM.BACKGROUND}
-              onClick={handleOAuthClick}
-              rounded
-            >
-              <GoogleLogo />
-            </IconButton>
-            <span className="text-xs">{t('oAuth')}</span>
-          </label>
-          <Drawer {...drawerOAuth.bind}>
-            <OAuth endpoint={endpoint} authentication={authentication} />
-          </Drawer>
-        </>
-      )}
-      {authConfigOidc && (
-        <>
-          <label className="flex basis-15 flex-col items-center gap-1">
-            <IconButton
-              className="border border-thm-on-background-low"
-              on={COLOR_SYSTEM.BACKGROUND}
-              onClick={handleOidcClick}
-              rounded
-            >
-              <Key />
-            </IconButton>
-            <span className="text-xs">{t('oidc')}</span>
-          </label>
-          <Drawer {...drawerOidc.bind}>
-            <Oidc endpoint={endpoint} authentication={authentication} />
-          </Drawer>
-        </>
-      )}
-    </div>
-  );
-};
-export default Signin;
-
-const Oidc: React.FC<{
-  endpoint: Endpoint;
-  authentication: Authentication;
-}> = ({ endpoint, authentication }) => {
-  const { prepareSigninOidc } = useEndpoint();
-  const signinOidc = useMemo<
-    ReturnType<UseEndpointReturn['prepareSigninOidc']>
-  >(
-    () => prepareSigninOidc(endpoint, authentication),
-    [authentication, endpoint, prepareSigninOidc]
-  );
-  const error = useError({ on: COLOR_SYSTEM.SURFACE, withModal: true });
-  const setError = error.setError;
-
-  const handleSubmit = useCallback(
-    async (requestValue: RequestValue) => {
-      if (signinOidc.error) {
-        return;
-      }
-      const result = await signinOidc.execute(requestValue);
-      if (result.error) {
-        setError(result.error);
-        return;
-      }
-    },
-    [setError, signinOidc]
-  );
-
-  if (signinOidc.error) {
-    return <Error on={COLOR_SYSTEM.BACKGROUND} error={signinOidc.error} />;
-  }
-
   return (
     <>
-      <Request
-        on={COLOR_SYSTEM.SURFACE}
-        className="h-full"
-        endpoint={signinOidc.endpoint}
-        document={signinOidc.document}
-        defaultValues={signinOidc.defaultValues}
-        request={signinOidc.request}
-        onSubmit={handleSubmit}
-      />
-      <Error.renewal {...error.bind} withModal={true} />
+      <div className="flex items-center gap-2">
+        {authConfigOAuth && (
+          <Button
+            variant="outlined"
+            className="grow max-w-50%"
+            on={COLOR_SYSTEM.BACKGROUND}
+            IconRight={LoginIcon}
+            label={t('oAuth')}
+            onClick={handleOAuthClick}
+          />
+        )}
+        {authConfigEmail && (
+          <Button
+            variant="outlined"
+            className="grow max-w-50%"
+            on={COLOR_SYSTEM.BACKGROUND}
+            IconRight={LoginIcon}
+            label={t('email')}
+            onClick={handleEmailClick}
+          />
+        )}
+      </div>
+      <Drawer {...drawerOAuth.bind}>
+        {authConfigOAuth && (
+          <OAuth endpoint={endpoint} authentication={authentication} />
+        )}
+      </Drawer>
+      <Drawer {...drawerEmail.bind}>
+        {authConfigEmail && (
+          <Email endpoint={endpoint} authentication={authentication} />
+        )}
+      </Drawer>
     </>
   );
 };
+export default Signin;
 
 const OAuth: React.FC<{
   endpoint: Endpoint;
diff --git a/packages/app/src/pages/oidcredirect/_/appBar/index.tsx b/packages/app/src/pages/oidcredirect/_/appBar/index.tsx
deleted file mode 100644
index d9affd1f5..000000000
--- a/packages/app/src/pages/oidcredirect/_/appBar/index.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React, { useCallback } from 'react';
-import { SIZE as BUTTON_SIZE } from '~/components/button';
-import Button from '~/components/button';
-import MenuAlt1Icon from '~/components/icon/menuAlt1/outline';
-import { Props as LayoutProps } from '~/layouts';
-import { useAppScreenGlobalStateValue } from '~/store';
-import { COLOR_SYSTEM } from '~/types';
-
-type Props = Parameters<NonNullable<LayoutProps['renderAppBar']>>[0];
-const AppBar: React.FC<Props> = ({ className = '', openNavigation }) => {
-  const { lg } = useAppScreenGlobalStateValue();
-  const handleNavButtonClick = useCallback(() => {
-    openNavigation();
-  }, [openNavigation]);
-
-  return (
-    <div className={className}>
-      <div className="flex justify-center items-center h-full px-4">
-        <div className="flex-none">
-          {!lg && (
-            <Button
-              variant="text"
-              on={COLOR_SYSTEM.PRIMARY}
-              size={BUTTON_SIZE.XL}
-              Icon={MenuAlt1Icon}
-              onClick={handleNavButtonClick}
-            />
-          )}
-        </div>
-        <div className="flex-1 min-w-0" />
-      </div>
-    </div>
-  );
-};
-export default AppBar;
diff --git a/packages/app/src/pages/oidcredirect/_/body/index.tsx b/packages/app/src/pages/oidcredirect/_/body/index.tsx
deleted file mode 100644
index d0eaa8d88..000000000
--- a/packages/app/src/pages/oidcredirect/_/body/index.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-import classnames from 'classnames';
-import { parse } from 'query-string';
-import React, { useCallback, useEffect, useState } from 'react';
-import Error, { useError } from '~/components/error';
-import Request from '~/components/request';
-import Spinner from '~/components/spinner';
-import { BaseError } from '~/errors';
-import { useEndpoint, UseEndpointReturn } from '~/hooks/endpoint';
-import { Props as LayoutProps } from '~/layouts';
-import { KEY, get } from '~/storage';
-import { useEndpointListItemGlobalStateValue } from '~/store';
-import { COLOR_SYSTEM, EndpointID } from '~/types';
-import { RequestValue } from '~/types/oas';
-
-export type Props = Parameters<LayoutProps['renderBody']>[0] & {
-  search: string;
-};
-const Body: React.FC<Props> = ({ className = '', search }) => {
-  const error = useError({ on: COLOR_SYSTEM.SURFACE, withModal: true });
-  const setError = error.setError;
-  const [isPending, setIsPending] = useState<boolean>(true);
-  const endpoint = useEndpointListItemGlobalStateValue({
-    id: get<EndpointID>(KEY.OIDC_ENDPOINT_ID),
-  });
-  const { prepareSigninOidcCallback, connect, fetchDocument, navigate } =
-    useEndpoint();
-  const [signinOidcCallback, setSigninOidcCallback] = useState<ReturnType<
-    UseEndpointReturn['prepareSigninOidcCallback']
-  > | null>(null);
-
-  useEffect(() => {
-    setError(null);
-    setIsPending(true);
-    if (!endpoint) {
-      setError(new BaseError('Endpoint Not Found.'));
-      setIsPending(false);
-      return;
-    }
-    const f = async () => {
-      const connection = await connect(endpoint.url);
-      if (connection.error) {
-        setError(connection.error);
-        setIsPending(false);
-        return;
-      }
-      const fetchDocumentResult = await fetchDocument(endpoint);
-      if (fetchDocumentResult.error) {
-        setError(fetchDocumentResult.error);
-        setIsPending(false);
-        return;
-      }
-      const { authentication } = fetchDocumentResult;
-      const queries = parse(search);
-      const signinOidcCallback = prepareSigninOidcCallback(
-        endpoint,
-        authentication,
-        {
-          parameters: queries,
-          requestBody: queries,
-        }
-      );
-      setSigninOidcCallback(signinOidcCallback);
-      setIsPending(false);
-    };
-    f();
-  }, [
-    endpoint,
-    connect,
-    fetchDocument,
-    setError,
-    search,
-    prepareSigninOidcCallback,
-  ]);
-
-  const handleSubmit = useCallback(
-    async (requestValue: RequestValue) => {
-      if (!endpoint) {
-        return;
-      }
-      if (!signinOidcCallback) {
-        return;
-      }
-      if (signinOidcCallback.error) {
-        return;
-      }
-      const result = await signinOidcCallback.execute(requestValue);
-      if (result.error) {
-        error.setError(result.error);
-        return;
-      }
-      navigate(endpoint);
-    },
-    [endpoint, error, navigate, signinOidcCallback]
-  );
-
-  if (isPending) {
-    return (
-      <div
-        className={classnames(
-          'p-4 flex justify-center items-center h-full',
-          className
-        )}
-      >
-        <Spinner className="w-8" on={COLOR_SYSTEM.BACKGROUND} />
-      </div>
-    );
-  }
-  if (!signinOidcCallback) {
-    return null;
-  }
-  if (signinOidcCallback.error) {
-    return (
-      <div className={classnames('p-4', className)}>
-        <Error on={COLOR_SYSTEM.BACKGROUND} error={signinOidcCallback.error} />
-      </div>
-    );
-  }
-
-  return (
-    <div>
-      <Request
-        on={COLOR_SYSTEM.BACKGROUND}
-        endpoint={signinOidcCallback.endpoint}
-        document={signinOidcCallback.document}
-        request={signinOidcCallback.request}
-        defaultValues={signinOidcCallback.defaultValues}
-        onSubmit={handleSubmit}
-      />
-      <Error.renewal {...error.bind} withModal={true} />
-    </div>
-  );
-};
-export default Body;
diff --git a/packages/app/src/pages/oidcredirect/_/navigation/index.tsx b/packages/app/src/pages/oidcredirect/_/navigation/index.tsx
deleted file mode 100644
index a807f45e5..000000000
--- a/packages/app/src/pages/oidcredirect/_/navigation/index.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import classnames from 'classnames';
-import React, { useCallback } from 'react';
-import Logo from '~/components/logo';
-import Navigation, { Props as NavigationProps } from '~/components/navigation';
-import NavigationLinks from '~/components/navigation/links';
-import NavigationServices from '~/components/navigation/services';
-import NavigationVersion from '~/components/navigation/version';
-import { Props as LayoutProps } from '~/layouts';
-import { COLOR_SYSTEM } from '~/types';
-
-type Props = Parameters<NonNullable<LayoutProps['renderNavigation']>>[0];
-const _Navigation: React.FC<Props> = ({ className }) => {
-  const renderHead = useCallback<NonNullable<NavigationProps['renderHead']>>(
-    () => (
-      <div className="flex flex-col gap-2 items-center py-8">
-        <Logo
-          className="h-12 drop-shadow-01dp"
-          left="text-thm-on-surface-high"
-          right="text-thm-on-surface"
-        />
-        <div className="text-thm-on-surface text-xs font-bold text-center">
-          Give OAS, <br />
-          Get GUI.
-        </div>
-      </div>
-    ),
-    []
-  );
-
-  const renderTail = useCallback<NonNullable<NavigationProps['renderTail']>>(
-    () => (
-      <div className="p-2">
-        <div className="flex justify-center py-2 border-t border-dotted border-thm-on-surface-slight">
-          <NavigationLinks on={COLOR_SYSTEM.SURFACE} />
-        </div>
-        <div className="flex justify-center py-2 border-t border-dotted border-thm-on-surface-slight">
-          <NavigationServices on={COLOR_SYSTEM.SURFACE} />
-        </div>
-        <div className="flex justify-center py-2 border-t border-dotted border-thm-on-surface-slight">
-          <NavigationVersion on={COLOR_SYSTEM.SURFACE} />
-        </div>
-      </div>
-    ),
-    []
-  );
-
-  return (
-    <Navigation
-      on={COLOR_SYSTEM.SURFACE}
-      className={classnames(className, 'h-full')}
-      renderHead={renderHead}
-      renderTail={renderTail}
-    />
-  );
-};
-export default _Navigation;
diff --git a/packages/app/src/pages/oidcredirect/index.tsx b/packages/app/src/pages/oidcredirect/index.tsx
deleted file mode 100644
index e0d3ad3c8..000000000
--- a/packages/app/src/pages/oidcredirect/index.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { PageProps, graphql } from 'gatsby';
-import React, { useCallback } from 'react';
-import Metadata from '~/components/metadata';
-import useTheme from '~/hooks/theme';
-import Layout, { Props as LayoutProps } from '~/layouts';
-import AppBar from './_/appBar';
-import Body from './_/body';
-import Navigation from './_/navigation';
-
-type Props = PageProps;
-const OidcRedirectPage: React.FC<Props> = ({ location }) => {
-  useTheme();
-
-  const renderAppBar = useCallback<NonNullable<LayoutProps['renderAppBar']>>(
-    (args) => <AppBar {...args} />,
-    []
-  );
-
-  const renderNavigation = useCallback<
-    NonNullable<LayoutProps['renderNavigation']>
-  >((args) => <Navigation {...args} />, []);
-
-  const renderBody = useCallback<LayoutProps['renderBody']>(
-    (args) => <Body {...args} search={location.search} />,
-    [location.search]
-  );
-
-  return (
-    <>
-      <Metadata title="OIDC" />
-      <Layout
-        renderAppBar={renderAppBar}
-        renderNavigation={renderNavigation}
-        renderBody={renderBody}
-      />
-    </>
-  );
-};
-export default OidcRedirectPage;
-
-export const query = graphql`
-  query ($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
-  }
-`;
diff --git a/packages/app/src/storage/index.ts b/packages/app/src/storage/index.ts
index 98de490dc..83bf7fe82 100644
--- a/packages/app/src/storage/index.ts
+++ b/packages/app/src/storage/index.ts
@@ -4,7 +4,6 @@ export const KEY = {
   ENDPOINT_LIST: 'endpointList',
   ENDPOINT_GROUP_LIST: 'endpointGroupList',
   OAUTH_ENDPOINT_ID: 'oauthEndpointId',
-  OIDC_ENDPOINT_ID: 'oidcEndpointId',
 } as const;
 export type Key = (typeof KEY)[keyof typeof KEY];
 
diff --git a/packages/app/src/types/index.ts b/packages/app/src/types/index.ts
index eb00c7c28..abe4a70e7 100644
--- a/packages/app/src/types/index.ts
+++ b/packages/app/src/types/index.ts
@@ -54,13 +54,7 @@ export type Authentication = {
 };
 
 export type AuthConfig = {
-  type:
-    | 'email'
-    | 'oauth'
-    | 'oauthcallback'
-    | 'signout'
-    | 'oidc'
-    | 'oidccallback';
+  type: 'email' | 'oauth' | 'oauthcallback' | 'signout';
   provider: 'viron' | 'google' | 'signout';
   operationId: OperationId;
   mode?: 'navigate' | 'cors';
diff --git a/packages/nodejs/__tests__/domains/adminuser.test.ts b/packages/nodejs/__tests__/domains/adminuser.test.ts
index efaffdda8..08479d7d0 100644
--- a/packages/nodejs/__tests__/domains/adminuser.test.ts
+++ b/packages/nodejs/__tests__/domains/adminuser.test.ts
@@ -55,11 +55,6 @@ describe('domains/adminuser', () => {
             googleOAuth2IdToken: null,
             googleOAuth2RefreshToken: null,
             googleOAuth2TokenType: null,
-            oidcAccessToken: null,
-            oidcExpiryDate: null,
-            oidcIdToken: null,
-            oidcRefreshToken: null,
-            oidcTokenType: null,
           },
         ],
         maxPage: 1,
@@ -104,11 +99,6 @@ describe('domains/adminuser', () => {
           googleOAuth2IdToken: null,
           googleOAuth2RefreshToken: null,
           googleOAuth2TokenType: null,
-          oidcAccessToken: null,
-          oidcExpiryDate: null,
-          oidcIdToken: null,
-          oidcRefreshToken: null,
-          oidcTokenType: null,
         });
 
       const result = await createOne(data);
@@ -148,11 +138,6 @@ describe('domains/adminuser', () => {
           googleOAuth2IdToken: null,
           googleOAuth2RefreshToken: null,
           googleOAuth2TokenType: null,
-          oidcAccessToken: null,
-          oidcExpiryDate: null,
-          oidcIdToken: null,
-          oidcRefreshToken: null,
-          oidcTokenType: null,
         });
       sandbox
         .stub(domainsAdminrole, 'updateRolesForUser')
@@ -187,11 +172,6 @@ describe('domains/adminuser', () => {
         googleOAuth2IdToken: null,
         googleOAuth2RefreshToken: null,
         googleOAuth2TokenType: null,
-        oidcAccessToken: null,
-        oidcExpiryDate: null,
-        oidcIdToken: null,
-        oidcRefreshToken: null,
-        oidcTokenType: null,
       });
       sandbox
         .stub(repository, 'updateOneById')
@@ -247,11 +227,6 @@ describe('domains/adminuser', () => {
         googleOAuth2IdToken: null,
         googleOAuth2RefreshToken: null,
         googleOAuth2TokenType: null,
-        oidcAccessToken: null,
-        oidcExpiryDate: null,
-        oidcIdToken: null,
-        oidcRefreshToken: null,
-        oidcTokenType: null,
       });
       sandbox.stub(repository, 'removeOneById').withArgs(id).resolves();
       sandbox
@@ -293,11 +268,6 @@ describe('domains/adminuser', () => {
         googleOAuth2IdToken: null,
         googleOAuth2RefreshToken: null,
         googleOAuth2TokenType: null,
-        oidcAccessToken: null,
-        oidcExpiryDate: null,
-        oidcIdToken: null,
-        oidcRefreshToken: null,
-        oidcTokenType: null,
       });
       sandbox.stub(domainsAdminrole, 'listRoles').withArgs(id).resolves([]);
 
@@ -338,11 +308,6 @@ describe('domains/adminuser', () => {
           googleOAuth2IdToken: null,
           googleOAuth2RefreshToken: null,
           googleOAuth2TokenType: null,
-          oidcAccessToken: null,
-          oidcExpiryDate: null,
-          oidcIdToken: null,
-          oidcRefreshToken: null,
-          oidcTokenType: null,
         });
       sandbox.stub(domainsAdminrole, 'listRoles').withArgs(id).resolves([]);
 
diff --git a/packages/nodejs/__tests__/domains/auth/oidc.test.ts b/packages/nodejs/__tests__/domains/auth/oidc.test.ts
deleted file mode 100644
index 23a069465..000000000
--- a/packages/nodejs/__tests__/domains/auth/oidc.test.ts
+++ /dev/null
@@ -1,1283 +0,0 @@
-import assert from 'assert';
-import sinon from 'sinon';
-import { generators, Issuer, Client, IdTokenClaims } from 'openid-client';
-import * as domainAuthOidc from '../../../src/domains/auth/oidc';
-import { initJwt } from '../../../src/domains/auth';
-import {
-  unsupportedScope,
-  invalidOidcIdToken,
-  forbidden,
-  signinFailed,
-  VironError,
-  faildDecodeOidcIdToken,
-  mismatchKidOidcIdToken,
-} from '../../../src/errors';
-import {
-  findOneByEmail,
-  createOne,
-  AdminUser,
-  AdminUserCreateAttributes,
-  AdminUserUpdateAttributes,
-} from '../../../src/domains/adminuser';
-import { Repository, repositoryContainer } from '../../../src/repositories';
-import { addRoleForUser, listRoles } from '../../../src/domains/adminrole';
-import { AUTH_TYPE, ADMIN_ROLE } from '../../../src/constants';
-import jwt, { TokenExpiredError } from 'jsonwebtoken';
-
-describe('domains/auth/oidc', () => {
-  // 共有の設定
-  const redirectUri = 'https://example.com/oidcredirect';
-  const defaultConfig = {
-    clientId: 'oidc-client-id',
-    clientSecret: 'oidc-client-secret',
-    configurationUrl: 'https://example.com/.well-known/openid-configuration',
-    additionalScopes: [],
-  };
-
-  let repository: Repository<
-    AdminUser,
-    AdminUserCreateAttributes,
-    AdminUserUpdateAttributes
-  >;
-
-  beforeAll(() => {
-    repository = repositoryContainer.getAdminUserRepository();
-  });
-
-  const sandbox = sinon.createSandbox();
-  afterEach(() => {
-    sandbox.restore();
-  });
-
-  describe('genOidcClient', () => {
-    it('OIDCクライアントの生成に成功する', async () => {
-      // デフォルト設定でのテスト
-      const config = defaultConfig;
-
-      // モック作成
-      const mockClient = {} as unknown as Client;
-      const clientStub = sandbox.stub().returns(mockClient);
-      const mockIssuer = {
-        metadata: { scopes_supported: ['openid', 'email'] },
-        Client: clientStub,
-      } as unknown as Issuer<Client>;
-      const discoverStub = sandbox
-        .stub(Issuer, 'discover')
-        .resolves(mockIssuer);
-
-      // テスト対象の関数を呼び出し
-      await domainAuthOidc.genOidcClient(config, redirectUri);
-
-      // モックが期待通りに呼び出されたか確認
-      sinon.assert.calledOnceWithExactly(discoverStub, config.configurationUrl);
-      sinon.assert.calledOnceWithExactly(clientStub, {
-        client_id: config.clientId,
-        client_secret: config.clientSecret,
-        redirect_uris: [redirectUri],
-        response_types: ['code'],
-      });
-    });
-    it('キャッシュされたOIDCクライアントが返却される', async () => {
-      // デフォルト設定でのテスト
-      const config = defaultConfig;
-
-      // モック作成
-      const mockClient = {} as unknown as Client;
-      const clientStub = sandbox.stub().returns(mockClient);
-      const mockIssuer = {
-        metadata: { scopes_supported: ['openid', 'email'] },
-        Client: clientStub,
-      } as unknown as Issuer<Client>;
-      const discoverStub = sandbox
-        .stub(Issuer, 'discover')
-        .resolves(mockIssuer);
-
-      // テスト対象の関数を呼び出し
-      // 一時呼び出してキャッシュされたOIDCクライアントを取得
-      const firstCallOidcClient = await domainAuthOidc.genOidcClient(
-        config,
-        redirectUri,
-        true
-      );
-      // 二度目の呼び出しでキャッシュされたOIDCクライアントを取得
-      const secondCallOidcClient = await domainAuthOidc.genOidcClient(
-        config,
-        redirectUri
-      );
-
-      // モックが期待通りに呼び出されたか確認
-      sinon.assert.calledOnceWithExactly(discoverStub, config.configurationUrl);
-      sinon.assert.calledOnceWithExactly(clientStub, {
-        client_id: config.clientId,
-        client_secret: config.clientSecret,
-        redirect_uris: [redirectUri],
-        response_types: ['code'],
-      });
-
-      assert.strictEqual(firstCallOidcClient, secondCallOidcClient);
-    });
-    it('サポートされてないscopeがある場合はエラー', async () => {
-      // 追加スコープにoffline_accessを追加
-      const config = {
-        ...defaultConfig,
-        additionalScopes: ['offline_access'],
-      };
-
-      // モックの作成
-      const mockIssuer = {
-        metadata: { scopes_supported: ['openid', 'email'] },
-      } as unknown as Issuer<Client>;
-      const discoverStub = sandbox
-        .stub(Issuer, 'discover')
-        .resolves(mockIssuer);
-
-      // テスト対象の関数を呼び出し
-      await assert.rejects(
-        domainAuthOidc.genOidcClient(config, redirectUri, true),
-        unsupportedScope()
-      );
-
-      // モックが期待通りに呼び出されたか確認
-      sinon.assert.calledOnceWithExactly(discoverStub, config.configurationUrl);
-    });
-  });
-
-  describe('genOidcCodeVerifier', () => {
-    it('OIDCのcodeVerifierの生成', async () => {
-      const codeVerifierStub = sandbox
-        .stub(generators, 'codeVerifier')
-        .resolves('code-verifier');
-      const result = await domainAuthOidc.genOidcCodeVerifier();
-      assert.strictEqual(result, 'code-verifier');
-      sinon.assert.calledOnceWithExactly(codeVerifierStub);
-    });
-  });
-
-  describe('getOidcAuthorizationUrl', () => {
-    const state = 'XXXXXXX';
-    const scope = 'openid email';
-    const responseType = 'code';
-    const codeVerifier = 'YYYYYYY';
-    const config = defaultConfig;
-    const codeChallengeMethod = 'S256';
-    const codeChallenge = generators.codeChallenge(codeVerifier);
-    const authorizationEndpoint = 'https://idp.jp/oidc/authz';
-    const url = new URL(authorizationEndpoint);
-    url.searchParams.append('client_id', config.clientId);
-    url.searchParams.append('scope', scope);
-    url.searchParams.append('response_type', responseType);
-    url.searchParams.append('redirect_uri', redirectUri);
-    url.searchParams.append('code_challenge', codeChallenge);
-    url.searchParams.append('code_challenge_method', codeChallengeMethod);
-    url.searchParams.append('state', state);
-    const authorizationUrl = url.toString();
-    it('OIDCのIdpへの認証画面URL生成に成功する additionalScopesあり', async () => {
-      // テストデータ
-      const config = {
-        ...defaultConfig,
-        additionalScopes: ['offline_access'],
-      };
-
-      // モックのClientを作成
-      const authorizationUrlStub = sandbox.stub().returns(authorizationUrl);
-      const mockClient = {
-        authorizationUrl: authorizationUrlStub,
-      } as unknown as Client;
-
-      // モックのIssuerを作成
-      const clientStub = sandbox.stub().returns(mockClient);
-      const mockIssuer = {
-        Client: clientStub,
-        metadata: {},
-        keystore: sandbox.stub(),
-      } as unknown as Issuer<Client>;
-
-      // Issuer.discover をモック
-      const discoverStub = sandbox
-        .stub(Issuer, 'discover')
-        .resolves(mockIssuer);
-
-      // テスト対象の関数を呼び出し
-      const client = await domainAuthOidc.genOidcClient(
-        config,
-        redirectUri,
-        true
-      );
-      const result = await domainAuthOidc.getOidcAuthorizationUrl(
-        config,
-        client,
-        codeVerifier,
-        state
-      );
-
-      // モックが期待通りに呼び出されたか確認
-      sinon.assert.calledOnceWithExactly(discoverStub, config.configurationUrl);
-      sinon.assert.calledOnceWithExactly(clientStub, {
-        client_id: config.clientId,
-        client_secret: config.clientSecret,
-        redirect_uris: [redirectUri],
-        response_types: [responseType],
-      });
-      sinon.assert.calledOnceWithExactly(authorizationUrlStub, {
-        scope: `${scope} offline_access`,
-        state,
-        code_challenge: codeChallenge,
-        code_challenge_method: codeChallengeMethod,
-      });
-
-      // 結果の検証
-      assert.strictEqual(result, authorizationUrl);
-      const resultUrl = new URL(result);
-      assert.strictEqual(resultUrl.searchParams.get('state'), state);
-      assert.strictEqual(
-        resultUrl.searchParams.get('client_id'),
-        config.clientId
-      );
-    });
-    it('OIDCのIdpへの認証画面URL生成に成功する additionalScopesなし', async () => {
-      // テストデータ
-      const config = defaultConfig;
-
-      // モックのClientを作成
-      const authorizationUrlStub = sandbox.stub().returns(authorizationUrl);
-      const mockClient = {
-        authorizationUrl: authorizationUrlStub,
-      } as unknown as Client;
-
-      // モックのIssuerを作成
-      const clientStub = sandbox.stub().returns(mockClient);
-      const mockIssuer = {
-        Client: clientStub,
-        metadata: {},
-        keystore: sandbox.stub(),
-      } as unknown as Issuer<Client>;
-
-      // Issuer.discover をモック
-      const discoverStub = sandbox
-        .stub(Issuer, 'discover')
-        .resolves(mockIssuer);
-
-      // テスト対象の関数を呼び出し
-      const client = await domainAuthOidc.genOidcClient(
-        config,
-        redirectUri,
-        true
-      );
-      const result = await domainAuthOidc.getOidcAuthorizationUrl(
-        config,
-        client,
-        codeVerifier,
-        state
-      );
-
-      // モックが期待通りに呼び出されたか確認
-      sinon.assert.calledOnceWithExactly(discoverStub, config.configurationUrl);
-      sinon.assert.calledOnceWithExactly(clientStub, {
-        client_id: config.clientId,
-        client_secret: config.clientSecret,
-        redirect_uris: [redirectUri],
-        response_types: [responseType],
-      });
-      sinon.assert.calledOnceWithExactly(authorizationUrlStub, {
-        scope,
-        state,
-        code_challenge: codeChallenge,
-        code_challenge_method: codeChallengeMethod,
-      });
-
-      // 結果の検証
-      assert.strictEqual(result, authorizationUrl);
-      const resultUrl = new URL(result);
-      assert.strictEqual(resultUrl.searchParams.get('state'), state);
-      assert.strictEqual(
-        resultUrl.searchParams.get('client_id'),
-        config.clientId
-      );
-    });
-    it('OIDCのIdpへの認証画面URL生成に成功する', async () => {
-      // テストデータ
-      const state = 'XXXXXXX';
-      const scope = 'openid email';
-      const responseType = 'code';
-      const codeVerifier = 'YYYYYYY';
-      const config = defaultConfig;
-      const codeChallengeMethod = 'S256';
-      const codeChallenge = generators.codeChallenge(codeVerifier);
-      const authorizationEndpoint = 'https://idp.jp/oidc/authz';
-      const url = new URL(authorizationEndpoint);
-      url.searchParams.append('client_id', config.clientId);
-      url.searchParams.append('scope', scope);
-      url.searchParams.append('response_type', responseType);
-      url.searchParams.append('redirect_uri', redirectUri);
-      url.searchParams.append('code_challenge', codeChallenge);
-      url.searchParams.append('code_challenge_method', codeChallengeMethod);
-      url.searchParams.append('state', state);
-      const authorizationUrl = url.toString();
-
-      // モックのClientを作成
-      const authorizationUrlStub = sandbox.stub().returns(authorizationUrl);
-      const mockClient = {
-        authorizationUrl: authorizationUrlStub,
-      } as unknown as Client;
-
-      // モックのIssuerを作成
-      const clientStub = sandbox.stub().returns(mockClient);
-      const mockIssuer = {
-        Client: clientStub,
-        metadata: {},
-        keystore: sandbox.stub(),
-      } as unknown as Issuer<Client>;
-
-      // Issuer.discover をモック
-      const discoverStub = sandbox
-        .stub(Issuer, 'discover')
-        .resolves(mockIssuer);
-
-      // テスト対象の関数を呼び出し
-      const client = await domainAuthOidc.genOidcClient(
-        config,
-        redirectUri,
-        true
-      );
-      const result = await domainAuthOidc.getOidcAuthorizationUrl(
-        config,
-        client,
-        codeVerifier,
-        state
-      );
-
-      // モックが期待通りに呼び出されたか確認
-      sinon.assert.calledOnceWithExactly(discoverStub, config.configurationUrl);
-      sinon.assert.calledOnceWithExactly(clientStub, {
-        client_id: config.clientId,
-        client_secret: config.clientSecret,
-        redirect_uris: [redirectUri],
-        response_types: [responseType],
-      });
-      sinon.assert.calledOnceWithExactly(authorizationUrlStub, {
-        scope,
-        state,
-        code_challenge: codeChallenge,
-        code_challenge_method: codeChallengeMethod,
-      });
-
-      // 結果の検証
-      assert.strictEqual(result, authorizationUrl);
-      const resultUrl = new URL(result);
-      assert.strictEqual(resultUrl.searchParams.get('state'), state);
-      assert.strictEqual(
-        resultUrl.searchParams.get('client_id'),
-        config.clientId
-      );
-    });
-  });
-
-  describe('signinOidc', () => {
-    // 共通の設定
-    const codeVerifier = 'valid-code-verifier';
-    const params = { state: 'state', code: 'auth-code' };
-
-    beforeAll(() => {
-      initJwt({
-        secret: 'test',
-        provider: 'oidc',
-      });
-    });
-
-    it('スーパーユーザーの初回ログインに成功する', async () => {
-      // テストデータ
-      const config = {
-        ...defaultConfig,
-        userHostedDomains: ['example.com'],
-      };
-
-      // モックの作成
-      const mockTokenSet = {
-        access_token: 'xxxxx',
-        id_token: 'yyyyy',
-        claims: (): IdTokenClaims => ({
-          email: 'super_user@example.com',
-          sub: 'sub',
-          aud: 'aud',
-          exp: 1737455830,
-          iat: 1737455830,
-          iss: 'iss',
-        }),
-        expired: (): boolean => false,
-      };
-      const callbackStub = sandbox.stub().resolves(mockTokenSet);
-      const mockClient = {
-        callback: callbackStub,
-      } as unknown as Client;
-      sandbox.stub(repository, 'count').withArgs().resolves(0);
-
-      // テスト対象の関数を呼び出し
-      const result = await domainAuthOidc.signinOidc(
-        mockClient,
-        codeVerifier,
-        redirectUri,
-        params,
-        config
-      );
-
-      // スタブ呼び出し確認
-      sinon.assert.calledOnceWithExactly(callbackStub, redirectUri, params, {
-        code_verifier: codeVerifier,
-        state: params.state,
-      });
-
-      // 結果の検証
-      expect(result).toMatch(/^Bearer /);
-
-      // ユーザーが正しく作成されたか確認
-      const actual = await findOneByEmail(
-        mockTokenSet.claims().email as string
-      );
-      assert.strictEqual(actual?.authType, AUTH_TYPE.OIDC);
-      assert.strictEqual(actual?.email, mockTokenSet.claims().email);
-      assert.strictEqual(actual?.oidcAccessToken, mockTokenSet.access_token);
-      assert.strictEqual(actual?.oidcIdToken, mockTokenSet.id_token);
-
-      // ロールが正しく設定されているか確認
-      const roleIds = await listRoles(actual?.id);
-      assert.strictEqual(roleIds[0], ADMIN_ROLE.SUPER);
-    });
-
-    it('サインイン時にidTokenが取得できないエラー', async () => {
-      // テストデータ
-      const config = {
-        ...defaultConfig,
-        userHostedDomains: ['example.com'],
-      };
-
-      // モックの作成
-      const mockTokenSet = {
-        access_token: 'xxxxx',
-        claims: (): IdTokenClaims => ({
-          email: 'user@example.com',
-          sub: 'sub',
-          aud: 'aud',
-          exp: 1737455830,
-          iat: 1737455830,
-          iss: 'iss',
-        }),
-        expired: (): boolean => false,
-      };
-      const callbackStub = sandbox.stub().resolves(mockTokenSet);
-      const mockClient = {
-        callback: callbackStub,
-      } as unknown as Client;
-
-      // テスト対象の関数を呼び出し
-      await assert.rejects(
-        domainAuthOidc.signinOidc(
-          mockClient,
-          codeVerifier,
-          redirectUri,
-          params,
-          config
-        ),
-        invalidOidcIdToken()
-      );
-
-      // スタブ呼び出し確認
-      sinon.assert.calledOnceWithExactly(callbackStub, redirectUri, params, {
-        code_verifier: codeVerifier,
-        state: params.state,
-      });
-    });
-
-    it('サインイン時にemailが取得できないエラー', async () => {
-      // テストデータ
-      const config = {
-        ...defaultConfig,
-        userHostedDomains: ['example.com'],
-      };
-
-      // モックの作成
-      const mockTokenSet = {
-        access_token: 'xxxxx',
-        id_token: 'yyyyy',
-        claims: (): IdTokenClaims => ({
-          sub: 'sub',
-          aud: 'aud',
-          exp: 1737455830,
-          iat: 1737455830,
-          iss: 'iss',
-        }),
-        expired: (): boolean => false,
-      };
-      const callbackStub = sandbox.stub().resolves(mockTokenSet);
-      const mockClient = {
-        callback: callbackStub,
-      } as unknown as Client;
-
-      // テスト対象の関数を呼び出し
-      await assert.rejects(
-        domainAuthOidc.signinOidc(
-          mockClient,
-          codeVerifier,
-          redirectUri,
-          params,
-          config
-        ),
-        invalidOidcIdToken()
-      );
-
-      // スタブ呼び出し確認
-      sinon.assert.calledOnceWithExactly(callbackStub, redirectUri, params, {
-        code_verifier: codeVerifier,
-        state: params.state,
-      });
-    });
-
-    it('サインイン時にemailのドメインが許可対象外エラー', async () => {
-      // テストデータ
-      const config = {
-        ...defaultConfig,
-        userHostedDomains: ['no-example.com'],
-      };
-
-      // モックの作成
-      const mockTokenSet = {
-        access_token: 'xxxxx',
-        id_token: 'yyyyy',
-        claims: (): IdTokenClaims => ({
-          email: 'user@example.com',
-          sub: 'sub',
-          aud: 'aud',
-          exp: 1737455830,
-          iat: 1737455830,
-          iss: 'iss',
-        }),
-        expired: (): boolean => false,
-      };
-      const callbackStub = sandbox.stub().resolves(mockTokenSet);
-      const mockClient = {
-        callback: callbackStub,
-      } as unknown as Client;
-
-      // テスト対象の関数を呼び出し
-      await assert.rejects(
-        domainAuthOidc.signinOidc(
-          mockClient,
-          codeVerifier,
-          redirectUri,
-          params,
-          config
-        ),
-        forbidden()
-      );
-
-      // スタブ呼び出し確認
-      sinon.assert.calledOnceWithExactly(callbackStub, redirectUri, params, {
-        code_verifier: codeVerifier,
-        state: params.state,
-      });
-    });
-
-    it('サインイン時にidTokenの有効期限が切れているエラー', async () => {
-      // テストデータ
-      const config = {
-        ...defaultConfig,
-        userHostedDomains: ['example.com'],
-      };
-
-      // モックの作成
-      const mockTokenSet = {
-        access_token: 'xxxxx',
-        id_token: 'yyyyy',
-        claims: (): IdTokenClaims => ({
-          email: 'user@example.com',
-          sub: 'sub',
-          aud: 'aud',
-          exp: 1737455830,
-          iat: 1737455830,
-          iss: 'iss',
-        }),
-        expired: (): boolean => true,
-      };
-      const callbackStub = sandbox.stub().resolves(mockTokenSet);
-      const mockClient = {
-        callback: callbackStub,
-      } as unknown as Client;
-
-      // テスト対象の関数を呼び出し
-      await assert.rejects(
-        domainAuthOidc.signinOidc(
-          mockClient,
-          codeVerifier,
-          redirectUri,
-          params,
-          config
-        ),
-        forbidden()
-      );
-
-      // スタブ呼び出し確認
-      sinon.assert.calledOnceWithExactly(callbackStub, redirectUri, params, {
-        code_verifier: codeVerifier,
-        state: params.state,
-      });
-    });
-
-    it('ビューアーユーザーの初回ログイン成功', async () => {
-      // テストデータ
-      const config = {
-        ...defaultConfig,
-        userHostedDomains: ['example.com'],
-      };
-
-      // モックの作成
-      const mockTokenSet = {
-        access_token: 'xxxxx',
-        id_token: 'yyyyy',
-        claims: (): IdTokenClaims => ({
-          email: 'viewer@example.com',
-          sub: 'sub',
-          aud: 'aud',
-          exp: 1737455830,
-          iat: 1737455830,
-          iss: 'iss',
-        }),
-        expired: (): boolean => false,
-      };
-      const callbackStub = sandbox.stub().resolves(mockTokenSet);
-      // クライアントのモック
-      const mockClient = {
-        callback: callbackStub,
-      } as unknown as Client;
-
-      // すでにsuperユーザーが存在する状態にする
-      await createOne(
-        {
-          email: 'super@example.com',
-          oidcAccessToken: 'xxxxx',
-          oidcExpiryDate: 1737455830,
-          oidcIdToken: 'yyyyy',
-          oidcRefreshToken: null,
-          oidcTokenType: 'Bearer',
-        },
-        AUTH_TYPE.OIDC
-      );
-
-      // テスト対象の関数を呼び出し
-      const result = await domainAuthOidc.signinOidc(
-        mockClient,
-        codeVerifier,
-        redirectUri,
-        params,
-        config
-      );
-
-      // スタブ呼び出し確認
-      sinon.assert.calledOnceWithExactly(callbackStub, redirectUri, params, {
-        code_verifier: codeVerifier,
-        state: params.state,
-      });
-
-      // 結果の検証
-      expect(result).toMatch(/^Bearer /);
-
-      // ユーザーが正しく作成されたか確認
-      const actual = await findOneByEmail(
-        mockTokenSet.claims().email as string
-      );
-      assert.strictEqual(actual?.authType, AUTH_TYPE.OIDC);
-      assert.strictEqual(actual?.email, mockTokenSet.claims().email);
-      assert.strictEqual(actual?.oidcAccessToken, mockTokenSet.access_token);
-      assert.strictEqual(actual?.oidcIdToken, mockTokenSet.id_token);
-
-      // ロールが正しく設定されているか確認
-      const roleIds = await listRoles(actual?.id);
-      assert.strictEqual(roleIds[0], ADMIN_ROLE.VIEWER);
-    });
-
-    it('登録済みユーザーと認証タイプが違うエラー', async () => {
-      // テストデータ
-      const config = {
-        ...defaultConfig,
-        userHostedDomains: ['example.com'],
-      };
-
-      // モックの作成
-      const mockTokenSet = {
-        access_token: 'xxxxx',
-        id_token: 'yyyyy',
-        claims: (): IdTokenClaims => ({
-          email: 'registered@example.com',
-          sub: 'sub',
-          aud: 'aud',
-          exp: 1737455830,
-          iat: 1737455830,
-          iss: 'iss',
-        }),
-        expired: (): boolean => false,
-      };
-      const callbackStub = sandbox.stub().resolves(mockTokenSet);
-      const mockClient = {
-        callback: callbackStub,
-      } as unknown as Client;
-
-      // すでに同じemailでユーザーが存在する状態にする
-      await createOne(
-        {
-          email: mockTokenSet.claims().email as string,
-          oidcAccessToken: 'xxxxx',
-          oidcExpiryDate: 1737455830,
-          oidcIdToken: 'yyyyy',
-          oidcRefreshToken: null,
-          oidcTokenType: 'Bearer',
-        },
-        AUTH_TYPE.GOOGLE
-      );
-
-      // テスト対象の関数を呼び出し
-      await assert.rejects(
-        domainAuthOidc.signinOidc(
-          mockClient,
-          codeVerifier,
-          redirectUri,
-          params,
-          config
-        ),
-        signinFailed()
-      );
-
-      // スタブ呼び出し確認
-      sinon.assert.calledOnceWithExactly(callbackStub, redirectUri, params, {
-        code_verifier: codeVerifier,
-        state: params.state,
-      });
-    });
-
-    it('登録済みユーザーで再ログインが成功する', async () => {
-      // テストデータ
-      const config = {
-        ...defaultConfig,
-        userHostedDomains: ['example.com'],
-      };
-
-      // モックの作成
-      const mockTokenSet = {
-        access_token: 'xxxxx_updated',
-        id_token: 'yyyyy_updated',
-        claims: (): IdTokenClaims => ({
-          email: 'updated@example.com',
-          sub: 'sub',
-          aud: 'aud',
-          exp: 1737455830,
-          iat: 1737455830,
-          iss: 'iss',
-        }),
-        expired: (): boolean => false,
-      };
-      const callbackStub = sandbox.stub().resolves(mockTokenSet);
-      const mockClient = {
-        callback: callbackStub,
-      } as unknown as Client;
-
-      // すでに同じemailでユーザーが存在する状態にする
-      const registeredUser = await createOne(
-        {
-          email: mockTokenSet.claims().email as string,
-          oidcAccessToken: 'xxxxx',
-          oidcExpiryDate: 1737455830,
-          oidcIdToken: 'yyyyy',
-          oidcRefreshToken: null,
-          oidcTokenType: 'Bearer',
-        },
-        AUTH_TYPE.OIDC
-      );
-      await addRoleForUser(registeredUser.id, ADMIN_ROLE.VIEWER);
-
-      // signinOidc関数を実行して結果を取得
-      await domainAuthOidc.signinOidc(
-        mockClient,
-        codeVerifier,
-        redirectUri,
-        params,
-        config
-      );
-
-      // スタブ呼び出し確認
-      sinon.assert.calledOnceWithExactly(callbackStub, redirectUri, params, {
-        code_verifier: codeVerifier,
-        state: params.state,
-      });
-
-      // ユーザーが正しく更新されたか確認
-      const actual = await findOneByEmail(
-        mockTokenSet.claims().email as string
-      );
-      assert.strictEqual(actual?.authType, AUTH_TYPE.OIDC);
-      assert.strictEqual(actual?.email, mockTokenSet.claims().email);
-      assert.strictEqual(actual?.oidcAccessToken, mockTokenSet.access_token);
-      assert.strictEqual(actual?.oidcIdToken, mockTokenSet.id_token);
-
-      // ロールが正しく設定されているか確認
-      const roleIds = await listRoles(actual?.id);
-      assert.strictEqual(roleIds[0], ADMIN_ROLE.VIEWER);
-    });
-  });
-
-  describe('verifyOidcAccessToken', () => {
-    it('リフレッシュトークンがある場合にアクセストークンをリフレッシュする', async () => {
-      // テストデータ
-      const config = defaultConfig;
-
-      // モックの作成
-      const mockTokenSet = {
-        access_token: 'xxxxx_updated',
-        id_token: 'yyyyy_updated',
-        refresh_token: 'zzzzz',
-        claims: (): IdTokenClaims => ({
-          email: 'verify-access-token@example.com',
-          sub: 'sub',
-          aud: 'aud',
-          exp: 1737455830,
-          iat: 1737455830,
-          iss: 'iss',
-        }),
-        expired: (): boolean => false,
-      };
-      const refreshStub = sandbox.stub().resolves(mockTokenSet);
-      const mockClient = {
-        refresh: refreshStub,
-      } as unknown as Client;
-      sandbox
-        .stub(domainAuthOidc, 'verifyOidcIdToken')
-        .withArgs()
-        .resolves({ payload: mockTokenSet.claims(), expired: false });
-
-      // すでに同じemailでユーザーが存在する状態にする
-      const registeredUser = await createOne(
-        {
-          email: mockTokenSet.claims().email as string,
-          oidcAccessToken: 'xxxxx',
-          oidcExpiryDate: 1737455830,
-          oidcIdToken: 'yyyyy',
-          oidcRefreshToken: 'zzzzz',
-          oidcTokenType: 'Bearer',
-        },
-        AUTH_TYPE.OIDC
-      );
-
-      // テスト対象の関数を呼び出し
-      const result = await domainAuthOidc.verifyOidcAccessToken(
-        mockClient,
-        config,
-        registeredUser.id,
-        registeredUser
-      );
-
-      // 結果の検証
-      assert.strictEqual(result, true);
-
-      // スタブ呼び出し確認
-      sinon.assert.calledOnceWithExactly(
-        refreshStub,
-        registeredUser.oidcRefreshToken
-      );
-
-      // ユーザーが正しく更新されたか確認
-      const actual = await findOneByEmail(
-        mockTokenSet.claims().email as string
-      );
-      assert.strictEqual(actual?.authType, AUTH_TYPE.OIDC);
-      assert.strictEqual(actual?.email, mockTokenSet.claims().email);
-      assert.strictEqual(actual?.oidcAccessToken, mockTokenSet.access_token);
-      assert.strictEqual(actual?.oidcIdToken, mockTokenSet.id_token);
-      assert.strictEqual(actual?.oidcRefreshToken, mockTokenSet.refresh_token);
-    });
-    it('credentialsが不正な場合はエラー', async () => {
-      // テストデータ
-      const config = defaultConfig;
-
-      // テストデータ
-      const user = {
-        oidcAccessToken: null,
-        oidcExpiryDate: 1737455830,
-        oidcIdToken: 'yyyyy',
-        oidcRefreshToken: null,
-        oidcTokenType: 'Bearer',
-      };
-      const userId = 'dummy';
-
-      // モックの作成
-      const mockClient = {} as unknown as Client;
-
-      // テスト対象の関数を呼び出し
-      const result = await domainAuthOidc.verifyOidcAccessToken(
-        mockClient,
-        config,
-        userId,
-        user
-      );
-
-      // 結果の検証
-      assert.strictEqual(result, false);
-    });
-    it('IDトークンの検証に失敗した場合はエラー', async () => {
-      // テストデータ
-      const config = defaultConfig;
-
-      // テストデータ
-      const user = {
-        oidcAccessToken: 'xxxxx',
-        oidcExpiryDate: 1737455830,
-        oidcIdToken: 'yyyyy',
-        oidcRefreshToken: null,
-        oidcTokenType: 'Bearer',
-      };
-      const userId = 'dummy';
-
-      // モックの作成
-      const mockClient = {} as unknown as Client;
-      sandbox
-        .stub(domainAuthOidc, 'verifyOidcIdToken')
-        .withArgs()
-        .rejects(faildDecodeOidcIdToken());
-
-      // テスト対象の関数を呼び出し
-      const result = await domainAuthOidc.verifyOidcAccessToken(
-        mockClient,
-        config,
-        userId,
-        user
-      );
-
-      // 結果の検証
-      assert.strictEqual(result, false);
-    });
-    it('リフレッシュトークンがなくIDトークンの有効期限が切れている場合はエラー', async () => {
-      // テストデータ
-      const config = defaultConfig;
-
-      // テストデータ
-      const user = {
-        oidcAccessToken: 'xxxxx',
-        oidcExpiryDate: 1737455830,
-        oidcIdToken: 'yyyyy',
-        oidcRefreshToken: null,
-        oidcTokenType: 'Bearer',
-      };
-      const userId = 'dummy';
-
-      // モックの作成
-      const mockClient = {} as unknown as Client;
-      sandbox
-        .stub(domainAuthOidc, 'verifyOidcIdToken')
-        .withArgs()
-        .resolves({ payload: { exp: 1737455830 }, expired: true });
-
-      // テスト対象の関数を呼び出し
-      const result = await domainAuthOidc.verifyOidcAccessToken(
-        mockClient,
-        config,
-        userId,
-        user
-      );
-
-      // 結果の検証
-      assert.strictEqual(result, false);
-    });
-    it('リフレッシュトークンがある場合にアクセストークンの有効期限内はリフレッシュしない', async () => {
-      // テストデータ
-      const config = defaultConfig;
-
-      // モックの作成
-      const mockTokenSet = {
-        access_token: 'xxxxx_updated',
-        id_token: 'yyyyy_updated',
-        refresh_token: 'zzzzz',
-        claims: (): IdTokenClaims => ({
-          email: 'verify-access-token-no-refresh@example.com',
-          sub: 'sub',
-          aud: 'aud',
-          exp: Date.now() / 1000 + 10 * 60,
-          iat: 1737455830,
-          iss: 'iss',
-        }),
-        expired: (): boolean => false,
-      };
-      const refreshStub = sandbox.stub().resolves(mockTokenSet);
-      const mockClient = {
-        refresh: refreshStub,
-      } as unknown as Client;
-      sandbox
-        .stub(domainAuthOidc, 'verifyOidcIdToken')
-        .withArgs()
-        .resolves({ payload: mockTokenSet.claims(), expired: false });
-
-      // すでに同じemailでユーザーが存在する状態にする
-      const registeredUser = await createOne(
-        {
-          email: mockTokenSet.claims().email as string,
-          oidcAccessToken: 'xxxxx',
-          oidcExpiryDate: Date.now() / 1000 + 10 * 60, // 10分後に有効期限切れ
-          oidcIdToken: 'yyyyy',
-          oidcRefreshToken: 'zzzzz',
-          oidcTokenType: 'Bearer',
-        },
-        AUTH_TYPE.OIDC
-      );
-
-      // テスト対象の関数を呼び出し
-      const result = await domainAuthOidc.verifyOidcAccessToken(
-        mockClient,
-        config,
-        registeredUser.id,
-        registeredUser
-      );
-
-      // 結果の検証
-      assert.strictEqual(result, true);
-
-      // スタブ呼び出し確認
-      sinon.assert.notCalled(refreshStub);
-
-      // ユーザーが更新されていないことを確認
-      const actual = await findOneByEmail(
-        mockTokenSet.claims().email as string
-      );
-      assert.strictEqual(actual?.authType, AUTH_TYPE.OIDC);
-      assert.strictEqual(actual?.email, registeredUser.email);
-      assert.strictEqual(
-        actual?.oidcAccessToken,
-        registeredUser.oidcAccessToken
-      );
-      assert.strictEqual(actual?.oidcIdToken, registeredUser.oidcIdToken);
-      assert.strictEqual(
-        actual?.oidcRefreshToken,
-        registeredUser.oidcRefreshToken
-      );
-    });
-    it('アクセストークンのリフレッシュに失敗した場合はエラー', async () => {
-      // テストデータ
-      const config = defaultConfig;
-
-      // テストデータ
-      const user = {
-        oidcAccessToken: 'xxxxx',
-        oidcExpiryDate: 1737455830,
-        oidcIdToken: 'yyyyy',
-        oidcRefreshToken: 'zzzzz',
-        oidcTokenType: 'Bearer',
-      };
-      const userId = 'dummy';
-
-      // モックの作成
-      const refreshStub = sandbox.stub().rejects(new Error('refresh failed'));
-      const mockClient = {
-        refresh: refreshStub,
-      } as unknown as Client;
-      sandbox
-        .stub(domainAuthOidc, 'verifyOidcIdToken')
-        .withArgs()
-        .resolves({ payload: { exp: 1737455830 }, expired: true });
-
-      // テスト対象の関数を呼び出し
-      const result = await domainAuthOidc.verifyOidcAccessToken(
-        mockClient,
-        config,
-        userId,
-        user
-      );
-
-      // 結果の検証
-      assert.strictEqual(result, false);
-    });
-  });
-
-  describe('verifyOidcIdToken', () => {
-    // モックデータ
-    const mockIdToken = 'mock-id-token';
-    const mockDecodedJwt = {
-      header: { kid: 'mock-kid' },
-      payload: { sub: '12345', name: 'Test User' },
-    };
-    const mockKey = {
-      toPEM: sinon.stub().returns('mock-public-key'),
-      alg: 'RS256',
-    };
-    let decodeStub: sinon.SinonStub;
-    let verifyStub: sinon.SinonStub;
-
-    beforeEach(() => {
-      // jwtの関数をモック化
-      decodeStub = sinon.stub(jwt, 'decode');
-      verifyStub = sinon.stub(jwt, 'verify');
-    });
-
-    afterEach(() => {
-      sinon.restore();
-    });
-
-    it('正常にJWTを検証しペイロードと期限切れ判定を返す', async () => {
-      // モックのセットアップ
-      const mockClient = {
-        issuer: {
-          metadata: {
-            issuer: 'https://example.com',
-          },
-          keystore: sinon.stub(),
-        },
-      };
-      decodeStub.returns(mockDecodedJwt); // `jwt.decode` の戻り値を設定
-      mockClient.issuer.keystore.resolves({
-        get: sinon.stub().withArgs({ kid: 'mock-kid' }).returns(mockKey),
-      }); // `keystore` モック
-      verifyStub.returns({ sub: '12345', name: 'Test User' }); // `jwt.verify` の戻り値を設定
-
-      // 実行
-      const result = await domainAuthOidc.verifyOidcIdToken(
-        mockClient as unknown as Client,
-        defaultConfig,
-        mockIdToken
-      );
-
-      // 結果の検証
-      expect(result).toEqual({
-        payload: { sub: '12345', name: 'Test User' },
-        expired: false,
-      });
-
-      // スタブ呼び出し確認
-      sinon.assert.calledOnce(decodeStub);
-      sinon.assert.calledOnce(mockClient.issuer.keystore);
-      sinon.assert.calledOnce(verifyStub);
-      sinon.assert.calledWith(verifyStub, mockIdToken, 'mock-public-key', {
-        audience: defaultConfig.clientId,
-        issuer: mockClient.issuer.metadata.issuer,
-        algorithms: ['RS256'],
-      });
-    });
-
-    it('JWTのデコードに失敗した場合にエラーをスローする', async () => {
-      // モックのセットアップ
-      const mockClient = {
-        issuer: {
-          metadata: {
-            issuer: 'https://example.com',
-          },
-          keystore: sinon.stub(),
-        },
-      };
-      decodeStub.returns(null); // デコード失敗時
-
-      // テスト対象の関数を呼び出し
-      assert.rejects(
-        domainAuthOidc.verifyOidcIdToken(
-          mockClient as unknown as Client,
-          defaultConfig,
-          mockIdToken
-        ),
-        faildDecodeOidcIdToken()
-      );
-
-      // スタブ呼び出し確認
-      sinon.assert.calledOnce(decodeStub);
-      sinon.assert.notCalled(mockClient.issuer.keystore);
-      sinon.assert.notCalled(verifyStub);
-    });
-
-    it('kidに対応する公開鍵が見つからない場合にエラーをスローする', async () => {
-      // モックのセットアップ
-      const mockClient = {
-        issuer: {
-          metadata: {
-            issuer: 'https://example.com',
-          },
-          keystore: sinon.stub(),
-        },
-      };
-      decodeStub.returns(mockDecodedJwt);
-      mockClient.issuer.keystore.resolves({
-        get: sinon.stub().withArgs({ kid: 'mock-kid' }).returns(null),
-      }); // 公開鍵が見つからない場合
-
-      assert.rejects(
-        domainAuthOidc.verifyOidcIdToken(
-          mockClient as unknown as Client,
-          defaultConfig,
-          mockIdToken
-        ),
-        mismatchKidOidcIdToken()
-      );
-
-      // スタブ呼び出し確認
-      sinon.assert.calledOnce(decodeStub);
-      sinon.assert.calledOnce(mockClient.issuer.keystore);
-      sinon.assert.notCalled(verifyStub);
-    });
-
-    it('JWTの検証で期限切れの場合はペイロードと期限切れ判定を返す', async () => {
-      // モックのセットアップ
-      const mockClient = {
-        issuer: {
-          metadata: {
-            issuer: 'https://example.com',
-          },
-          keystore: sinon.stub(),
-        },
-      };
-      decodeStub.returns(mockDecodedJwt);
-      mockClient.issuer.keystore.resolves({
-        get: sinon.stub().withArgs({ kid: 'mock-kid' }).returns(mockKey),
-      });
-      verifyStub.throws(new TokenExpiredError('jwt expired', new Date())); // 検証失敗時
-
-      const result = await domainAuthOidc.verifyOidcIdToken(
-        mockClient as unknown as Client,
-        defaultConfig,
-        mockIdToken
-      );
-
-      // 結果の検証
-      expect(result).toEqual({
-        payload: { sub: '12345', name: 'Test User' },
-        expired: true,
-      });
-
-      // スタブ呼び出し確認
-      sinon.assert.calledOnce(decodeStub);
-      sinon.assert.calledOnce(mockClient.issuer.keystore);
-      sinon.assert.calledOnce(verifyStub);
-    });
-
-    it('JWTの検証で期限切れ以外の場合は例外をスロー', async () => {
-      // モックのセットアップ
-      const mockClient = {
-        issuer: {
-          metadata: {
-            issuer: 'https://example.com',
-          },
-          keystore: sinon.stub(),
-        },
-      };
-      decodeStub.returns(mockDecodedJwt);
-      mockClient.issuer.keystore.resolves({
-        get: sinon.stub().withArgs({ kid: 'mock-kid' }).returns(mockKey),
-      });
-      const illigalException = (): VironError => {
-        return new VironError('iligal error.', 500);
-      };
-      verifyStub.throws(illigalException); // 検証失敗時
-
-      await assert.rejects(
-        domainAuthOidc.verifyOidcIdToken(
-          mockClient as unknown as Client,
-          defaultConfig,
-          mockIdToken
-        ),
-        illigalException()
-      );
-
-      // スタブ呼び出し確認
-      sinon.assert.calledOnce(decodeStub);
-      sinon.assert.calledOnce(mockClient.issuer.keystore);
-      sinon.assert.calledOnce(verifyStub);
-    });
-  });
-});
diff --git a/packages/nodejs/package.json b/packages/nodejs/package.json
index fc5a94e29..0dbd6f431 100644
--- a/packages/nodejs/package.json
+++ b/packages/nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@viron/lib",
-  "version": "2.4.0-alpha.0",
+  "version": "2.3.1",
   "scripts": {
     "build": "npm run clean && tsc --project tsconfig.json && cp -fr src/openapi dist/",
     "clean": "rm -rf dist && rm -f tsconfig.tsbuildinfo",
@@ -33,9 +33,8 @@
     "json-pointer": "^0.6.1",
     "json-schema-ref-parser": "^9.0.7",
     "json-schema-traverse": "^1.0.0",
-    "jsonwebtoken": "^9.0.2",
+    "jsonwebtoken": "^9.0.0",
     "mongoose": "^7.3.4",
-    "openid-client": "^4.7.4",
     "path-to-regexp": "^6.2.0",
     "sequelize": "^6.12.5",
     "uuid": "^8.3.2"
diff --git a/packages/nodejs/src/constants.ts b/packages/nodejs/src/constants.ts
index 89b7dd40b..193db55e8 100644
--- a/packages/nodejs/src/constants.ts
+++ b/packages/nodejs/src/constants.ts
@@ -5,33 +5,30 @@ export const API_METHOD = {
   PATCH: 'patch',
   DELETE: 'delete',
 } as const;
-export type ApiMethod = (typeof API_METHOD)[keyof typeof API_METHOD];
+export type ApiMethod = typeof API_METHOD[keyof typeof API_METHOD];
 
 export const AUTH_CONFIG_TYPE = {
   EMAIL: 'email',
   OAUTH: 'oauth',
-  OIDC: 'oidc',
   OAUTH_CALLBACK: 'oauthcallback',
-  OIDC_CALLBACK: 'oidccallback',
   SIGNOUT: 'signout',
 } as const;
 export type AuthConfigType =
-  (typeof AUTH_CONFIG_TYPE)[keyof typeof AUTH_CONFIG_TYPE];
+  typeof AUTH_CONFIG_TYPE[keyof typeof AUTH_CONFIG_TYPE];
 
 export const AUTH_CONFIG_PROVIDER = {
   VIRON: 'viron',
   GOOGLE: 'google',
-  OIDC: 'oidc',
   SIGNOUT: 'signout',
 } as const;
 export type AuthConfigProvider =
-  (typeof AUTH_CONFIG_PROVIDER)[keyof typeof AUTH_CONFIG_PROVIDER];
+  typeof AUTH_CONFIG_PROVIDER[keyof typeof AUTH_CONFIG_PROVIDER];
 
 export const STORE_TYPE = {
   MYSQL: 'mysql',
   MONGO: 'mongo',
 } as const;
-export type StoreType = (typeof STORE_TYPE)[keyof typeof STORE_TYPE];
+export type StoreType = typeof STORE_TYPE[keyof typeof STORE_TYPE];
 
 export const HTTP_HEADER = {
   ACCESS_CONTROL_ALLOW_ORIGIN: 'access-control-allow-origin',
@@ -48,7 +45,7 @@ export const HTTP_HEADER = {
   X_REQUESTED_WITH: 'x-requested-with',
   X_VIRON_AUTHTYPES_PATH: 'x-viron-authtypes-path',
 } as const;
-export type HttpHeader = (typeof HTTP_HEADER)[keyof typeof HTTP_HEADER];
+export type HttpHeader = typeof HTTP_HEADER[keyof typeof HTTP_HEADER];
 
 export const DEFAULT_PAGER_SIZE = 10;
 export const DEFAULT_PAGER_PAGE = 1;
@@ -81,14 +78,12 @@ export const ADMIN_ROLE = {
   SUPER: 'super',
   VIEWER: 'viewer',
 } as const;
-export type AdminRole = (typeof ADMIN_ROLE)[keyof typeof ADMIN_ROLE];
+export type AdminRole = typeof ADMIN_ROLE[keyof typeof ADMIN_ROLE];
 
 export const VIRON_AUTHCONFIGS_PATH = '/viron/authconfigs';
 export const EMAIL_SIGNIN_PATH = '/email/signin';
 export const OAUTH2_GOOGLE_AUTHORIZATION_PATH = '/oauth2/google/authorization';
 export const OAUTH2_GOOGLE_CALLBACK_PATH = '/oauth2/google/callback';
-export const OIDC_AUTHORIZATION_PATH = '/oidc/authorization';
-export const OIDC_CALLBACK_PATH = '/oidc/callback';
 export const SIGNOUT_PATH = '/signout';
 
 export const PERMISSION = {
@@ -97,7 +92,7 @@ export const PERMISSION = {
   ALL: 'all',
   DENY: 'deny',
 } as const;
-export type Permission = (typeof PERMISSION)[keyof typeof PERMISSION];
+export type Permission = typeof PERMISSION[keyof typeof PERMISSION];
 
 export const OAS_X_THUMBNAIL = 'x-thumbnail';
 export const OAS_X_THEME = 'x-theme';
@@ -116,9 +111,8 @@ export const OAS_X_SKIP_AUDITLOG = 'x-skip-auditlog';
 export const AUTH_TYPE = {
   EMAIL: 'email',
   GOOGLE: 'google',
-  OIDC: 'oidc',
 } as const;
-export type AuthType = (typeof AUTH_TYPE)[keyof typeof AUTH_TYPE];
+export type AuthType = typeof AUTH_TYPE[keyof typeof AUTH_TYPE];
 
 export const AUTH_SCHEME = 'Bearer';
 export const JWT_HASH_ALGORITHM = 'HS512';
@@ -126,25 +120,17 @@ export const DEFAULT_JWT_EXPIRATION_SEC = 24 * 60 * 60;
 export const DEBUG_LOG_PREFIX = '@viron/lib:';
 export const CASBIN_SYNC_INTERVAL_MSEC = 1 * 60 * 1000;
 export const OAUTH2_STATE_EXPIRATION_SEC = 10 * 60;
-export const OIDC_STATE_EXPIRATION_SEC = 1 * 60;
-export const OIDC_CODE_VERIFIER_EXPIRATION_SEC = 1 * 60;
 export const REVOKED_TOKEN_RETENTION_SEC = 30 * 24 * 60 * 60;
 
 export const COOKIE_KEY = {
   VIRON_AUTHORIZATION: 'viron_authorization',
   OAUTH2_STATE: 'oauth2_state',
-  OIDC_STATE: 'oidc_state',
-  OIDC_CODE_VERIFIER: 'oidc_code_verifier',
 } as const;
 
 export const GOOGLE_OAUTH2_DEFAULT_SCOPES = [
   'https://www.googleapis.com/auth/userinfo.email',
 ];
 
-export const OIDC_DEFAULT_SCOPES = ['openid', 'email'];
-
-export const OIDC_TOKEN_REFRESH_BEFORE_SEC = 30; // 30秒前からリフレッシュを開始する
-
 export const THEME = {
   RED: 'red',
   ULTIMATE_ORANGE: 'ultimate orange',
@@ -171,7 +157,7 @@ export const THEME = {
   NEON_ROSE: 'neon rose',
   ELECTRIC_CRIMSON: 'electric crimson',
 } as const;
-export type Theme = (typeof THEME)[keyof typeof THEME];
+export type Theme = typeof THEME[keyof typeof THEME];
 
 export const X_PAGE_CONTENT_TYPE = {
   NUMBER: 'number',
@@ -179,7 +165,7 @@ export const X_PAGE_CONTENT_TYPE = {
   CUSTOM: 'custom',
 } as const;
 export type XPageContentType =
-  (typeof X_PAGE_CONTENT_TYPE)[keyof typeof X_PAGE_CONTENT_TYPE];
+  typeof X_PAGE_CONTENT_TYPE[keyof typeof X_PAGE_CONTENT_TYPE];
 
 export const TABLE_SORT_DELIMITER = ':';
 export const TABLE_SORT_ORDER = {
@@ -187,7 +173,7 @@ export const TABLE_SORT_ORDER = {
   DESC: 'desc',
 } as const;
 export type TableSortOrder =
-  (typeof TABLE_SORT_ORDER)[keyof typeof TABLE_SORT_ORDER];
+  typeof TABLE_SORT_ORDER[keyof typeof TABLE_SORT_ORDER];
 
 export const CACHE_CONTROL = {
   NO_STORE: 'no-store',
@@ -202,4 +188,4 @@ export const VIRON_DOMAINS = {
   AUTHCONFIGS: 'authconfigs',
   OAS: 'oas',
 } as const;
-export type VironDomains = (typeof VIRON_DOMAINS)[keyof typeof VIRON_DOMAINS];
+export type VironDomains = typeof VIRON_DOMAINS[keyof typeof VIRON_DOMAINS];
diff --git a/packages/nodejs/src/domains/adminuser.ts b/packages/nodejs/src/domains/adminuser.ts
index 13c156c0b..6477e1fc5 100644
--- a/packages/nodejs/src/domains/adminuser.ts
+++ b/packages/nodejs/src/domains/adminuser.ts
@@ -6,7 +6,7 @@ import {
 } from '../constants';
 import { ListWithPager, genPasswordHash } from '../helpers';
 import { FindConditions, repositoryContainer } from '../repositories';
-import { adminUserNotFound, invalidAuthType } from '../errors';
+import { adminUserNotFound } from '../errors';
 import {
   listRoles,
   listUsers,
@@ -25,11 +25,6 @@ export interface AdminUser {
   googleOAuth2IdToken: string | null;
   googleOAuth2RefreshToken: string | null;
   googleOAuth2TokenType: string | null;
-  oidcAccessToken: string | null;
-  oidcExpiryDate: number | null;
-  oidcIdToken: string | null;
-  oidcRefreshToken: string | null;
-  oidcTokenType: string | null;
   createdAt: Date;
   updatedAt: Date;
 }
@@ -69,19 +64,9 @@ export interface AdminUserGoogleCreateAttributes {
   googleOAuth2TokenType: string | null;
 }
 
-export interface AdminUserOidcCreateAttributes {
-  email: string;
-  oidcAccessToken: string | null;
-  oidcExpiryDate: number | null;
-  oidcIdToken: string | null;
-  oidcRefreshToken: string | null;
-  oidcTokenType: string | null;
-}
-
 export type AdminUserCreateAttributes =
   | AdminUserEmailCreateAttributes
-  | AdminUserGoogleCreateAttributes
-  | AdminUserOidcCreateAttributes;
+  | AdminUserGoogleCreateAttributes;
 
 export interface AdminUserEmailUpdateAttributes {
   password: string | null;
@@ -95,18 +80,10 @@ export interface AdminUserGoogleUpdateAttributes {
   googleOAuth2RefreshToken: string | null;
   googleOAuth2TokenType: string | null;
 }
-export interface AdminUserOidcUpdateAttributes {
-  oidcAccessToken: string | null;
-  oidcExpiryDate: number | null;
-  oidcIdToken: string | null;
-  oidcRefreshToken: string | null;
-  oidcTokenType: string | null;
-}
 
 export type AdminUserUpdateAttributes =
   | AdminUserEmailUpdateAttributes
-  | AdminUserGoogleUpdateAttributes
-  | AdminUserOidcUpdateAttributes;
+  | AdminUserGoogleUpdateAttributes;
 
 export interface AdminUserView extends AdminUser {
   roleIds: string[];
@@ -128,20 +105,9 @@ export interface AdminUserGoogleCreatePayload {
   roleIds?: string[];
 }
 
-export interface AdminUserOidcCreatePayload {
-  email: string;
-  oidcAccessToken: string | null;
-  oidcExpiryDate: number | null;
-  oidcIdToken: string | null;
-  oidcRefreshToken: string | null;
-  oidcTokenType: string | null;
-  roleIds?: string[];
-}
-
 export type AdminUserCreatePayload =
   | AdminUserEmailCreatePayload
-  | AdminUserGoogleCreatePayload
-  | AdminUserOidcCreatePayload;
+  | AdminUserGoogleCreatePayload;
 
 export interface AdminUserEmailUpdatePayload {
   password?: string;
@@ -157,19 +123,9 @@ export interface AdminUserGoogleUpdatePayload {
   roleIds?: string[];
 }
 
-export interface AdminUserOidcUpdatePayload {
-  oidcAccessToken: string | null;
-  oidcExpiryDate: number | null;
-  oidcIdToken: string | null;
-  oidcRefreshToken: string | null;
-  oidcTokenType: string | null;
-  roleIds?: string[];
-}
-
 export type AdminUserUpdatePayload =
   | AdminUserEmailUpdatePayload
-  | AdminUserGoogleUpdatePayload
-  | AdminUserOidcUpdatePayload;
+  | AdminUserGoogleUpdatePayload;
 
 const format = (adminUser: AdminUser, roleIds?: string[]): AdminUserView => {
   return Object.assign({}, adminUser, { roleIds: roleIds ?? [] });
@@ -208,34 +164,19 @@ export const createOne = async (
   const { roleIds, ...adminUser } = payload;
 
   let obj;
-  switch (authType) {
-    case AUTH_TYPE.EMAIL: {
-      const adminUserEmail = adminUser as AdminUserEmailCreatePayload;
-      obj = {
-        authType: AUTH_TYPE.EMAIL,
-        ...adminUserEmail,
-        ...genPasswordHash(adminUserEmail.password),
-      } as AdminUserEmailCreateAttributes;
-      break;
-    }
-    case AUTH_TYPE.GOOGLE: {
-      const adminUserGoogle = adminUser as AdminUserGoogleCreatePayload;
-      obj = {
-        authType: AUTH_TYPE.GOOGLE,
-        ...adminUserGoogle,
-      } as AdminUserGoogleCreateAttributes;
-      break;
-    }
-    case AUTH_TYPE.OIDC: {
-      const adminUserOidc = adminUser as AdminUserOidcCreatePayload;
-      obj = {
-        authType: AUTH_TYPE.OIDC,
-        ...adminUserOidc,
-      } as AdminUserOidcCreateAttributes;
-      break;
-    }
-    default:
-      throw invalidAuthType();
+  if (authType === AUTH_TYPE.EMAIL) {
+    const adminUserEmail = adminUser as AdminUserEmailCreatePayload;
+    obj = {
+      authType: AUTH_TYPE.EMAIL,
+      ...adminUserEmail,
+      ...genPasswordHash(adminUserEmail.password),
+    } as AdminUserEmailCreateAttributes;
+  } else {
+    const adminUserGoogle = adminUser as AdminUserGoogleCreatePayload;
+    obj = {
+      authType: AUTH_TYPE.GOOGLE,
+      ...adminUserGoogle,
+    } as AdminUserGoogleCreateAttributes;
   }
   const user = await repository.createOne(obj);
 
@@ -257,49 +198,17 @@ export const updateOneById = async (
   }
 
   const { roleIds, ...adminUser } = payload;
-  let obj;
-  switch (user.authType) {
-    case AUTH_TYPE.EMAIL: {
-      const adminUserEmail = adminUser as AdminUserEmailUpdatePayload;
-      if (adminUserEmail.password) {
-        obj = {
-          ...genPasswordHash(adminUserEmail.password),
-        } as AdminUserEmailUpdateAttributes;
-      }
-      break;
+  if (user.authType === AUTH_TYPE.EMAIL) {
+    const adminUserEmail = adminUser as AdminUserEmailUpdatePayload;
+    if (adminUserEmail.password) {
+      await repository.updateOneById(
+        id,
+        genPasswordHash(adminUserEmail.password)
+      );
     }
-    case AUTH_TYPE.GOOGLE: {
-      const adminUserGoogle = adminUser as AdminUserGoogleUpdatePayload;
-      if (adminUserGoogle.googleOAuth2AccessToken) {
-        obj = {
-          googleOAuth2AccessToken: adminUserGoogle.googleOAuth2AccessToken,
-          googleOAuth2ExpiryDate: adminUserGoogle.googleOAuth2ExpiryDate,
-          googleOAuth2IdToken: adminUserGoogle.googleOAuth2IdToken,
-          googleOAuth2RefreshToken: adminUserGoogle.googleOAuth2RefreshToken,
-          googleOAuth2TokenType: adminUserGoogle.googleOAuth2TokenType,
-        } as AdminUserGoogleUpdateAttributes;
-      }
-      break;
-    }
-    case AUTH_TYPE.OIDC: {
-      const adminUserOidc = adminUser as AdminUserOidcUpdatePayload;
-      if (adminUserOidc.oidcAccessToken) {
-        obj = {
-          oidcAccessToken: adminUserOidc.oidcAccessToken,
-          oidcExpiryDate: adminUserOidc.oidcExpiryDate,
-          oidcIdToken: adminUserOidc.oidcIdToken,
-          oidcRefreshToken: adminUserOidc.oidcRefreshToken,
-          oidcTokenType: adminUserOidc.oidcTokenType,
-        } as AdminUserOidcUpdateAttributes;
-      }
-      break;
-    }
-    default:
-      throw invalidAuthType();
-  }
-
-  if (obj) {
-    await repository.updateOneById(id, obj);
+  } else {
+    const adminUserGoogle = adminUser as AdminUserGoogleUpdatePayload;
+    await repository.updateOneById(id, adminUserGoogle);
   }
 
   if (roleIds?.length) {
diff --git a/packages/nodejs/src/domains/auth/index.ts b/packages/nodejs/src/domains/auth/index.ts
index 2958bf7fc..f2cc5dacb 100644
--- a/packages/nodejs/src/domains/auth/index.ts
+++ b/packages/nodejs/src/domains/auth/index.ts
@@ -1,5 +1,4 @@
 export * from './email';
 export * from './googleoauth2';
-export * from './oidc';
 export * from './jwt';
 export * from './signout';
diff --git a/packages/nodejs/src/domains/auth/oidc.ts b/packages/nodejs/src/domains/auth/oidc.ts
deleted file mode 100644
index 03b1d530d..000000000
--- a/packages/nodejs/src/domains/auth/oidc.ts
+++ /dev/null
@@ -1,349 +0,0 @@
-import jwt, { Algorithm, JwtPayload, TokenExpiredError } from 'jsonwebtoken';
-import {
-  Issuer,
-  generators,
-  Client,
-  TokenSet,
-  CallbackParamsType,
-} from 'openid-client';
-import { getDebug } from '../../logging';
-import { signJwt } from './jwt';
-const debug = getDebug('domains:auth:oidc');
-import {
-  forbidden,
-  invalidOidcIdToken,
-  signinFailed,
-  unsupportedScope,
-  faildDecodeOidcIdToken,
-  mismatchKidOidcIdToken,
-} from '../../errors';
-import { createOne, findOneByEmail, updateOneById } from '../adminuser';
-import { addRoleForUser } from '../adminrole';
-import { createFirstAdminUser } from './common';
-import {
-  ADMIN_ROLE,
-  AUTH_TYPE,
-  OIDC_DEFAULT_SCOPES,
-  OIDC_TOKEN_REFRESH_BEFORE_SEC as OIDC_TOKEN_REFRESH_BUFFER_SEC,
-} from '../../constants';
-
-export interface OidcClientConfig {
-  clientId: string;
-  clientSecret: string;
-  configurationUrl: string;
-}
-
-export interface OidcConfig extends OidcClientConfig {
-  additionalScopes?: string[];
-  userHostedDomains?: string[];
-}
-
-// キャッシュされたOIDCクライアント
-let cachedOidcClient: Client | null = null;
-
-// OIDCクライアントの生成
-export const genOidcClient = async (
-  config: OidcConfig,
-  redirectUri?: string,
-  forceReload?: boolean
-): Promise<Client> => {
-  // forceReloadがtrueでない場合にキャッシュを使用
-  if (cachedOidcClient && !forceReload) {
-    debug('Use cached oidcClient');
-    return cachedOidcClient;
-  }
-
-  // OIDCプロバイダーのIssuerを取得
-  const issuer = await Issuer.discover(config.configurationUrl);
-  debug('Discovered issuer %o', issuer);
-
-  // issuer.metadata.scopes_supportedでサポートされていないスコープがないかチェック
-  // https://openid.net/specs/openid-connect-discovery-1_0.html#IssuerDiscovery
-  // RECOMMENDED. JSON array containing a list of the OAuth 2.0 [RFC6749] scope values that this server supports. The server MUST support the openid scope value. Servers MAY choose not to advertise some supported scope values even when this parameter is used, although those defined in [OpenID.Core] SHOULD be listed, if supported.
-  // 推奨プロパティなのでない場合もある
-  const scopesSupported = issuer.metadata.scopes_supported
-    ? (issuer.metadata.scopes_supported as string[])
-    : [];
-  // scopes_supportedがある場合はチェック
-  if (scopesSupported.length > 0) {
-    // 追加スコープがある場合は追加スコープを含めてチェック
-    const scopes =
-      config.additionalScopes && config.additionalScopes.length > 0
-        ? OIDC_DEFAULT_SCOPES.concat(config.additionalScopes)
-        : OIDC_DEFAULT_SCOPES;
-    // scopes の中のどれか一つでもサポートされていない場合はエラー
-    if (scopes.some((scope) => !scopesSupported.includes(scope))) {
-      throw unsupportedScope();
-    }
-  }
-
-  debug('redirectUri %s', redirectUri);
-
-  // クライアントの作成とキャッシュ
-  cachedOidcClient = new issuer.Client({
-    client_id: config.clientId,
-    client_secret: config.clientSecret,
-    response_types: ['code'],
-    ...(redirectUri && { redirect_uris: [redirectUri] }),
-  });
-
-  return cachedOidcClient;
-};
-
-// OIDC用のコードベリファイアを生成
-export const genOidcCodeVerifier = async (): Promise<string> => {
-  return generators.codeVerifier();
-};
-
-// Oidc認可画面URLを取得
-export const getOidcAuthorizationUrl = async (
-  config: OidcConfig,
-  client: Client,
-  codeVerifier: string,
-  state: string
-): Promise<string> => {
-  // PKCE用のコードベリファイアを生成
-  const codeChallenge = generators.codeChallenge(codeVerifier);
-
-  // 認証URLを生成
-  const authorizationUrl = client.authorizationUrl({
-    scope:
-      config.additionalScopes && config.additionalScopes.length > 0
-        ? OIDC_DEFAULT_SCOPES.concat(config.additionalScopes).join(' ')
-        : OIDC_DEFAULT_SCOPES.join(' '),
-    code_challenge: codeChallenge,
-    code_challenge_method: 'S256',
-    state,
-  });
-
-  debug('Authorization URL:', authorizationUrl);
-
-  return authorizationUrl;
-};
-
-// Oidcサインイン
-export const signinOidc = async (
-  client: Client,
-  codeVerifier: string,
-  redirectUri: string,
-  params: CallbackParamsType,
-  config: OidcConfig
-): Promise<string> => {
-  debug('params:', params);
-  debug('codeVerifier:', codeVerifier);
-
-  const tokenSet = await client.callback(redirectUri, params, {
-    code_verifier: codeVerifier,
-    state: params.state,
-  });
-
-  const claims = tokenSet.claims();
-  const credentials = formatCredentials(tokenSet);
-
-  if (!credentials.oidcIdToken) {
-    debug('signinOidc invalid authentication codeVerifier. %s', codeVerifier);
-    throw invalidOidcIdToken();
-  }
-
-  // emailチェック
-  const email = claims.email;
-  if (!email) {
-    debug(
-      'signinOidc invalid login claims: %o, idToken: %s',
-      claims,
-      tokenSet.id_token
-    );
-    throw invalidOidcIdToken();
-  }
-  // emailドメインチェック
-  const emailDomain = email.split('@').pop() as string;
-  if (
-    config.userHostedDomains?.length &&
-    !config.userHostedDomains.includes(emailDomain)
-  ) {
-    // 許可されていないメールドメイン
-    debug('signinOidc illegal user email: %s', email);
-    throw forbidden();
-  }
-
-  // トークンの有効期限が切れている場合は403
-  if (tokenSet.expired()) {
-    debug('Token expired!');
-    throw forbidden();
-  }
-
-  // emailでユーザーを検索
-  let adminUser = await findOneByEmail(email);
-
-  // ユーザーが存在しない場合は新規作成
-  if (!adminUser) {
-    const firstAdminUser = await createFirstAdminUser(
-      { email, ...credentials },
-      AUTH_TYPE.OIDC
-    );
-    if (firstAdminUser) {
-      adminUser = firstAdminUser;
-    } else {
-      // 初回ログイン時ユーザー作成
-      adminUser = await createOne({ email, ...credentials }, AUTH_TYPE.OIDC);
-      await addRoleForUser(adminUser.id, ADMIN_ROLE.VIEWER);
-    }
-  } else {
-    if (adminUser.authType !== AUTH_TYPE.OIDC) {
-      throw signinFailed();
-    }
-    // 既存ユーザーの情報を更新
-    await updateOneById(adminUser.id, credentials);
-  }
-
-  debug('signinOidc Sign jwt for user: %s', adminUser.id);
-  return signJwt(adminUser.id);
-};
-
-// アクセストークンの検証
-export const verifyOidcAccessToken = async (
-  client: Client,
-  config: OidcConfig,
-  userId: string,
-  credentials: OidcCredentials
-): Promise<boolean> => {
-  // credentialsが不正な場合はエラー
-  if (
-    !credentials.oidcAccessToken ||
-    !credentials.oidcIdToken ||
-    !credentials.oidcExpiryDate ||
-    !credentials.oidcTokenType
-  ) {
-    debug('verifyOidcAccessToken invalid credentials. %o', credentials);
-    return false;
-  }
-
-  // IDトークンの検証
-  // vironではIDトークンはDBに保存されているので、改竄されることはないが
-  // DBはviron利用者が管理するため改竄されることを考慮してvironLibとしてはIDトークンの検証を毎度行う
-  const verified = await verifyOidcIdToken(
-    client,
-    config,
-    credentials.oidcIdToken
-  ).catch((e: Error) => {
-    debug('verifyOidcIdToken failure. userId: %s, err: %o', userId, e);
-    return e;
-  });
-  // IDトークンの検証に失敗した場合はエラー
-  if (verified instanceof Error) {
-    return false;
-  }
-
-  // リフレッシュトークンがない場合はIDトークンの有効期限だけで判定
-  if (!credentials.oidcRefreshToken) {
-    debug('verifyOidcAccessToken no refresh token. userId: %s', userId);
-    // IDトークンの有効期限が切れている場合はエラー
-    return !verified.expired;
-  }
-
-  // ---- 以下リフレッシュトークンがある場合の処理 ----
-  // IDトークンの有効期限が近いもしくは期限切れ場合以外はリフレッシュしない
-  if (!isRefresh(verified.payload.exp)) {
-    debug('verifyOidcAccessToken no need to refresh token. userId: %s', userId);
-    return true;
-  }
-
-  // リフレッシュトークンがある場合はリフレッシュトークンを使ってトークンを更新
-  const refreshToken = credentials.oidcRefreshToken;
-  const tokenset = await client.refresh(refreshToken).catch((e: Error) => {
-    debug('AccessToken refresh failure. userId: %s, err: %o', userId, e);
-    return e;
-  });
-  // アクセストークンのリフレッシュに失敗した場合はエラー
-  if (tokenset instanceof Error) {
-    return false;
-  }
-  debug('AccessToken refresh success! userId: %s', userId);
-
-  // トークンを更新
-  const newCredentials = formatCredentials(tokenset);
-  newCredentials.oidcRefreshToken = refreshToken;
-  await updateOneById(userId, newCredentials);
-
-  return true;
-};
-
-/**
- * IDトークンの検証
- * 有効期限切れ以外の例外はスローする
- *
- * @param client
- * @param config
- * @param idToken
- * @returns {Promise<{decodedJwt: Jwt, isExpired: boolean}>} デコードしたJWTと期限切れ判定を返す
- */
-export const verifyOidcIdToken = async (
-  client: Client,
-  config: OidcConfig,
-  idToken: string
-): Promise<{ payload: JwtPayload; expired: boolean }> => {
-  // JWTのヘッダーから`kid`を取得
-  const decodedJwt = jwt.decode(idToken, { complete: true });
-  if (decodedJwt === null || typeof decodedJwt.payload === 'string') {
-    // JWTのデコードに失敗した場合は設定不備 or 改竄された可能性があるため500エラー
-    debug('verifyIdToken decode error. %s', idToken);
-    throw faildDecodeOidcIdToken();
-  }
-  const kid = decodedJwt.header.kid;
-
-  // JWKSエンドポイントから公開鍵を取得
-  const keyStore = await client.issuer.keystore();
-
-  // kidに対応する公開鍵を取得
-  const key = keyStore.get({ kid });
-  if (!key) {
-    // kidに対応する公開鍵がない場合は500エラー
-    debug('verifyIdToken mismatch kid. %s', kid);
-    throw mismatchKidOidcIdToken();
-  }
-
-  // JWTの検証
-  try {
-    jwt.verify(idToken, key.toPEM(), {
-      audience: config.clientId, // OIDCクライアントIDで検証
-      issuer: client.issuer.metadata.issuer, // トークン発行者で検証
-      algorithms: [key.alg as Algorithm], // アルゴリズムを指定
-    });
-    // 検証成功の場合はpayloadと期限切れフラグをfalseで返す
-    return { payload: decodedJwt.payload as JwtPayload, expired: false };
-  } catch (e) {
-    debug('verifyIdToken error: %o', e);
-    // トークンの有効期限切れの場合のみpayloadと期限切れフラグをtrueで返す
-    if (e instanceof TokenExpiredError) {
-      debug('Token expired! %s', idToken);
-      return { payload: decodedJwt.payload as JwtPayload, expired: true };
-    }
-    // トークンの有効期限切れ以外は設定不備 or 改竄された可能性があるため500エラー
-    throw e;
-  }
-};
-
-interface OidcCredentials {
-  oidcAccessToken: string | null;
-  oidcExpiryDate: number | null;
-  oidcIdToken: string | null;
-  oidcRefreshToken: string | null;
-  oidcTokenType: string | null;
-}
-
-const formatCredentials = (credentials: TokenSet): OidcCredentials => {
-  return {
-    oidcAccessToken: credentials.access_token ?? null,
-    oidcExpiryDate: credentials.expires_at ?? null,
-    oidcIdToken: credentials.id_token ?? null,
-    oidcRefreshToken: credentials.refresh_token ?? null,
-    oidcTokenType: credentials.token_type ?? null,
-  };
-};
-
-const isRefresh = (expiryDate: number | undefined): boolean => {
-  return (
-    !expiryDate ||
-    Date.now() > (expiryDate - OIDC_TOKEN_REFRESH_BUFFER_SEC) * 1000
-  );
-};
diff --git a/packages/nodejs/src/errors.ts b/packages/nodejs/src/errors.ts
index fa3db418a..273f88fd4 100644
--- a/packages/nodejs/src/errors.ts
+++ b/packages/nodejs/src/errors.ts
@@ -47,18 +47,10 @@ export const invalidGoogleOAuth2Token = (): VironError => {
   return new VironError('Invalid Google OAuth2 Token.', 400);
 };
 
-export const invalidOidcIdToken = (): VironError => {
-  return new VironError('Invalid OIDC ID Token.', 400);
-};
-
 export const googleOAuth2Unavailable = (): VironError => {
   return new VironError('Google OAuth2 is unavailable.', 500);
 };
 
-export const oidcUnavailable = (): VironError => {
-  return new VironError('OIDC is unavailable.', 500);
-};
-
 export const mismatchState = (): VironError => {
   return new VironError('State is mismatch.', 400);
 };
@@ -74,19 +66,3 @@ export const unableToDeleteRole = (): VironError => {
 export const operationNotFound = (): VironError => {
   return new VironError('Operation Not Found.', 404);
 };
-
-export const invalidAuthType = (): VironError => {
-  return new VironError('Invalid Auth type.', 400);
-};
-
-export const unsupportedScope = (): VironError => {
-  return new VironError('Unsupported scope.', 500);
-};
-
-export const faildDecodeOidcIdToken = (): VironError => {
-  return new VironError('Failed to decode OIDC ID Token.', 500);
-};
-
-export const mismatchKidOidcIdToken = (): VironError => {
-  return new VironError('Kid Mismatch OIDC ID Token.', 500);
-};
diff --git a/packages/nodejs/src/helpers/cookies.ts b/packages/nodejs/src/helpers/cookies.ts
index e5183f854..122b5087e 100644
--- a/packages/nodejs/src/helpers/cookies.ts
+++ b/packages/nodejs/src/helpers/cookies.ts
@@ -3,8 +3,6 @@ import {
   COOKIE_KEY,
   DEFAULT_JWT_EXPIRATION_SEC,
   OAUTH2_STATE_EXPIRATION_SEC,
-  OIDC_STATE_EXPIRATION_SEC,
-  OIDC_CODE_VERIFIER_EXPIRATION_SEC,
 } from '../constants';
 
 // Cookie文字列を生成
@@ -56,27 +54,3 @@ export const genOAuthStateCookie = (
   }
   return genCookie(COOKIE_KEY.OAUTH2_STATE, state, opts);
 };
-
-// OIDCステート用のCookie文字列を生成
-export const genOidcStateCookie = (
-  state: string,
-  options?: CookieSerializeOptions
-): string => {
-  const opts = Object.assign({}, options);
-  if (!opts.maxAge && !opts.expires) {
-    opts.maxAge = OIDC_STATE_EXPIRATION_SEC;
-  }
-  return genCookie(COOKIE_KEY.OIDC_STATE, state, opts);
-};
-
-// OIDC PKCE用CodeVerifierのCookie文字列を生成
-export const genOidcCodeVerifierCookie = (
-  codeVerifier: string,
-  options?: CookieSerializeOptions
-): string => {
-  const opts = Object.assign({}, options);
-  if (!opts.maxAge && !opts.expires) {
-    opts.maxAge = OIDC_CODE_VERIFIER_EXPIRATION_SEC;
-  }
-  return genCookie(COOKIE_KEY.OIDC_CODE_VERIFIER, codeVerifier, opts);
-};
diff --git a/packages/nodejs/src/infrastructures/mongo/models/adminusers.ts b/packages/nodejs/src/infrastructures/mongo/models/adminusers.ts
index 54049279c..1a24d97bf 100644
--- a/packages/nodejs/src/infrastructures/mongo/models/adminusers.ts
+++ b/packages/nodejs/src/infrastructures/mongo/models/adminusers.ts
@@ -36,22 +36,6 @@ export const schemaDefinition: SchemaDefinition = {
   googleOAuth2TokenType: {
     type: Schema.Types.String,
   },
-  // for oidc
-  oidcAccessToken: {
-    type: Schema.Types.String,
-  },
-  oidcExpiryDate: {
-    type: Schema.Types.Number,
-  },
-  oidcIdToken: {
-    type: Schema.Types.String,
-  },
-  oidcRefreshToken: {
-    type: Schema.Types.String,
-  },
-  oidcTokenType: {
-    type: Schema.Types.String,
-  },
 
   createdAt: {
     type: Schema.Types.Number,
diff --git a/packages/nodejs/src/infrastructures/mysql/models/adminusers.ts b/packages/nodejs/src/infrastructures/mysql/models/adminusers.ts
index 65598e89c..1d9b5ddaa 100644
--- a/packages/nodejs/src/infrastructures/mysql/models/adminusers.ts
+++ b/packages/nodejs/src/infrastructures/mysql/models/adminusers.ts
@@ -60,27 +60,6 @@ const schemaDefinition: ModelAttributes<AdminUserModel, AdminUser> = {
     type: DataTypes.STRING,
     allowNull: true,
   },
-  // for oidc
-  oidcAccessToken: {
-    type: DataTypes.STRING,
-    allowNull: true,
-  },
-  oidcExpiryDate: {
-    type: DataTypes.BIGINT,
-    allowNull: true,
-  },
-  oidcRefreshToken: {
-    type: DataTypes.STRING,
-    allowNull: true,
-  },
-  oidcIdToken: {
-    type: DataTypes.STRING(2048),
-    allowNull: true,
-  },
-  oidcTokenType: {
-    type: DataTypes.STRING,
-    allowNull: true,
-  },
 
   createdAt: {
     type: DataTypes.DATE,
diff --git a/packages/nodejs/src/openapi/auth.yaml b/packages/nodejs/src/openapi/auth.yaml
index 30e2b58fb..4135c1310 100644
--- a/packages/nodejs/src/openapi/auth.yaml
+++ b/packages/nodejs/src/openapi/auth.yaml
@@ -36,40 +36,6 @@ paths:
         204:
           description: No Content
 
-  /oidc/authorization:
-    get:
-      operationId: oidcAuthorization
-      tags:
-        - auth
-      summary: redirect to oidc idp authorization
-      description: OIDCのidp 認証画面へリダイレクトする
-      parameters:
-        - $ref: '#/components/parameters/RedirectUriQueryParam'
-      responses:
-        301:
-          description: Redirect to OIDC Authorization URL.
-      x-authconfig-default-parameters:
-        redirectUri: '${oidcRedirectURI}'
-
-  /oidc/callback:
-    post:
-      operationId: oidcCallback
-      tags:
-        - auth
-      summary: callback from oidc
-      description: OIDC認可後のコールバックURL
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/OidcCallbackPayload'
-      responses:
-        204:
-          description: No Content.
-      x-authconfig-default-requestBody:
-        redirectUri: '${oidcRedirectURI}'
-
   /oauth2/google/authorization:
     get:
       operationId: oauth2GoogleAuthorization
@@ -113,12 +79,6 @@ components:
         type: string
         format: uri
       required: true
-    CodeQueryParam:
-      name: code
-      in: query
-      schema:
-        type: string
-      required: true
 
   schemas:
     SigninEmailPayload:
@@ -153,20 +113,3 @@ components:
         - code
         - state
         - redirectUri
-
-    OidcCallbackPayload:
-      type: object
-      properties:
-        code:
-          description: OIDC Idpが発行した認可コード
-          type: string
-        state:
-          description: CSRF対策用のステートパラメータ
-          type: string
-        redirectUri:
-          description: OIDCコールバックURI
-          type: string
-      required:
-        - code
-        - state
-        - redirectUri
diff --git a/packages/nodejs/src/openapi/authconfigs.yaml b/packages/nodejs/src/openapi/authconfigs.yaml
index ae49beb6d..751f286a6 100644
--- a/packages/nodejs/src/openapi/authconfigs.yaml
+++ b/packages/nodejs/src/openapi/authconfigs.yaml
@@ -53,7 +53,6 @@ components:
           enum:
             - email
             - oauth
-            - oidc
             - signout
           example: oauth
         operationId: