DeforaNetworks/corteza
DeforaNetworks/corteza
3
0
Fork 0
Code

upd(crm): returns entityID

Browse Source
This commit is contained in:
Tit Petric 2018-11-25 15:23:48 +01:00
parent 0e20de4eb9
commit d4170ff97e
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crm/types/types.go
View File

@ -11,7 +11,7 @@ import (
type (
// Content is a stored row in the `content` table
Content struct {
ID uint64 `json:"id,string" db:"id"`
ID uint64 `json:"contentID,string" db:"id"`
ModuleID uint64 `json:"moduleID,string" db:"module_id"`
User *systemTypes.User `json:"user,omitempty" db:"-"`
@ -51,7 +51,7 @@ type (
// Modules - CRM module definitions
Module struct {
ID uint64 `json:"id,string" db:"id"`
ID uint64 `json:"moduleID,string" db:"id"`
Name string `json:"name" db:"name"`
Fields types.JSONText `json:"fields" db:"json"`
@ -81,7 +81,7 @@ type (
// Page - page structure
Page struct {
ID uint64 `json:"id,string" db:"id"`
ID uint64 `json:"pageID,string" db:"id"`
SelfID uint64 `json:"selfID,string" db:"self_id"`
ModuleID uint64 `json:"moduleID,string" db:"module_id"`

3
system/rest/oidc.go
View File

@ -2,7 +2,6 @@ package rest
import (
"context"
"fmt"
"math/rand"
"net/http"
"strconv"
@ -61,8 +60,6 @@ func OpenIdConnect(ctx context.Context, cfg *config.OIDC, usvc service.UserServi
jwt: jwt,
}
fmt.Printf("%#v\n", *cfg)
// Allow 5 seconds for issuer discovery process
c.provider, err = oidc.NewProvider(ctx, cfg.Issuer)
if err != nil {