refactor: sql queries related to privacy-accounting;
chore: regenerated swagger; feat: utilizing new 410 error when user is banned/unavailable/deleted
This commit is contained in:
@@ -79,10 +79,7 @@ func (p *profileServiceImpl) GetProfileByUsername(cinfo dto.ClientInfo, username
|
||||
}
|
||||
defer helper.Rollback()
|
||||
|
||||
profileRow, err := db.TXQueries.GetProfileByUsernameWithPrivacy(db.CTX, database.GetProfileByUsernameWithPrivacyParams{
|
||||
Requester: cinfo.Username,
|
||||
SearchedUsername: username,
|
||||
}); if err != nil {
|
||||
profileRow, err := db.TXQueries.GetProfileByUsername(db.CTX, username); if err != nil {
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return nil, errs.ErrNotFound
|
||||
}
|
||||
@@ -94,9 +91,33 @@ func (p *profileServiceImpl) GetProfileByUsername(cinfo dto.ClientInfo, username
|
||||
return nil, errs.ErrServerError
|
||||
}
|
||||
|
||||
if !*profileRow.AccessAllowed {
|
||||
accessChecks, err := db.TXlessQueries.CheckProfileAccess(db.CTX, database.CheckProfileAccessParams{
|
||||
Requester: cinfo.Username,
|
||||
ID: profileRow.ID,
|
||||
}); if err != nil {
|
||||
p.log.Error(
|
||||
"Failed to check access for given profile",
|
||||
zap.String("profile_owner_username", username),
|
||||
zap.String("requester", cinfo.Username),
|
||||
zap.Error(err))
|
||||
return nil, errs.ErrServerError
|
||||
}
|
||||
|
||||
if accessChecks.AuthRequired {
|
||||
return nil, errs.ErrUnauthorized
|
||||
}
|
||||
if accessChecks.Hidden {
|
||||
return nil, errs.ErrForbidden
|
||||
}
|
||||
if accessChecks.UserBanned {
|
||||
return nil, errs.ErrGone
|
||||
}
|
||||
if accessChecks.UserUnavailable {
|
||||
return nil, errs.ErrGone
|
||||
}
|
||||
if accessChecks.CaptchaRequired {
|
||||
p.log.Warn("Captcha check is not implemented")
|
||||
}
|
||||
|
||||
profileDto := &dto.ProfileDto{
|
||||
Name: profileRow.Name,
|
||||
|
||||
Reference in New Issue
Block a user