1
0
Fork 0

Handle account name in client url

More consistent with AP urls
This commit is contained in:
Chocobozzz 2018-05-24 15:30:28 +02:00
parent b528582df2
commit d14a9532a1
No known key found for this signature in database
GPG key ID: 583A612D890159BE
4 changed files with 29 additions and 15 deletions

View file

@ -16,7 +16,7 @@ export class AccountsComponent implements OnInit {
) {} ) {}
ngOnInit () { ngOnInit () {
const accountId = parseInt(this.route.snapshot.params['accountId'], 10) const accountId = this.route.snapshot.params['accountId']
this.accountService.getAccount(accountId) this.accountService.getAccount(accountId)
.subscribe(account => this.account = account) .subscribe(account => this.account = account)

View file

@ -18,7 +18,7 @@ export class AccountService {
private restExtractor: RestExtractor private restExtractor: RestExtractor
) {} ) {}
getAccount (id: number): Observable<Account> { getAccount (id: number | string): Observable<Account> {
return this.authHttp.get<ServerAccount>(AccountService.BASE_ACCOUNT_URL + id) return this.authHttp.get<ServerAccount>(AccountService.BASE_ACCOUNT_URL + id)
.pipe( .pipe(
map(accountHash => new Account(accountHash)), map(accountHash => new Account(accountHash)),

View file

@ -4,16 +4,21 @@ import 'express-validator'
import * as validator from 'validator' import * as validator from 'validator'
import { AccountModel } from '../../models/account/account' import { AccountModel } from '../../models/account/account'
import { isUserDescriptionValid, isUserUsernameValid } from './users' import { isUserDescriptionValid, isUserUsernameValid } from './users'
import { exists } from './misc'
function isAccountNameValid (value: string) { function isAccountNameValid (value: string) {
return isUserUsernameValid(value) return isUserUsernameValid(value)
} }
function isAccountIdValid (value: string) {
return exists(value)
}
function isAccountDescriptionValid (value: string) { function isAccountDescriptionValid (value: string) {
return isUserDescriptionValid(value) return isUserDescriptionValid(value)
} }
function isAccountIdExist (id: number | string, res: Response) { function isAccountIdExist (id: number | string, res: Response, sendNotFound = true) {
let promise: Bluebird<AccountModel> let promise: Bluebird<AccountModel>
if (validator.isInt('' + id)) { if (validator.isInt('' + id)) {
@ -22,32 +27,34 @@ function isAccountIdExist (id: number | string, res: Response) {
promise = AccountModel.loadByUUID('' + id) promise = AccountModel.loadByUUID('' + id)
} }
return isAccountExist(promise, res) return isAccountExist(promise, res, sendNotFound)
} }
function isLocalAccountNameExist (name: string, res: Response) { function isLocalAccountNameExist (name: string, res: Response, sendNotFound = true) {
const promise = AccountModel.loadLocalByName(name) const promise = AccountModel.loadLocalByName(name)
return isAccountExist(promise, res) return isAccountExist(promise, res, sendNotFound)
} }
function isAccountNameWithHostExist (nameWithDomain: string, res: Response) { function isAccountNameWithHostExist (nameWithDomain: string, res: Response, sendNotFound = true) {
const [ accountName, host ] = nameWithDomain.split('@') const [ accountName, host ] = nameWithDomain.split('@')
let promise: Bluebird<AccountModel> let promise: Bluebird<AccountModel>
if (!host) promise = AccountModel.loadLocalByName(accountName) if (!host) promise = AccountModel.loadLocalByName(accountName)
else promise = AccountModel.loadLocalByNameAndHost(accountName, host) else promise = AccountModel.loadLocalByNameAndHost(accountName, host)
return isAccountExist(promise, res) return isAccountExist(promise, res, sendNotFound)
} }
async function isAccountExist (p: Bluebird<AccountModel>, res: Response) { async function isAccountExist (p: Bluebird<AccountModel>, res: Response, sendNotFound: boolean) {
const account = await p const account = await p
if (!account) { if (!account) {
res.status(404) if (sendNotFound === true) {
.send({ error: 'Account not found' }) res.status(404)
.end() .send({ error: 'Account not found' })
.end()
}
return false return false
} }
@ -60,6 +67,7 @@ async function isAccountExist (p: Bluebird<AccountModel>, res: Response) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
export { export {
isAccountIdValid,
isAccountIdExist, isAccountIdExist,
isLocalAccountNameExist, isLocalAccountNameExist,
isAccountDescriptionValid, isAccountDescriptionValid,

View file

@ -2,13 +2,14 @@ import * as express from 'express'
import { param } from 'express-validator/check' import { param } from 'express-validator/check'
import { import {
isAccountIdExist, isAccountIdExist,
isAccountIdValid,
isAccountNameValid, isAccountNameValid,
isAccountNameWithHostExist, isAccountNameWithHostExist,
isLocalAccountNameExist isLocalAccountNameExist
} from '../../helpers/custom-validators/accounts' } from '../../helpers/custom-validators/accounts'
import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
import { logger } from '../../helpers/logger' import { logger } from '../../helpers/logger'
import { areValidationErrors } from './utils' import { areValidationErrors } from './utils'
import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
const localAccountValidator = [ const localAccountValidator = [
param('name').custom(isAccountNameValid).withMessage('Should have a valid account name'), param('name').custom(isAccountNameValid).withMessage('Should have a valid account name'),
@ -24,13 +25,18 @@ const localAccountValidator = [
] ]
const accountsGetValidator = [ const accountsGetValidator = [
param('id').custom(isIdOrUUIDValid).withMessage('Should have a valid id'), param('id').custom(isAccountIdValid).withMessage('Should have a valid id/uuid/name/name with host'),
async (req: express.Request, res: express.Response, next: express.NextFunction) => { async (req: express.Request, res: express.Response, next: express.NextFunction) => {
logger.debug('Checking accountsGetValidator parameters', { parameters: req.params }) logger.debug('Checking accountsGetValidator parameters', { parameters: req.params })
if (areValidationErrors(req, res)) return if (areValidationErrors(req, res)) return
if (!await isAccountIdExist(req.params.id, res)) return
let accountFetched = false
if (isIdOrUUIDValid(req.params.id)) accountFetched = await isAccountIdExist(req.params.id, res, false)
if (!accountFetched) accountFetched = await isAccountNameWithHostExist(req.params.id, res, true)
if (!accountFetched) return
return next() return next()
} }