Commit 031590b4 authored by Juliusz Chroboczek's avatar Juliusz Chroboczek

Rename 'allow-tokens' to 'unrestricted-tokens'.

parent 37782711
...@@ -130,8 +130,8 @@ following fields are allowed: ...@@ -130,8 +130,8 @@ following fields are allowed:
- `max-history-age`: the time, in seconds, during which chat history is - `max-history-age`: the time, in seconds, during which chat history is
kept (default 14400, i.e. 4 hours); kept (default 14400, i.e. 4 hours);
- `allow-recording`: if true, then recording is allowed in this group; - `allow-recording`: if true, then recording is allowed in this group;
- `allow-tokens`: if true, then ordinary users (without the "op" privilege) - `unrestricted-tokens`: if true, then ordinary users (without the "op"
are allowed to create tokens; privilege) are allowed to create tokens;
- `allow-anonymous`: if true, then users may connect with an empty username; - `allow-anonymous`: if true, then users may connect with an empty username;
- `allow-subgroups`: if true, then subgroups of the form `group/subgroup` - `allow-subgroups`: if true, then subgroups of the form `group/subgroup`
are automatically created when first accessed; are automatically created when first accessed;
......
...@@ -954,7 +954,7 @@ type Description struct { ...@@ -954,7 +954,7 @@ type Description struct {
AllowRecording bool `json:"allow-recording,omitempty"` AllowRecording bool `json:"allow-recording,omitempty"`
// Whether creating tokens is allowed // Whether creating tokens is allowed
AllowTokens bool `json:"allow-tokens,omitempty"` UnrestrictedTokens bool `json:"unrestricted-tokens,omitempty"`
// Whether subgroups are created on the fly. // Whether subgroups are created on the fly.
AllowSubgroups bool `json:"allow-subgroups,omitempty"` AllowSubgroups bool `json:"allow-subgroups,omitempty"`
...@@ -1129,7 +1129,7 @@ func (g *Group) getPasswordPermission(creds ClientCredentials) ([]string, error) ...@@ -1129,7 +1129,7 @@ func (g *Group) getPasswordPermission(creds ClientCredentials) ([]string, error)
if found, good := matchClient(creds, desc.Presenter); found { if found, good := matchClient(creds, desc.Presenter); found {
if good { if good {
p := []string{"present"} p := []string{"present"}
if desc.AllowTokens { if desc.UnrestrictedTokens {
p = append(p, "token") p = append(p, "token")
} }
return p, nil return p, nil
...@@ -1139,7 +1139,7 @@ func (g *Group) getPasswordPermission(creds ClientCredentials) ([]string, error) ...@@ -1139,7 +1139,7 @@ func (g *Group) getPasswordPermission(creds ClientCredentials) ([]string, error)
if found, good := matchClient(creds, desc.Other); found { if found, good := matchClient(creds, desc.Other); found {
if good { if good {
p := []string{} p := []string{}
if desc.AllowTokens { if desc.UnrestrictedTokens {
p = append(p, "token") p = append(p, "token")
} }
return p, nil return p, nil
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment