aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models/oauth
diff options
context:
space:
mode:
Diffstat (limited to 'server/models/oauth')
-rw-r--r--server/models/oauth/oauth-client-interface.ts9
-rw-r--r--server/models/oauth/oauth-client.ts9
-rw-r--r--server/models/oauth/oauth-token-interface.ts11
-rw-r--r--server/models/oauth/oauth-token.ts5
4 files changed, 15 insertions, 19 deletions
diff --git a/server/models/oauth/oauth-client-interface.ts b/server/models/oauth/oauth-client-interface.ts
index 3b4325740..3526e4159 100644
--- a/server/models/oauth/oauth-client-interface.ts
+++ b/server/models/oauth/oauth-client-interface.ts
@@ -1,13 +1,12 @@
1import * as Sequelize from 'sequelize' 1import * as Sequelize from 'sequelize'
2import * as Promise from 'bluebird'
2 3
3export namespace OAuthClientMethods { 4export namespace OAuthClientMethods {
4 export type CountTotalCallback = (err: Error, total: number) => void 5 export type CountTotal = () => Promise<number>
5 export type CountTotal = (callback: CountTotalCallback) => void
6 6
7 export type LoadFirstClientCallback = (err: Error, client: OAuthClientInstance) => void 7 export type LoadFirstClient = () => Promise<OAuthClientInstance>
8 export type LoadFirstClient = (callback: LoadFirstClientCallback) => void
9 8
10 export type GetByIdAndSecret = (clientId, clientSecret) => void 9 export type GetByIdAndSecret = (clientId: string, clientSecret: string) => Promise<OAuthClientInstance>
11} 10}
12 11
13export interface OAuthClientClass { 12export interface OAuthClientClass {
diff --git a/server/models/oauth/oauth-client.ts b/server/models/oauth/oauth-client.ts
index fbc2a3393..9cc68771d 100644
--- a/server/models/oauth/oauth-client.ts
+++ b/server/models/oauth/oauth-client.ts
@@ -2,7 +2,6 @@ import * as Sequelize from 'sequelize'
2 2
3import { addMethodsToModel } from '../utils' 3import { addMethodsToModel } from '../utils'
4import { 4import {
5 OAuthClientClass,
6 OAuthClientInstance, 5 OAuthClientInstance,
7 OAuthClientAttributes, 6 OAuthClientAttributes,
8 7
@@ -67,12 +66,12 @@ function associate (models) {
67 }) 66 })
68} 67}
69 68
70countTotal = function (callback: OAuthClientMethods.CountTotalCallback) { 69countTotal = function () {
71 return OAuthClient.count().asCallback(callback) 70 return OAuthClient.count()
72} 71}
73 72
74loadFirstClient = function (callback: OAuthClientMethods.LoadFirstClientCallback) { 73loadFirstClient = function () {
75 return OAuthClient.findOne().asCallback(callback) 74 return OAuthClient.findOne()
76} 75}
77 76
78getByIdAndSecret = function (clientId: string, clientSecret: string) { 77getByIdAndSecret = function (clientId: string, clientSecret: string) {
diff --git a/server/models/oauth/oauth-token-interface.ts b/server/models/oauth/oauth-token-interface.ts
index 815ad5eef..f2ddafa54 100644
--- a/server/models/oauth/oauth-token-interface.ts
+++ b/server/models/oauth/oauth-token-interface.ts
@@ -1,5 +1,5 @@
1import * as Sequelize from 'sequelize' 1import * as Sequelize from 'sequelize'
2import * as Bluebird from 'bluebird' 2import * as Promise from 'bluebird'
3 3
4import { UserModel } from '../user' 4import { UserModel } from '../user'
5 5
@@ -15,12 +15,11 @@ export type OAuthTokenInfo = {
15} 15}
16 16
17export namespace OAuthTokenMethods { 17export namespace OAuthTokenMethods {
18 export type GetByRefreshTokenAndPopulateClient = (refreshToken: string) => Bluebird<OAuthTokenInfo> 18 export type GetByRefreshTokenAndPopulateClient = (refreshToken: string) => Promise<OAuthTokenInfo>
19 export type GetByTokenAndPopulateUser = (bearerToken: string) => Bluebird<OAuthTokenInstance> 19 export type GetByTokenAndPopulateUser = (bearerToken: string) => Promise<OAuthTokenInstance>
20 export type GetByRefreshTokenAndPopulateUser = (refreshToken: string) => Bluebird<OAuthTokenInstance> 20 export type GetByRefreshTokenAndPopulateUser = (refreshToken: string) => Promise<OAuthTokenInstance>
21 21
22 export type RemoveByUserIdCallback = (err: Error) => void 22 export type RemoveByUserId = (userId) => Promise<number>
23 export type RemoveByUserId = (userId, callback) => void
24} 23}
25 24
26export interface OAuthTokenClass { 25export interface OAuthTokenClass {
diff --git a/server/models/oauth/oauth-token.ts b/server/models/oauth/oauth-token.ts
index eab9cf858..8c6883465 100644
--- a/server/models/oauth/oauth-token.ts
+++ b/server/models/oauth/oauth-token.ts
@@ -4,7 +4,6 @@ import { logger } from '../../helpers'
4 4
5import { addMethodsToModel } from '../utils' 5import { addMethodsToModel } from '../utils'
6import { 6import {
7 OAuthTokenClass,
8 OAuthTokenInstance, 7 OAuthTokenInstance,
9 OAuthTokenAttributes, 8 OAuthTokenAttributes,
10 9
@@ -149,12 +148,12 @@ getByRefreshTokenAndPopulateUser = function (refreshToken: string) {
149 }) 148 })
150} 149}
151 150
152removeByUserId = function (userId, callback) { 151removeByUserId = function (userId: number) {
153 const query = { 152 const query = {
154 where: { 153 where: {
155 userId: userId 154 userId: userId
156 } 155 }
157 } 156 }
158 157
159 return OAuthToken.destroy(query).asCallback(callback) 158 return OAuthToken.destroy(query)
160} 159}