Cleanup model types

2 files changed, 7 insertions, 1 deletions

diff --git a/server/typings/models/oauth/index.d.ts b/server/typings/models/oauth/index.d.ts
new file mode 100644
index 000000000..36b7ea8ca
--- /dev/null
+++ b/server/typings/models/oauth/index.d.ts
@@ -0,0 +1,2 @@
+export * from './oauth-client'
+export * from './oauth-token'
diff --git a/server/typings/models/oauth/oauth-token.ts b/server/typings/models/oauth/oauth-token.ts
index 105ea3df3..af3412925 100644
--- a/server/typings/models/oauth/oauth-token.ts
+++ b/server/typings/models/oauth/oauth-token.ts
@@ -2,8 +2,12 @@ import { OAuthTokenModel } from '@server/models/oauth/oauth-token'
 import { PickWith } from '@server/typings/utils'
 import { MUserAccountUrl } from '@server/typings/models'
 
+type Use<K extends keyof OAuthTokenModel, M> = PickWith<OAuthTokenModel, K, M>
+
+// ############################################################################
+
 export type MOAuthToken = Omit<OAuthTokenModel, 'User' | 'OAuthClients'>
 
 export type MOAuthTokenUser = MOAuthToken &
-  PickWith<OAuthTokenModel, 'User', MUserAccountUrl> &
+  Use<'User', MUserAccountUrl> &
   { user?: MUserAccountUrl }