Merge branch 'develop' into dist/ubuntu/bionic/develop

client/src/components/WorkgroupPage/InfoForm.tsx

@@ -14,7 +14,6 @@ export function InfoForm({ workgroup, onChange }: InfoFormProps) {
     workgroup: {
       id: workgroup && workgroup.id ? workgroup.id : '',
       name: workgroup && workgroup.name ? workgroup.name : '',
-      description: workgroup && workgroup.description ? workgroup.description : '',
       createdAt: workgroup && workgroup.createdAt ? workgroup.createdAt : null,
       closedAt: workgroup && workgroup.closedAt ? workgroup.closedAt : null,
     }
@@ -35,7 +34,6 @@ export function InfoForm({ workgroup, onChange }: InfoFormProps) {
       workgroup: {
         id: workgroup && workgroup.id ? workgroup.id : '',
         name: workgroup && workgroup.name ? workgroup.name : '',
-        description: workgroup && workgroup.description ? workgroup.description : '',
         createdAt: workgroup && workgroup.createdAt ? workgroup.createdAt : null,
         closedAt: workgroup && workgroup.closedAt ? workgroup.closedAt : null,
       }
@@ -78,14 +76,6 @@ export function InfoForm({ workgroup, onChange }: InfoFormProps) {
             onChange={onWorkgroupAttrChange.bind(null, "name")} />
         </div>
       </div>
-      <div className="field">
-        <label className="label">Nom du groupe</label>
-        <div className="control">
-          <textarea className="input" value={state.workgroup.description}
-            disabled={!isAuthorized}
-            onChange={onWorkgroupAttrChange.bind(null, "description")}></textarea>
-        </div>
-      </div>
       {
         state.workgroup.createdAt ?
         <div className="field">

client/src/gql/mutations/workgroups.tsx

@@ -7,7 +7,6 @@ mutation updateWorkgroup($workgroupId: ID!, $changes: WorkgroupChanges!) {
   updateWorkgroup(workgroupId: $workgroupId, changes: $changes) {
     id,
     name,
-    description,
     createdAt,
     closedAt,
     members {
@@ -27,7 +26,6 @@ mutation createWorkgroup($changes: WorkgroupChanges!) {
   createWorkgroup(changes: $changes) {
     id,
     name,
-    description,
     createdAt,
     closedAt,
     members {
@@ -49,7 +47,6 @@ mutation joinWorkgroup($workgroupId: ID!) {
   joinWorkgroup(workgroupId: $workgroupId) {
     id,
     name,
-    description,
     createdAt,
     closedAt,
     members {
@@ -81,7 +78,6 @@ mutation leaveWorkgroup($workgroupId: ID!) {
   leaveWorkgroup(workgroupId: $workgroupId) {
     id,
     name,
-    description,
     createdAt,
     closedAt,
     members {
@@ -121,7 +117,6 @@ mutation closeWorkgroup($workgroupId: ID!) {
   closeWorkgroup(workgroupId: $workgroupId) {
     id,
     name,
-    description,
     createdAt,
     closedAt,
     members {

client/src/gql/queries/workgroups.tsx

@@ -7,7 +7,6 @@ export const QUERY_WORKGROUP = gql`
     workgroups(filter: $filter) {
       id,
       name,
-      description,
       createdAt,
       closedAt,
       members {

client/src/types/workgroup.ts

@@ -2,7 +2,6 @@ import { User } from "./user";
 export interface Workgroup {
   id: string
   name: string
-  description: string
   createdAt: Date
   closedAt: Date
   members: User[]

cmd/server/container.go

@@ -79,9 +79,8 @@ func getServiceContainer(ctx context.Context, conf *config.Config) (*service.Con
 	// Define default cookie options
 	sessionStore.SessionOpts.Path = "/"
 	sessionStore.SessionOpts.HttpOnly = true
-	sessionStore.SessionOpts.Secure = conf.HTTP.CookieSecure
 	sessionStore.SessionOpts.MaxAge = conf.HTTP.CookieMaxAge
-	sessionStore.SessionOpts.SameSite = http.SameSiteLaxMode
+	sessionStore.SessionOpts.SameSite = http.SameSiteStrictMode
 
 	ctn.Provide(
 		session.ServiceName,

cmd/server/migration.go

@@ -27,8 +27,7 @@ func applyMigration(ctx context.Context, ctn *service.Container) error {
 
 	// Register available migrations
 	migr.Register(
-		m000InitialSchema(),
-		m001WorkgroupDescription(),
+		m000initialSchema(),
 	)
 
 	currentVersion, err := migr.CurrentVersion(ctx)
@@ -85,7 +84,7 @@ var initialModels = []interface{}{
 	&model.Event{},
 }
 
-func m000InitialSchema() orm.Migration {
+func m000initialSchema() orm.Migration {
 	return orm.NewDBMigration(
 		"00_initial_schema",
 		func(ctx context.Context, tx *gorm.DB) error {
@@ -108,23 +107,3 @@ func m000InitialSchema() orm.Migration {
 		},
 	)
 }
-
-func m001WorkgroupDescription() orm.Migration {
-	return orm.NewDBMigration(
-		"01_workgroup_description",
-		func(ctx context.Context, tx *gorm.DB) error {
-			if err := tx.AutoMigrate(&model.Workgroup{}).Error; err != nil {
-				return errors.WithStack(err)
-			}
-
-			return nil
-		},
-		func(ctx context.Context, tx *gorm.DB) error {
-			if err := tx.Model(&model.Workgroup{}).DropColumn("description").Error; err != nil {
-				return errors.WithStack(err)
-			}
-
-			return nil
-		},
-	)
-}

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -0,0 +1,14 @@
+Source: daddy
+Section: unknown
+Priority: optional
+Maintainer: Cadoles <contact@cadoles.com>
+Build-Depends: debhelper (>= 8.0.0), wget, ca-certificates, tar
+Standards-Version: 3.9.4
+Homepage: http://forge.cadoles.com/Cadoles/daddy
+Vcs-Git: http://forge.cadoles.com/Cadoles/daddy.git
+Vcs-Browser: http://forge.cadoles.com/Cadoles/daddy
+
+Package: daddy
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Daddy app

debian/daddy.links

@@ -0,0 +1 @@
+/etc/daddy/client-config.js /usr/share/daddy/public/config.js

debian/daddy.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Daddy app
+After=network-online.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/daddy -workdir /usr/share/daddy -config /etc/daddy/config.yml
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

debian/rules

@@ -0,0 +1,56 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+GO_VERSION := 1.13.5
+OS := linux
+ARCH := amd64
+GOPATH=$(HOME)/go
+
+ifeq (, $(shell which go 2>/dev/null))
+override_dh_auto_build: install-go
+
+override_dh_auto_clean: install-go
+endif
+
+ifeq (, $(shell which node 2>/dev/null))
+override_dh_auto_build: install-nodejs
+endif
+
+%:
+	dh $@ --with systemd
+
+override_dh_auto_build: $(GOPATH)
+	GOPATH=$(GOPATH) PATH="$(PATH):/usr/local/go/bin:$(GOPATH)/bin" make deps
+	GOPATH=$(GOPATH) PATH="$(PATH):/usr/local/go/bin:$(GOPATH)/bin" ARCH_TARGETS=$(ARCH) make release
+
+$(GOPATH):
+	mkdir -p $(GOPATH)
+	
+install-go:
+	wget -nc https://dl.google.com/go/go$(GO_VERSION).$(OS)-$(ARCH).tar.gz
+	tar -C /usr/local -xzf go$(GO_VERSION).$(OS)-$(ARCH).tar.gz
+
+install-nodejs:
+	wget -O- https://deb.nodesource.com/setup_12.x | bash -
+	apt-get install -y nodejs
+
+override_dh_auto_install:
+
+	mkdir -p debian/daddy/usr/share/daddy
+	mkdir -p debian/daddy/etc/daddy
+	mkdir -p debian/daddy/usr/bin
+
+	cp -r release/server-$(OS)-$(ARCH)/* debian/daddy/usr/share/daddy/
+	
+	mv debian/daddy/usr/share/daddy/bin/server debian/daddy/usr/bin/daddy
+	mv debian/daddy/usr/share/daddy/server.conf debian/daddy/etc/daddy/config.yml
+	mv debian/daddy/usr/share/daddy/public/config.js debian/daddy/etc/daddy/client-config.js
+
+	install -d debian/daddy
+
+override_dh_strip:
+
+override_dh_auto_test:

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

go.mod

@@ -3,7 +3,7 @@ module forge.cadoles.com/Cadoles/daddy
 go 1.14
 
 require (
-	forge.cadoles.com/wpetit/goweb-oidc v0.0.0-20201013125038-8d8d1519a52d
+	forge.cadoles.com/wpetit/goweb-oidc v0.0.0-20201013111944-d43b43b636ed
 	forge.cadoles.com/wpetit/hydra-passwordless v0.0.0-20200908094025-38ac4422dddc // indirect
 	github.com/99designs/gqlgen v0.11.3
 	github.com/alecthomas/chroma v0.8.1 // indirect

go.sum

@@ -41,8 +41,6 @@ forge.cadoles.com/wpetit/goweb-oidc v0.0.0-20201013085949-5d5592098f13 h1:gZCo9p
 forge.cadoles.com/wpetit/goweb-oidc v0.0.0-20201013085949-5d5592098f13/go.mod h1:phGAWHUGKNZj044478BvRg0jk049uK1IiX2Amh8krAk=
 forge.cadoles.com/wpetit/goweb-oidc v0.0.0-20201013111944-d43b43b636ed h1:7dTCXOGxvAulu9vnOjpt2cTgsuxMHX4FH795/JJgo08=
 forge.cadoles.com/wpetit/goweb-oidc v0.0.0-20201013111944-d43b43b636ed/go.mod h1:phGAWHUGKNZj044478BvRg0jk049uK1IiX2Amh8krAk=
-forge.cadoles.com/wpetit/goweb-oidc v0.0.0-20201013125038-8d8d1519a52d h1:o+Ppy/MyT5UgbtUYI2J1YqS3iuThxOuNFenYoPgKZKk=
-forge.cadoles.com/wpetit/goweb-oidc v0.0.0-20201013125038-8d8d1519a52d/go.mod h1:phGAWHUGKNZj044478BvRg0jk049uK1IiX2Amh8krAk=
 forge.cadoles.com/wpetit/hydra-passwordless v0.0.0-20200908094025-38ac4422dddc h1:9gc/1qizPtK6/iMVlizknWUFii75ntl2xSUV/FSC92Y=
 forge.cadoles.com/wpetit/hydra-passwordless v0.0.0-20200908094025-38ac4422dddc/go.mod h1:nANHORi270d5jDXjeJ7B3pMgK9R4J0/17p1IIc+rhOk=
 github.com/99designs/gqlgen v0.11.3 h1:oFSxl1DFS9X///uHV3y6CEfpcXWrDUxVblR4Xib2bs4=

internal/config/config.go

@@ -47,7 +47,6 @@ type HTTPConfig struct {
 	CookieAuthenticationKey string     `yaml:"cookieAuthenticationKey" env:"HTTP_COOKIE_AUTHENTICATION_KEY"`
 	CookieEncryptionKey     string     `yaml:"cookieEncryptionKey" env:"HTTP_COOKIE_ENCRYPTION_KEY"`
 	CookieMaxAge            int        `yaml:"cookieMaxAge" env:"HTTP_COOKIE_MAX_AGE"`
-	CookieSecure            bool       `yaml:"cookieSecure" env:"HTTP_COOKIE_SECURE"`
 	TemplateDir             string     `yaml:"templateDir" env:"HTTP_TEMPLATE_DIR"`
 	PublicDir               string     `yaml:"publicDir" env:"HTTP_PUBLIC_DIR"`
 	FrontendURL             string     `yaml:"frontendURL" env:"HTTP_FRONTEND_URL"`

internal/model/workgroup.go

@@ -10,10 +10,9 @@ const ObjectTypeWorkgroup = "workgroup"
 
 type Workgroup struct {
 	gorm.Model
-	Name      *string   `json:"name"`
-	Workgroup *string   `json:"workgroup"`
-	ClosedAt  time.Time `json:"closedAt"`
-	Members   []*User   `gorm:"many2many:users_workgroups;association_autoupdate:false"`
+	Name     *string   `json:"name"`
+	ClosedAt time.Time `json:"closedAt"`
+	Members  []*User   `gorm:"many2many:users_workgroups;association_autoupdate:false"`
 }
 
 func (w *Workgroup) ObjectID() uint {

internal/route/login.go

@@ -68,8 +68,9 @@ func handleLoginCallback(w http.ResponseWriter, r *http.Request) {
 	db := orm.Must(ctn).DB()
 	repo := model.NewUserRepository(db)
 
-	user := &model.User{
-		Email: claims.Email,
+	user, err := repo.CreateOrConnectUser(ctx, claims.Email)
+	if err != nil {
+		panic(errors.Wrap(err, "could not upsert user"))
 	}
 
 	authorized, err := auth.Authorize(user)
@@ -84,11 +85,6 @@ func handleLoginCallback(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	user, err = repo.CreateOrConnectUser(ctx, claims.Email)
-	if err != nil {
-		panic(errors.Wrap(err, "could not upsert user"))
-	}
-
 	if err := session.SaveUserEmail(w, r, claims.Email); err != nil {
 		panic(errors.WithStack(err))
 	}

misc/debian/nginx/daddy.conf

@@ -0,0 +1,15 @@
+server {
+    listen 80 default_server;
+    server_name daddy.local;
+    
+    root /usr/share/daddy/client/public;
+    index index.html;
+    
+    location / {
+        try_files $uri /index.html =404;
+    }
+
+    location /api/v1/graphql {
+        proxy_pass http://127.0.0.1:8080/api/v1/graphql;
+    }
+}

misc/debian/systemd/daddy.env

@@ -0,0 +1 @@
+GO_ENV=prod