3 files changed, 19 insertions, 0 deletions

diff --git a/server/types/models/oauth/index.ts b/server/types/models/oauth/index.ts
new file mode 100644
index 000000000..36b7ea8ca
--- /dev/null
+++ b/server/types/models/oauth/index.ts
@@ -0,0 +1,2 @@
+export * from './oauth-client'
+export * from './oauth-token'
diff --git a/server/types/models/oauth/oauth-client.ts b/server/types/models/oauth/oauth-client.ts
new file mode 100644
index 000000000..904a07863
--- /dev/null
+++ b/server/types/models/oauth/oauth-client.ts
@@ -0,0 +1,3 @@
+import { OAuthClientModel } from '@server/models/oauth/oauth-client'
+
+export type MOAuthClient = Omit<OAuthClientModel, 'OAuthTokens'>
diff --git a/server/types/models/oauth/oauth-token.ts b/server/types/models/oauth/oauth-token.ts
new file mode 100644
index 000000000..396cf6429
--- /dev/null
+++ b/server/types/models/oauth/oauth-token.ts
@@ -0,0 +1,14 @@
+import { OAuthTokenModel } from '@server/models/oauth/oauth-token'
+import { PickWith } from '@server/types/utils'
+import { MUserAccountUrl } from '../user/user'
+
+type Use<K extends keyof OAuthTokenModel, M> = PickWith<OAuthTokenModel, K, M>
+
+// ############################################################################
+
+export type MOAuthToken = Omit<OAuthTokenModel, 'User' | 'OAuthClients'>
+
+export type MOAuthTokenUser =
+  MOAuthToken &
+  Use<'User', MUserAccountUrl> &
+  { user?: MUserAccountUrl }