X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Foauth-model.ts;h=a2c53a2c9afb6fed41f543097a9b39a13fb0b288;hb=db4b15f21fbf4e33434e930ffc7fb768cdcf9d42;hp=3f8b8e6183e645354607125bc7517a9e86e4ebc2;hpb=33c7131be5883d1b25c49adbcf5750b63905a368;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/oauth-model.ts b/server/lib/oauth-model.ts
index 3f8b8e618..a2c53a2c9 100644
--- a/server/lib/oauth-model.ts
+++ b/server/lib/oauth-model.ts
@@ -1,20 +1,20 @@
 import * as express from 'express'
+import * as LRUCache from 'lru-cache'
 import { AccessDeniedError } from 'oauth2-server'
-import { logger } from '../helpers/logger'
-import { UserModel } from '../models/account/user'
-import { OAuthClientModel } from '../models/oauth/oauth-client'
-import { OAuthTokenModel } from '../models/oauth/oauth-token'
-import { LRU_CACHE } from '../initializers/constants'
 import { Transaction } from 'sequelize'
-import { CONFIG } from '../initializers/config'
-import * as LRUCache from 'lru-cache'
+import { PluginManager } from '@server/lib/plugins/plugin-manager'
+import { ActorModel } from '@server/models/activitypub/actor'
 import { MOAuthTokenUser } from '@server/types/models/oauth/oauth-token'
 import { MUser } from '@server/types/models/user/user'
 import { UserAdminFlag } from '@shared/models/users/user-flag.model'
-import { createUserAccountAndChannelAndPlaylist } from './user'
 import { UserRole } from '@shared/models/users/user-role'
-import { PluginManager } from '@server/lib/plugins/plugin-manager'
-import { ActorModel } from '@server/models/activitypub/actor'
+import { logger } from '../helpers/logger'
+import { CONFIG } from '../initializers/config'
+import { LRU_CACHE } from '../initializers/constants'
+import { UserModel } from '../models/account/user'
+import { OAuthClientModel } from '../models/oauth/oauth-client'
+import { OAuthTokenModel } from '../models/oauth/oauth-token'
+import { createUserAccountAndChannelAndPlaylist } from './user'
 
 type TokenInfo = { accessToken: string, refreshToken: string, accessTokenExpiresAt: Date, refreshTokenExpiresAt: Date }
 
@@ -192,7 +192,15 @@ async function saveToken (token: TokenInfo, client: OAuthClientModel, user: User
   user.lastLoginDate = new Date()
   await user.save()
 
-  return Object.assign(tokenCreated, { client, user })
+  return {
+    accessToken: tokenCreated.accessToken,
+    accessTokenExpiresAt: tokenCreated.accessTokenExpiresAt,
+    refreshToken: tokenCreated.refreshToken,
+    refreshTokenExpiresAt: tokenCreated.refreshTokenExpiresAt,
+    client,
+    user,
+    refresh_token_expires_in: Math.floor((tokenCreated.refreshTokenExpiresAt.getTime() - new Date().getTime()) / 1000)
+  }
 }
 
 // ---------------------------------------------------------------------------