Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Añade compatibilidad con Directus 11. #29

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions accesses_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package directus

import (
"context"
"fmt"
"strconv"
"strings"
"testing"

"github.com/stretchr/testify/require"
)

func TestAccessesList(t *testing.T) {
i, err := initClient(t).Server.Info(context.Background())
require.NoError(t, err)

major, err := strconv.Atoi(strings.Split(i.Version, "")[0])
require.NoError(t, err)

if major >= 11 {
accesses, err := initClient(t).Accesses.List(context.Background())
require.NoError(t, err)
require.NotEmpty(t, accesses)

for _, access := range accesses {
fmt.Printf("%#v\n", access)
}
}
}
8 changes: 8 additions & 0 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,16 @@ type Client struct {
CustomTranslations *ResourceClient[CustomTranslation, string]
Folders *ResourceClient[Folder, string]
Roles *ResourceClient[Role, string]
RolesV11 *ResourceClient[Role, string]
Policies *ResourceClient[Policy, string]
Accesses *ResourceClient[Access, string]
Users *ResourceClient[User, string]
Presets *ResourceClient[Preset, int64]
Operations *ResourceClient[Operation, string]
Flows *ResourceClient[Flow, string]
Files *ResourceClient[File, string]
Permissions *ResourceClient[Permission, int64]
PermissionsV11 *ResourceClient[PermissionV11, int64]
Dashboards *ResourceClient[Dashboard, string]
Panels *ResourceClient[Panel, string]
Relations *clientRelations
Expand Down Expand Up @@ -66,12 +70,16 @@ func NewClient(instance string, token string, opts ...ClientOption) *Client {
client.CustomTranslations = NewResourceClient[CustomTranslation, string](client, "translations")
client.Folders = NewResourceClient[Folder, string](client, "folders")
client.Roles = NewResourceClient[Role, string](client, "roles")
client.RolesV11 = NewResourceClient[Role, string](client, "roles")
client.Policies = NewResourceClient[Policy, string](client, "policies")
client.Accesses = NewResourceClient[Access, string](client, "access")
client.Users = NewResourceClient[User, string](client, "users")
client.Presets = NewResourceClient[Preset, int64](client, "presets")
client.Operations = NewResourceClient[Operation, string](client, "operations")
client.Flows = NewResourceClient[Flow, string](client, "flows")
client.Files = NewResourceClient[File, string](client, "files")
client.Permissions = NewResourceClient[Permission, int64](client, "permissions")
client.PermissionsV11 = NewResourceClient[PermissionV11, int64](client, "permissions")
client.Dashboards = NewResourceClient[Dashboard, string](client, "dashboards")
client.Panels = NewResourceClient[Panel, string](client, "panels")
client.Fields = &clientFields{client: client}
Expand Down
29 changes: 29 additions & 0 deletions policies_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package directus

import (
"context"
"fmt"
"strconv"
"strings"
"testing"

"github.com/stretchr/testify/require"
)

func TestPoliciesList(t *testing.T) {
i, err := initClient(t).Server.Info(context.Background())
require.NoError(t, err)

major, err := strconv.Atoi(strings.Split(i.Version, "")[0])
require.NoError(t, err)

if major >= 11 {
policies, err := initClient(t).Policies.List(context.Background())
require.NoError(t, err)
require.NotEmpty(t, policies)

for _, policy := range policies {
fmt.Printf("%#v\n", policy)
}
}
}
28 changes: 24 additions & 4 deletions roles_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,37 @@ package directus
import (
"context"
"fmt"
"strconv"
"strings"
"testing"

"github.com/stretchr/testify/require"
)

func TestRolesList(t *testing.T) {
roles, err := initClient(t).Roles.List(context.Background())
i, err := initClient(t).Server.Info(context.Background())
require.NoError(t, err)
require.NotEmpty(t, roles)

for _, role := range roles {
fmt.Printf("%#v\n", role)
major, err := strconv.Atoi(strings.Split(i.Version, "")[0])
require.NoError(t, err)

if major >= 11 {
roles, err := initClient(t).RolesV11.List(context.Background())
require.NoError(t, err)
require.NotEmpty(t, roles)

for _, role := range roles {
fmt.Printf("%#v\n", role)
}
}

if major < 11 {
roles, err := initClient(t).Roles.List(context.Background())
require.NoError(t, err)
require.NotEmpty(t, roles)

for _, role := range roles {
fmt.Printf("%#v\n", role)
}
}
}
94 changes: 94 additions & 0 deletions system.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,16 @@ type Role struct {
Users []string `json:"users,omitempty"`
}

type RoleV11 struct {
ID string `json:"id,omitempty"`
Icon Icon `json:"icon,omitempty"`
Name string `json:"name"`
Description string `json:"description,omitempty"`
Parent string `json:"parent,omitempty"`

Users []string `json:"users,omitempty"`
}

type User struct {
ID string `json:"id,omitempty"`
FirstName string `json:"first_name,omitempty"`
Expand Down Expand Up @@ -390,6 +400,54 @@ func (action *PermissionAction) MarshalJSON() ([]byte, error) {
return json.Marshal(string(*action))
}

type Policy struct {
ID string `json:"id,omitempty"`
Icon Icon `json:"icon,omitempty"`
Name string `json:"name"`
Description string `json:"description,omitempty"`

AdminAccess bool `json:"admin_access"`
AppAccess bool `json:"app_access"`

Users []string `json:"users,omitempty"`
Roles []string `json:"roles,omitempty"`

Unknown map[string]any `json:"-"`
}

func (policy *Policy) UnmarshalJSON(data []byte) error {
values, err := marshmallow.Unmarshal(data, policy, marshmallow.WithExcludeKnownFieldsFromMap(true))
if err != nil {
return err
}
policy.Unknown = values
return nil
}

func (policy *Policy) MarshalJSON() ([]byte, error) {
type alias Policy
base, err := json.Marshal((*alias)(policy))
if err != nil {
return nil, err
}
m := make(map[string]any)
for k, v := range policy.Unknown {
m[k] = v
}
if err := json.Unmarshal(base, &m); err != nil {
return nil, err
}
return json.Marshal(m)
}

type Access struct {
ID string `json:"id"`
Role Nullable[string] `json:"role"`
User Nullable[string] `json:"user"`
Policy string `json:"policy"`
Sort int64 `json:"sort,omitempty"`
}

type Permission struct {
ID int64 `json:"id,omitempty"`
Role Nullable[string] `json:"role"`
Expand Down Expand Up @@ -426,6 +484,42 @@ func (permission *Permission) MarshalJSON() ([]byte, error) {
return json.Marshal(m)
}

type PermissionV11 struct {
ID int64 `json:"id,omitempty"`
Collection string `json:"collection"`
Action PermissionAction `json:"action"`
Fields Nullable[[]string] `json:"fields"`
System bool `json:"system,omitempty"`
Policy string `json:"policy"`

Unknown map[string]any `json:"-"`
}

func (permission *PermissionV11) UnmarshalJSON(data []byte) error {
values, err := marshmallow.Unmarshal(data, permission, marshmallow.WithExcludeKnownFieldsFromMap(true))
if err != nil {
return err
}
permission.Unknown = values
return nil
}

func (permission *PermissionV11) MarshalJSON() ([]byte, error) {
type alias PermissionV11
base, err := json.Marshal((*alias)(permission))
if err != nil {
return nil, err
}
m := make(map[string]any)
for k, v := range permission.Unknown {
m[k] = v
}
if err := json.Unmarshal(base, &m); err != nil {
return nil, err
}
return json.Marshal(m)
}

type Dashboard struct {
ID string `json:"id,omitempty"`
Name string `json:"name"`
Expand Down