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

README.md

@@ -9,7 +9,6 @@
 ### Procédure
 
 ```bash
-cd client && npm install # Installation des dépendances client
 make watch  # Surveiller les modifications sur le sources et compiler/démarrer le serveur
 ```
 

client/src/store/sagas/failure.ts

@@ -1,11 +1,10 @@
 import { GiteaUnauthorizedError } from "../../util/gitea";
 import { put } from 'redux-saga/effects';
 import { logout } from '../actions/logout';
-import { saveReferer } from "../../util/referer";
 
 export function* failuresSaga(action) {
-  if (action.error instanceof GiteaUnauthorizedError) {
-    saveReferer();
+  const err = action.error;
+  if (err instanceof GiteaUnauthorizedError) {
     yield put(logout());
   }
 }

client/src/store/sagas/issues.ts

@@ -18,7 +18,7 @@ export function* fetchIssuesSaga(action: any) {
       if (pageIssues.length === 0) {
         break;
       }
-      issues.push(...pageIssues.filter(issue => issue.pull_request === null));
+      issues.push(...pageIssues);
       page++;
     }
     

client/src/store/sagas/referer.ts

@@ -1,9 +0,0 @@
-import { hasReferer, getReferer, clearReferer } from '../../util/referer';
-
-export function* navigateToRefererSaga() {
-    if (!hasReferer()) return;
-    const referer = getReferer();
-    console.log("Redirecting to referer", referer);
-    clearReferer();
-    window.location.hash = referer;
-}

client/src/store/sagas/root.ts

@@ -10,11 +10,9 @@ import { LOGOUT_REQUEST, LOGOUT_SUCCESS } from '../actions/logout';
 import { logoutSaga, logoutSuccessSaga } from './logout';
 import { BUILD_KANBOARD_REQUEST, MOVE_CARD } from '../actions/kanboards';
 import { buildKanboardSaga, moveCardSaga, refreshKanboardSaga } from './kanboards';
-import { navigateToRefererSaga } from './referer';
 
 export function* rootSaga() {
   yield all([
-    navigateToRefererSaga(),
     takeEvery(patternFromRegExp(/^.*_FAILURE/), failuresSaga),
     takeLatest(FETCH_BOARDS_REQUEST, fetchBoardsSaga),
     takeLatest(BUILD_KANBOARD_REQUEST, buildKanboardSaga),

client/src/store/store.ts

@@ -1,4 +1,4 @@
-import { createStore, applyMiddleware, compose } from 'redux'
+import { createStore, applyMiddleware } from 'redux'
 import createSagaMiddleware from 'redux-saga'
 import { rootReducer }  from './reducers/root'
 import { rootSaga } from './sagas/root'
@@ -14,8 +14,6 @@ if (process.env.NODE_ENV !== 'production') {
   reduxMiddlewares.push(loggerMiddleware);
 }
 
-const composeEnhancers = (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
-
 // create the saga middleware
 const sagaMiddleware = createSagaMiddleware()
 reduxMiddlewares.push(sagaMiddleware);
@@ -23,7 +21,7 @@ reduxMiddlewares.push(sagaMiddleware);
 // mount it on the Store
 export const store = createStore(
   rootReducer,
-  composeEnhancers(applyMiddleware(...reduxMiddlewares)),
+  applyMiddleware(...reduxMiddlewares)
 )
 
 // then run the saga

client/src/util/gitea.ts

@@ -2,7 +2,6 @@
 export class GiteaUnauthorizedError extends Error {
   constructor(...args: any[]) {
     super(...args)
-    Object.setPrototypeOf(this, GiteaUnauthorizedError.prototype);
   }
 }
 

client/src/util/referer.ts

@@ -1,19 +0,0 @@
-const localStorage = window.localStorage;
-const refererKey = 'referer';
-
-export function getReferer() {
-    return localStorage.getItem(refererKey);
-}
-
-export function saveReferer() {
-    console.log("Saving referer", window.location.hash);
-    localStorage.setItem(refererKey, window.location.hash);
-}
-
-export function hasReferer() {
-    return !!getReferer();
-}
-
-export function clearReferer() {
-    localStorage.removeItem(refererKey);
-}

cmd/server/container.go

@@ -28,7 +28,7 @@ func getServiceContainer(conf *config.Config) (*service.Container, error) {
 
 	ctn.Provide(
 		session.ServiceName,
-		gorilla.ServiceProvider("gengitkan", cookieStore),
+		gorilla.ServiceProvider("gitea-kan", cookieStore),
 	)
 
 	// Create and expose config service provider

debian/compat

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

debian/control

@@ -0,0 +1,14 @@
+Source: gengitkan
+Section: unknown
+Priority: optional
+Maintainer: William Petit <wpetit@cadoles.com>
+Build-Depends: debhelper (>= 8.0.0), wget, ca-certificates, tar
+Standards-Version: 3.9.4
+Homepage: http://forge.cadoles.com/wpetit/gengitkan
+Vcs-Git: http://forge.cadoles.com/wpetit/gengitkan.git
+Vcs-Browser: http://forge.cadoles.com/wpetit/gengitkan
+
+Package: gengitkan
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Application type "Kanboard" connectée à Gitea

debian/gengitkan.dirs

@@ -0,0 +1 @@
+var/lib/gengitkan

debian/gengitkan.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Application type "Kanboard" connectée à Gitea
+After=network-online.target
+
+[Service]
+Type=simple
+Environment=GENGITKAN_HTTP_PUBDIR=/usr/share/gengitkan/public
+Environment=GENGITKAN_DATA_DBPATH=/var/lib/gengitkan/data.db
+ExecStart=/usr/bin/gengitkan -workdir /usr/share/gengitkan -config /etc/gengitkan/server.conf
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

debian/rules

@@ -0,0 +1,54 @@
+#!/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
+endif
+
+ifeq (, $(shell which node 2>/dev/null))
+override_dh_auto_build: install-nodejs
+endif
+
+%:
+	dh $@ --with systemd
+
+override_dh_auto_build: $(GOPATH)
+	cd client && npm install
+	GOPATH=$(GOPATH) PATH="$(PATH):/usr/local/go/bin:$(GOPATH)/bin" go mod vendor
+	GOPATH=$(GOPATH) PATH="$(PATH):/usr/local/go/bin:$(GOPATH)/bin" ARCH_TARGETS=$(ARCH) make release
+
+$(GOPATH):
+	mkdir -p $(GOPATH)
+	
+install-go:
+	wget 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/gengitkan/usr/share/gengitkan
+	mkdir -p debian/gengitkan/etc/gengitkan
+	mkdir -p debian/gengitkan/usr/bin
+
+	cp -r release/server-$(OS)-$(ARCH)/* debian/gengitkan/usr/share/gengitkan/
+	
+	mv debian/gengitkan/usr/share/gengitkan/bin/server debian/gengitkan/usr/bin/gengitkan
+	mv debian/gengitkan/usr/share/gengitkan/server.conf debian/gengitkan/etc/gengitkan/server.conf
+
+	install -d debian/gengitkan
+
+override_dh_strip:
+
+override_dh_auto_test:

debian/source/format

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

internal/config/config.go

@@ -20,7 +20,6 @@ type HTTPConfig struct {
 }
 
 type GiteaConfig struct {
-	BaseURL      string
 	ClientID     string
 	ClientSecret string
 	RedirectURL  string