Allow to set organization visibility (public, internal, private)

custom/conf/app.ini.sample

@@ -308,6 +308,11 @@ DEFAULT_KEEP_EMAIL_PRIVATE = false
 ; Default value for AllowCreateOrganization
 ; Every new user will have rights set to create organizations depending on this setting
 DEFAULT_ALLOW_CREATE_ORGANIZATION = true
+; Either "public", "limited" or "private", default is "public"
+; Limited is for signed user only
+; Private is only for member of the organization
+; Public is for everyone
+DEFAULT_VISIBILITY = public
 ; Enable Timetracking
 ENABLE_TIMETRACKING = true
 ; Default value for EnableTimetracking

models/migrations/migrations.go

@@ -186,6 +186,8 @@ var migrations = []Migration{
  NewMigration("add u2f", addU2FReg),
  // v66 -> v67
  NewMigration("add login source id column for public_key table", addLoginSourceIDToPublicKeyTable),
+ // v67 -> v68
+ NewMigration("add visibility for user and org", addVisibilityForUserAndOrg),
 }
 
 // Migrate database to current version

models/migrations/v67.go

@@ -0,0 +1,22 @@
+// Copyright 2018 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package migrations
+
+import (
+ "fmt"
+
+ "github.com/go-xorm/xorm"
+)
+
+func addVisibilityForUserAndOrg(x *xorm.Engine) error {
+ type User struct {
+ Visibility int `xorm:"NOT NULL DEFAULT 1"`
+ }
+
+ if err := x.Sync2(new(User)); err != nil {
+ return fmt.Errorf("Sync2: %v", err)
+ }
+ return nil
+}

models/org.go

@@ -1,4 +1,5 @@
 // Copyright 2014 The Gogs Authors. All rights reserved.
+// Copyright 2018 The Gitea Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
@@ -11,6 +12,7 @@ import (
  "strings"
 
  "code.gitea.io/gitea/modules/log"
+ "code.gitea.io/gitea/modules/setting"
 
  "github.com/Unknwon/com"
  "github.com/go-xorm/builder"
@@ -125,6 +127,7 @@ func CreateOrganization(org, owner *User) (err error) {
  org.NumTeams = 1
  org.NumMembers = 1
  org.Type = UserTypeOrganization
+ org.Visibility = VisibleType(setting.Service.DefaultVisibilityMode)
 
  sess := x.NewSession()
  defer sess.Close()
@@ -351,6 +354,42 @@ func getOwnedOrgsByUserID(sess *xorm.Session, userID int64) ([]*User, error) {
  Find(&orgs)
 }
 
+// HasOrgVisible tell if the given user can see one of the given orgs
+func HasOrgVisible(orgs []*User, user *User) bool {
+ if len(orgs) == 0 {
+ return false
+ }
+
+ // Not SignedUser
+ if user == nil {
+ for _, org := range orgs {
+ if org.Visibility == 1 {
+ return true
+ }
+ }
+ return false
+ }
+
+ if user.IsAdmin {
+ return true
+ }
+ for _, org := range orgs {
+ switch org.Visibility {
+ case VisibleTypePublic:
+ return true
+ case VisibleTypeLimited:
+ return true
+ case VisibleTypePrivate:
+ if org.IsUserOrgPartOf(user.ID) {
+ return true
+ }
+ default:
+ }
+ }
+
+ return false
+}
+
 // GetOwnedOrgsByUserID returns a list of organizations are owned by given user ID.
 func GetOwnedOrgsByUserID(userID int64) ([]*User, error) {
  sess := x.NewSession()

models/user.go

@@ -73,6 +73,20 @@ var (
  ErrUnsupportedLoginType = errors.New("Login source is unknown")
 )
 
+// VisibleType define the visibility (Organization only)
+type VisibleType int
+
+const (
+ // VisibleTypePublic Visible for everyone
+ VisibleTypePublic VisibleType = iota + 1
+
+ // VisibleTypeLimited Visible for every connected user
+ VisibleTypeLimited
+
+ // VisibleTypePrivate Visible only for organization's members
+ VisibleTypePrivate
+)
+
 // User represents the object of individual and member of organization.
 type User struct {
  ID int64 `xorm:"pk autoincr"`
@@ -128,8 +142,9 @@ type User struct {
  Description string
  NumTeams int
  NumMembers int
- Teams []*Team `xorm:"-"`
- Members []*User `xorm:"-"`
+ Teams []*Team `xorm:"-"`
+ Members []*User `xorm:"-"`
+ Visibility VisibleType `xorm:"DEFAULT 1"`
 
  // Preferences
  DiffViewStyle string `xorm:"NOT NULL DEFAULT ''"`
@@ -519,6 +534,16 @@ func (u *User) IsUserOrgOwner(orgID int64) bool {
  return isOwner
 }
 
+// IsUserOrgPartOf returns true if user is part of the organization
+func (u *User) IsUserOrgPartOf(userID int64) bool {
+ isMember, err := IsOrganizationMember(u.ID, userID)
+ if err != nil {
+ log.Error(4, "IsOrganizationMember: %v", err)
+ return false
+ }
+ return isMember
+}
+
 // IsPublicMember returns true if user public his/her membership in given organization.
 func (u *User) IsPublicMember(orgID int64) bool {
  isMember, err := IsPublicMembership(orgID, u.ID)

modules/auth/org.go

@@ -35,6 +35,7 @@ type UpdateOrgSettingForm struct {
  Description string `binding:"MaxSize(255)"`
  Website string `binding:"ValidUrl;MaxSize(255)"`
  Location string `binding:"MaxSize(50)"`
+ Visibility models.VisibleType
  MaxRepoCreation int
 }
 

modules/setting/setting.go

@@ -1150,6 +1150,8 @@ func NewContext() {
 
 // Service settings
 var Service struct {
+ DefaultVisibility string
+ DefaultVisibilityMode int
  ActiveCodeLives int
  ResetPwdCodeLives int
  RegisterEmailConfirm bool
@@ -1175,6 +1177,12 @@ var Service struct {
  OpenIDBlacklist []*regexp.Regexp
 }
 
+var visibilityModes = map[string]int{
+ "public": 1,
+ "limited": 2,
+ "private": 3,
+}
+
 func newService() {
  sec := Cfg.Section("service")
  Service.ActiveCodeLives = sec.Key("ACTIVE_CODE_LIVE_MINUTES").MustInt(180)
@@ -1194,6 +1202,8 @@ func newService() {
  }
  Service.DefaultAllowOnlyContributorsToTrackTime = sec.Key("DEFAULT_ALLOW_ONLY_CONTRIBUTORS_TO_TRACK_TIME").MustBool(true)
  Service.NoReplyAddress = sec.Key("NO_REPLY_ADDRESS").MustString("noreply.example.org")
+ Service.DefaultVisibility = sec.Key("DEFAULT_VISIBILITY").In("public", []string{"public", "limited", "private"})
+ Service.DefaultVisibilityMode = visibilityModes[Service.DefaultVisibility]
 
  sec = Cfg.Section("openid")
  Service.EnableOpenIDSignIn = sec.Key("ENABLE_OPENID_SIGNIN").MustBool(!InstallLock)

options/locale/locale_en-US.ini

@@ -1197,6 +1197,11 @@ settings.options = Organization
 settings.full_name = Full Name
 settings.website = Website
 settings.location = Location
+settings.visibility = Visibility
+settings.visibility.public = Public
+settings.visibility.limited = Limited (Visible to logged in users only)
+settings.visibility.private = Private (Visible only to organization members)
+
 settings.update_settings = Update Settings
 settings.update_setting_success = Organization settings have been updated.
 settings.change_orgname_prompt = Note: changing the organization name also changes the organization's URL.
@@ -1496,6 +1501,7 @@ config.enable_timetracking = Enable Time Tracking
 config.default_enable_timetracking = Enable Time Tracking by Default
 config.default_allow_only_contributors_to_track_time = Let Only Contributors Track Time
 config.no_reply_address = Hidden Email Domain
+config.default_visibility_organization = Default visibility for new Organizations
 
 config.webhook_config = Webhook Configuration
 config.queue_length = Queue Length

routers/org/setting.go

@@ -29,6 +29,7 @@ const (
 func Settings(ctx *context.Context) {
  ctx.Data["Title"] = ctx.Tr("org.settings")
  ctx.Data["PageIsSettingsOptions"] = true
+ ctx.Data["CurrentVisibility"] = models.VisibleType(ctx.Org.Organization.Visibility)
  ctx.HTML(200, tplSettingsOptions)
 }
 
@@ -79,6 +80,7 @@ func SettingsPost(ctx *context.Context, form auth.UpdateOrgSettingForm) {
  org.Description = form.Description
  org.Website = form.Website
  org.Location = form.Location
+ org.Visibility = form.Visibility
  if err := models.UpdateUser(org); err != nil {
  ctx.ServerError("UpdateUser", err)
  return

routers/user/profile.go

@@ -1,4 +1,5 @@
 // Copyright 2015 The Gogs Authors. All rights reserved.
+// Copyright 2017 The Gitea Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
@@ -96,6 +97,7 @@ func Profile(ctx *context.Context) {
  }
 
  ctx.Data["Orgs"] = orgs
+ ctx.Data["HasOrgsVisible"] = models.HasOrgVisible(orgs, ctx.User)
 
  tab := ctx.Query("tab")
  ctx.Data["TabName"] = tab

templates/admin/config.tmpl

@@ -148,6 +148,9 @@
  <dt>{{.i18n.Tr "admin.config.default_allow_only_contributors_to_track_time"}}</dt>
  <dd><i class="fa fa{{if .Service.DefaultAllowOnlyContributorsToTrackTime}}-check{{end}}-square-o"></i></dd>
  {{end}}
+ <dt>{{.i18n.Tr "admin.config.default_visibility_organization"}}</dt>
+ <dd>{{.Service.DefaultVisibility}}</dd>
+
  <dt>{{.i18n.Tr "admin.config.no_reply_address"}}</dt>
  <dd>{{if .Service.NoReplyAddress}}{{.Service.NoReplyAddress}}{{else}}-{{end}}</dd>
  <div class="ui divider"></div>

templates/admin/org/list.tmpl

@@ -29,7 +29,12 @@
  {{range .Users}}
  <tr>
  <td>{{.ID}}</td>
- <td><a href="{{.HomeLink}}">{{.Name}}</a></td>
+ <td>
+ <a href="{{.HomeLink}}">{{.Name}}</a>
+ {{if eq .Visibility 3}}
+ <span class="text gold"><i class="octicon octicon-lock"></i></span>
+ {{end}}
+ </td>
  <td>{{.NumTeams}}</td>
  <td>{{.NumMembers}}</td>
  <td>{{.NumRepos}}</td>

templates/admin/repo/list.tmpl

@@ -30,7 +30,12 @@
  {{range .Repos}}
  <tr>
  <td>{{.ID}}</td>
- <td><a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a></td>
+ <td>
+ <a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a>
+ {{if eq .Owner.Visibility 3}}
+ <span class="text gold"><i class="octicon octicon-lock"></i></span>
+ {{end}}
+ </td>
  <td><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></td>
  <td><i class="fa fa{{if .IsPrivate}}-check{{end}}-square-o"></i></td>
  <td>{{.NumWatches}}</td>

templates/explore/organizations.tmpl

@@ -6,10 +6,16 @@
 
  <div class="ui user list">
  {{range .Users}}
+ {{if (or (eq .Visibility 1) (and ($.SignedUser) (or (eq .Visibility 2) (and (.IsUserOrgPartOf $.SignedUserID) (eq .Visibility 3)) ($.IsAdmin))))}}
  <div class="item">
  <img class="ui avatar image" src="{{.RelAvatarLink}}">
  <div class="content">
- <span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span>
+ <span class="header">
+ <a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}
+ {{if eq .Visibility 3}}
+ <span class="text gold"><i class="octicon octicon-lock"></i></span>
+ {{end}}
+ </span>
  <div class="description">
  {{if .Location}}
  <i class="octicon octicon-location"></i> {{.Location}}
@@ -22,6 +28,7 @@
  </div>
  </div>
  </div>
+ {{end}}
  {{else}}
  <div>{{$.i18n.Tr "explore.org_no_results"}}</div>
  {{end}}

templates/explore/repo_list.tmpl

@@ -9,12 +9,17 @@
  <span><i class="octicon octicon-repo-forked"></i></span>
  {{else if .IsMirror}}
  <span><i class="octicon octicon-repo-clone"></i></span>
+ {{else if eq .Owner.Visibility 3}}
+ <span class="text gold"><i class="octicon octicon-lock"></i></span>
  {{end}}
 
- <div class="ui right metas">
- <span class="text grey"><i class="octicon octicon-star"></i> {{.NumStars}}</span>
- <span class="text grey"><i class="octicon octicon-git-branch"></i> {{.NumForks}}</span>
+ <div class="ui right metas">
+ <span class="text grey"><i class="octicon octicon-star"></i> {{.NumStars}}</span>
+ <span class="text grey"><i class="octicon octicon-git-branch"></i> {{.NumForks}}</span>
+ </div>
  </div>
+ {{if .DescriptionHTML}}<p class="has-emoji">{{.DescriptionHTML}}</p>{{end}}
+ <p class="time">{{$.i18n.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix $.i18n.Lang}}</p>
  </div>
  {{if .DescriptionHTML}}<p class="has-emoji">{{.DescriptionHTML}}</p>{{end}}
  {{if .Topics }}

templates/org/settings/options.tmpl

@@ -33,6 +33,29 @@
  <input id="location" name="location" value="{{.Org.Location}}">
  </div>
 
+ <div class="ui divider"></div>
+ <div class="field" id="visibility_box">
+ <label for="visibility">{{.i18n.Tr "org.settings.visibility"}}</label>
+ <div class="field">
+ <div class="ui radio checkbox">
+ <input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="1" {{if eq .CurrentVisibility 1}}checked{{end}}/>
+ <label>{{.i18n.Tr "org.settings.visibility.public"}}</label>
+ </div>
+ </div>
+ <div class="field">
+ <div class="ui radio checkbox">
+ <input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="2" {{if eq .CurrentVisibility 2}}checked{{end}}/>
+ <label>{{.i18n.Tr "org.settings.visibility.limited"}}</label>
+ </div>
+ </div>
+ <div class="field">
+ <div class="ui radio checkbox">
+ <input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="3" {{if eq .CurrentVisibility 3}}checked{{end}}/>
+ <label>{{.i18n.Tr "org.settings.visibility.private"}}</label>
+ </div>
+ </div>
+ </div>
+
  {{if .SignedUser.IsAdmin}}
  <div class="ui divider"></div>
 

templates/user/profile.tmpl

@@ -61,10 +61,12 @@
  </a>
  </li>
  */}}
- {{if .Orgs}}
+ {{if and .Orgs .HasOrgsVisible}}
  <li>
  {{range .Orgs}}
- <a href="{{.HomeLink}}"><img class="ui mini image poping up" src="{{.RelAvatarLink}}" data-content="{{.Name}}" data-position="top center" data-variation="tiny inverted"></a>
+ {{if (or (eq .Visibility 1) (and ($.SignedUser) (or (eq .Visibility 2) (and (.IsUserOrgPartOf $.SignedUserID) (eq .Visibility 3)) ($.IsAdmin))))}}
+ <a href="{{.HomeLink}}"><img class="ui mini image poping up" src="{{.RelAvatarLink}}" data-content="{{.Name}}" data-position="top center" data-variation="tiny inverted"></a>
+ {{end}}
  {{end}}
  </li>
  {{end}}