import { Transaction } from 'sequelize'
import { CONFIG } from '../initializers/config'
import * as LRUCache from 'lru-cache'
-import { MOAuthTokenUser } from '@server/typings/models/oauth/oauth-token'
-import { MUser } from '@server/typings/models/user/user'
+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'
type TokenInfo = { accessToken: string, refreshToken: string, accessTokenExpiresAt: Date, refreshTokenExpiresAt: Date }
let user = await UserModel.loadByEmail(obj.user.email)
if (!user) user = await createUserFromExternal(obj.pluginName, obj.user)
- // This user does not belong to this plugin, skip it
- if (user.pluginAuth !== obj.pluginName) return null
+ // Cannot create a user
+ if (!user) throw new AccessDeniedError('Cannot create such user: an actor with that name already exists.')
- return user
+ // If the user does not belongs to a plugin, it was created before its installation
+ // Then we just go through a regular login process
+ if (user.pluginAuth !== null) {
+ // This user does not belong to this plugin, skip it
+ if (user.pluginAuth !== obj.pluginName) return null
+
+ return user
+ }
}
logger.debug('Getting User (username/email: ' + usernameOrEmail + ', password: ******).')
const user = await UserModel.loadByUsernameOrEmail(usernameOrEmail)
// If we don't find the user, or if the user belongs to a plugin
- if (!user || user.pluginAuth !== null) return null
+ if (!user || user.pluginAuth !== null || !password) return null
const passwordMatch = await user.isPasswordMatch(password)
- if (passwordMatch === false) return null
+ if (passwordMatch !== true) return null
if (user.blocked) throw new AccessDeniedError('User is blocked.')
return user
}
-async function revokeToken (tokenInfo: { refreshToken: string }) {
+async function revokeToken (tokenInfo: { refreshToken: string }): Promise<{ success: boolean, redirectUrl?: string }> {
const res: express.Response = this.request.res
const token = await OAuthTokenModel.getByRefreshTokenAndPopulateUser(tokenInfo.refreshToken)
if (token) {
+ let redirectUrl: string
+
if (res.locals.explicitLogout === true && token.User.pluginAuth && token.authName) {
- PluginManager.Instance.onLogout(token.User.pluginAuth, token.authName, token.User)
+ redirectUrl = await PluginManager.Instance.onLogout(token.User.pluginAuth, token.authName, token.User, this.request)
}
clearCacheByToken(token.accessToken)
token.destroy()
.catch(err => logger.error('Cannot destroy token when revoking token.', { err }))
- return true
+ return { success: true, redirectUrl }
}
- return false
+ return { success: false }
}
async function saveToken (token: TokenInfo, client: OAuthClientModel, user: UserModel) {
}
const tokenCreated = await OAuthTokenModel.create(tokenToCreate)
+
+ user.lastLoginDate = new Date()
+ await user.save()
+
return Object.assign(tokenCreated, { client, user })
}
role: UserRole
displayName: string
}) {
+ // Check an actor does not already exists with that name (removed user)
+ const actor = await ActorModel.loadLocalByName(options.username)
+ if (actor) return null
+
const userToCreate = new UserModel({
username: options.username,
password: null,