From d4170ff97e965a9ee6bd7cb5970c42f73fe84aaa Mon Sep 17 00:00:00 2001
From: Tit Petric <black@scene-si.org>
Date: Sun, 25 Nov 2018 15:23:48 +0100
Subject: [PATCH] upd(crm): returns entityID

---
 crm/types/types.go  | 6 +++---
 system/rest/oidc.go | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/crm/types/types.go b/crm/types/types.go
index 0b374c6ce..f83bddccd 100644
--- a/crm/types/types.go
+++ b/crm/types/types.go
@@ -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"`
diff --git a/system/rest/oidc.go b/system/rest/oidc.go
index b153354e2..81f4f0a93 100644
--- a/system/rest/oidc.go
+++ b/system/rest/oidc.go
@@ -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 {