mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-06-22 10:02:15 +00:00
0e283c5485
Turns out this was a one-line fix for each affected field (change the binding from `ValidUrl` to `ValidSiteUrl`), but the tests are rather verbose. The tests are, however, each a simple flow of Create Thing > Try HTTP Website > Try Different Website (notice failure) > Try Different Website With New Config (notice success). I wrote this PR by adding failing tests first, then making the change, for each affected field. Not sure if this should be "feat:" or "fix:" tbh. I figured "fix:" for this PR since IMO the expected behavior is for `VALID_SITE_URL_SCHEMES` to apply in each of these cases, not only for user profiles via the UI form. (Later changed to "feat:" at @limiting-factor's suggestion, based on the observation that this change extends documented behavior.) This PR deals with the server-side validation only. #12991 covers client-side validation (deriving a `pattern` attribute from `VALID_SITE_URL_SCHEMES`, etc.) Closes #5519 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/12962 Reviewed-by: limiting-factor <limiting-factor@noreply.codeberg.org>
71 lines
3 KiB
Go
71 lines
3 KiB
Go
// Copyright 2015 The Gogs Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package structs
|
|
|
|
import "time"
|
|
|
|
// Organization represents an organization
|
|
type Organization struct {
|
|
ID int64 `json:"id"`
|
|
Name string `json:"name"`
|
|
FullName string `json:"full_name"`
|
|
Email string `json:"email"`
|
|
AvatarURL string `json:"avatar_url"`
|
|
Description string `json:"description"`
|
|
Website string `json:"website"`
|
|
Location string `json:"location"`
|
|
Visibility string `json:"visibility"`
|
|
RepoAdminChangeTeamAccess bool `json:"repo_admin_change_team_access"`
|
|
Created time.Time `json:"created"`
|
|
// deprecated
|
|
UserName string `json:"username"`
|
|
}
|
|
|
|
// OrganizationPermissions list different users permissions on an organization
|
|
type OrganizationPermissions struct {
|
|
IsOwner bool `json:"is_owner"`
|
|
IsAdmin bool `json:"is_admin"`
|
|
CanWrite bool `json:"can_write"`
|
|
CanRead bool `json:"can_read"`
|
|
CanCreateRepository bool `json:"can_create_repository"`
|
|
}
|
|
|
|
// CreateOrgOption options for creating an organization
|
|
type CreateOrgOption struct {
|
|
// required: true
|
|
UserName string `json:"username" binding:"Required;Username;MaxSize(40)"`
|
|
FullName string `json:"full_name" binding:"MaxSize(100)"`
|
|
Email string `json:"email" binding:"MaxSize(255)"`
|
|
Description string `json:"description" binding:"MaxSize(255)"`
|
|
Website string `json:"website" binding:"ValidSiteUrl;MaxSize(255)"`
|
|
Location string `json:"location" binding:"MaxSize(50)"`
|
|
// possible values are `public` (default), `limited` or `private`
|
|
// enum: ["public", "limited", "private"]
|
|
Visibility string `json:"visibility" binding:"In(,public,limited,private)"`
|
|
RepoAdminChangeTeamAccess bool `json:"repo_admin_change_team_access"`
|
|
}
|
|
|
|
// TODO: make EditOrgOption fields optional after https://gitea.com/go-chi/binding/pulls/5 got merged
|
|
|
|
// EditOrgOption options for editing an organization
|
|
type EditOrgOption struct {
|
|
FullName string `json:"full_name" binding:"MaxSize(100)"`
|
|
Email *string `json:"email" binding:"MaxSize(255)"`
|
|
Description string `json:"description" binding:"MaxSize(255)"`
|
|
Website string `json:"website" binding:"ValidSiteUrl;MaxSize(255)"`
|
|
Location string `json:"location" binding:"MaxSize(50)"`
|
|
// possible values are `public`, `limited` or `private`
|
|
// enum: ["public", "limited", "private"]
|
|
Visibility string `json:"visibility" binding:"In(,public,limited,private)"`
|
|
RepoAdminChangeTeamAccess *bool `json:"repo_admin_change_team_access"`
|
|
}
|
|
|
|
// RenameOrgOption options when renaming an organization
|
|
type RenameOrgOption struct {
|
|
// New username for this org. This name cannot be in use yet by any other user.
|
|
//
|
|
// required: true
|
|
// unique: true
|
|
NewName string `json:"new_name" binding:"Required"`
|
|
}
|