fix: segfault on database connection failure

fix: url encode avatar filename when showing path
fixes #61
2020-09-12 18:23:23 -05:00 · 2020-09-12 18:12:12 -05:00 · 2020-09-12 18:03:17 -05:00 · 2020-09-12 03:33:24 -05:00 · 2020-09-12 03:24:09 -05:00 · 2020-09-12 01:32:01 -05:00
36 changed files with 232 additions and 208 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -18,6 +18,8 @@ If applicable, add screenshots to help explain your problem.
 **Additional context**
 Add any other context about the problem here.

+Please send the Taskcafe web service logs if applicable.
+
 <!--

 Please read the contributing guide before working on any new pull requests!
--- a/conf/taskcafe.example.toml
+++ b/conf/taskcafe.example.toml
@ -1,5 +1,5 @@
-[general]
-host = '0.0.0.0:3333'
+[server]
+hostname = '0.0.0.0:3333'

 [email_notifications]
 enabled = true
--- a/frontend/package.json
+++ b/frontend/package.json
@ -6,14 +6,6 @@
    "@apollo/client": "^3.0.0-rc.8",
    "@apollo/react-common": "^3.1.4",
    "@apollo/react-hooks": "^3.1.3",
-    "@fortawesome/fontawesome-svg-core": "^1.2.27",
-    "@fortawesome/free-brands-svg-icons": "^5.12.1",
-    "@fortawesome/free-regular-svg-icons": "^5.12.1",
-    "@fortawesome/free-solid-svg-icons": "^5.12.1",
-    "@fortawesome/react-fontawesome": "^0.1.8",
-    "@testing-library/jest-dom": "^4.2.4",
-    "@testing-library/react": "^9.3.2",
-    "@testing-library/user-event": "^7.1.2",
    "@types/axios": "^0.14.0",
    "@types/color": "^3.0.1",
    "@types/date-fns": "^2.6.0",
--- a/frontend/src/Install/index.tsx
+++ b/frontend/src/Install/index.tsx
@ -59,7 +59,7 @@ const Install = () => {
                  } else {
                    const response: RefreshTokenResponse = await x.data;
                    const { accessToken: newToken, isInstalled } = response;
-                    const claims: JWTToken = jwtDecode(accessToken);
+                    const claims: JWTToken = jwtDecode(newToken);
                    const currentUser = {
                      id: claims.userId,
                      roles: {
@ -69,7 +69,7 @@ const Install = () => {
                      },
                    };
                    setUser(currentUser);
-                    setAccessToken(accessToken);
+                    setAccessToken(newToken);
                    if (!isInstalled) {
                      history.replace('/install');
                    }
--- a/frontend/src/Projects/Project/Board/index.tsx
+++ b/frontend/src/Projects/Project/Board/index.tsx
@ -323,7 +323,6 @@ const ProjectBoard: React.FC<ProjectBoardProps> = ({ projectID, onCardLabelClick
  const [updateTaskGroupName] = useUpdateTaskGroupNameMutation({});
  const { loading, data } = useFindProjectQuery({
    variables: { projectID },
-    pollInterval: 5000,
  });
  const [deleteTaskGroupTasks] = useDeleteTaskGroupTasksMutation({
    update: (client, resp) =>
--- a/frontend/src/Projects/Project/Details/index.tsx
+++ b/frontend/src/Projects/Project/Details/index.tsx
@ -3,7 +3,7 @@ import Modal from 'shared/components/Modal';
 import TaskDetails from 'shared/components/TaskDetails';
 import { Popup, usePopup } from 'shared/components/PopupMenu';
 import MemberManager from 'shared/components/MemberManager';
-import { useRouteMatch, useHistory, Redirect } from 'react-router';
+import { useRouteMatch, useHistory } from 'react-router';
 import {
  useDeleteTaskChecklistMutation,
  useUpdateTaskChecklistNameMutation,
@ -32,7 +32,6 @@ import Input from 'shared/components/Input';
 import { useForm } from 'react-hook-form';
 import updateApolloCache from 'shared/utils/cache';
 import NOOP from 'shared/utils/noop';
-import hasNotFoundError from 'shared/utils/error';

 const calculateChecklistBadge = (checklists: Array<TaskChecklist>) => {
  const total = checklists.reduce((prev: any, next: any) => {
@ -270,8 +269,8 @@ const Details: React.FC<DetailsProps> = ({
      );
    },
  });
-  const { loading, data, refetch, error } = useFindTaskQuery({ variables: { taskID }, pollInterval: 5000 });
-  const [setTaskComplete, { error: setTaskCompleteError }] = useSetTaskCompleteMutation();
+  const { loading, data, refetch } = useFindTaskQuery({ variables: { taskID } });
+  const [setTaskComplete] = useSetTaskCompleteMutation();
  const [updateTaskDueDate] = useUpdateTaskDueDateMutation({
    onCompleted: () => {
      refetch();
@ -290,13 +289,9 @@ const Details: React.FC<DetailsProps> = ({
      refreshCache();
    },
  });
-  if (hasNotFoundError(error, setTaskCompleteError)) {
-    return <Redirect to={projectURL} />;
+  if (loading) {
+    return null;
  }
-  if (setTaskCompleteError && setTaskCompleteError)
-    if (loading) {
-      return null;
-    }
  if (!data) {
    return null;
  }
@ -351,11 +346,7 @@ const Details: React.FC<DetailsProps> = ({
              onTaskNameChange={onTaskNameChange}
              onTaskDescriptionChange={onTaskDescriptionChange}
              onToggleTaskComplete={task => {
-                setTaskComplete({ variables: { taskID: task.id, complete: !task.complete } }).catch(r => {
-                  if (hasNotFoundError(r)) {
-                    history.push(projectURL);
-                  }
-                });
+                setTaskComplete({ variables: { taskID: task.id, complete: !task.complete } });
              }}
              onDeleteTask={onDeleteTask}
              onChangeItemName={(itemID, itemName) => {
--- a/frontend/src/Projects/index.tsx
+++ b/frontend/src/Projects/index.tsx
@ -8,6 +8,8 @@ import {
  useCreateProjectMutation,
  GetProjectsDocument,
  GetProjectsQuery,
+  MeQuery,
+  MeDocument,
 } from 'shared/generated/graphql';

 import { Link } from 'react-router-dom';
@ -234,7 +236,7 @@ type ShowNewProject = {

 const Projects = () => {
  const { showPopup, hidePopup } = usePopup();
-  const { loading, data } = useGetProjectsQuery({ fetchPolicy: 'network-only', pollInterval: 5000 });
+  const { loading, data } = useGetProjectsQuery({ fetchPolicy: 'network-only' });
  useEffect(() => {
    document.title = 'Taskcafé';
  }, []);
--- a/frontend/src/Teams/Projects/index.tsx
+++ b/frontend/src/Teams/Projects/index.tsx
@ -154,7 +154,7 @@ type TeamProjectsProps = {
 };

 const TeamProjects: React.FC<TeamProjectsProps> = ({ teamID }) => {
-  const { loading, data } = useGetTeamQuery({ variables: { teamID }, pollInterval: 5000 });
+  const { loading, data } = useGetTeamQuery({ variables: { teamID } });
  if (loading) {
    return <span>loading</span>;
  }
--- a/frontend/src/shared/components/Card/Styles.ts
+++ b/frontend/src/shared/components/Card/Styles.ts
@ -1,9 +1,7 @@
 import styled, { css, keyframes } from 'styled-components';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { mixin } from 'shared/utils/styles';
 import TextareaAutosize from 'react-autosize-textarea';
-import { CheckCircle, CheckSquareOutline } from 'shared/icons';
-import { RefObject } from 'react';
+import { CheckCircle, CheckSquareOutline, Clock } from 'shared/icons';
 import TaskAssignee from 'shared/components/TaskAssignee';

 export const CardMember = styled(TaskAssignee)<{ zIndex: number }>`
@ -20,7 +18,9 @@ export const ChecklistIcon = styled(CheckSquareOutline)<{ color: 'success' | 'no
      stroke: rgba(${props.theme.colors.success});
    `}
 `;
-export const ClockIcon = styled(FontAwesomeIcon)``;
+export const ClockIcon = styled(Clock)<{ color: string }>`
+  fill: ${props => props.color};
+`;

 export const EditorTextarea = styled(TextareaAutosize)`
  overflow: hidden;
--- a/frontend/src/shared/components/Card/index.tsx
+++ b/frontend/src/shared/components/Card/index.tsx
@ -1,7 +1,5 @@
 import React, { useState, useRef, useEffect } from 'react';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faPencilAlt, faList } from '@fortawesome/free-solid-svg-icons';
-import { faClock, faEye } from '@fortawesome/free-regular-svg-icons';
+import { Pencil, Eye, List } from 'shared/icons';
 import {
  EditorTextarea,
  CardMember,
@ -155,7 +153,7 @@ const Card = React.forwardRef(
                }
              }}
            >
-              <FontAwesomeIcon onClick={onOperationClick} color="#c2c6dc" size="xs" icon={faPencilAlt} />
+              <Pencil width={8} height={8} />
            </ListCardOperation>
          )}
          <ListCardDetails complete={complete ?? false}>
@ -218,18 +216,18 @@ const Card = React.forwardRef(
            <ListCardBadges>
              {watched && (
                <ListCardBadge>
-                  <FontAwesomeIcon color="#6b778c" icon={faEye} size="xs" />
+                  <Eye width={8} height={8} />
                </ListCardBadge>
              )}
              {dueDate && (
                <DueDateCardBadge isPastDue={dueDate.isPastDue}>
-                  <ClockIcon color={dueDate.isPastDue ? '#fff' : '#6b778c'} icon={faClock} size="xs" />
+                  <ClockIcon color={dueDate.isPastDue ? '#fff' : '#6b778c'} width={8} height={8} />
                  <ListCardBadgeText>{dueDate.formattedDate}</ListCardBadgeText>
                </DueDateCardBadge>
              )}
              {description && (
                <DescriptionBadge>
-                  <FontAwesomeIcon color="#6b778c" icon={faList} size="xs" />
+                  <List width={8} height={8} />
                </DescriptionBadge>
              )}
              {checklists && (
--- a/frontend/src/shared/components/CardComposer/Styles.ts
+++ b/frontend/src/shared/components/CardComposer/Styles.ts
@ -1,15 +1,15 @@
 import styled from 'styled-components';
 import Button from 'shared/components/Button';
 import TextareaAutosize from 'react-autosize-textarea';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { mixin } from 'shared/utils/styles';

-export const CancelIcon = styled(FontAwesomeIcon)`
+export const CancelIconWrapper = styled.div`
  opacity: 0.8;
  cursor: pointer;
  font-size: 1.25em;
  padding-left: 5px;
 `;
+
 export const CardComposerWrapper = styled.div<{ isOpen: boolean }>`
  padding-bottom: 8px;
  display: ${props => (props.isOpen ? 'flex' : 'none')};
--- a/frontend/src/shared/components/CardComposer/index.tsx
+++ b/frontend/src/shared/components/CardComposer/index.tsx
@ -1,12 +1,12 @@
 import React, { useState, useRef } from 'react';
 import PropTypes from 'prop-types';
 import useOnEscapeKeyDown from 'shared/hooks/onEscapeKeyDown';
-import { faTimes } from '@fortawesome/free-solid-svg-icons';
 import useOnOutsideClick from 'shared/hooks/onOutsideClick';
+import { Cross } from 'shared/icons';

 import {
  CardComposerWrapper,
-  CancelIcon,
+  CancelIconWrapper,
  AddCardButton,
  ComposerControls,
  ComposerControlsSaveSection,
@ -52,7 +52,9 @@ const CardComposer = ({ isOpen, onCreateCard, onClose }: Props) => {
          >
            Add Card
          </AddCardButton>
-          <CancelIcon onClick={onClose} icon={faTimes} color="#42526e" />
+          <CancelIconWrapper onClick={() => onClose()}>
+            <Cross width={12} height={12} />
+          </CancelIconWrapper>
        </ComposerControlsSaveSection>
        <ComposerControlsActionsSection />
      </ComposerControls>
--- a/frontend/src/shared/components/TaskDetails/Styles.ts
+++ b/frontend/src/shared/components/TaskDetails/Styles.ts
@ -585,3 +585,30 @@ export const ActivityItemLog = styled.span`
  margin-left: 2px;
  color: rgba(${props => props.theme.colors.text.primary});
 `;
+
+export const ViewRawButton = styled.button`
+  border-radius: 3px;
+  padding: 8px 12px;
+  display: flex;
+  position: absolute;
+  right: 4px;
+  bottom: -24px;
+  cursor: pointer;
+  color: rgba(${props => props.theme.colors.text.primary}, 0.25);
+  &:hover {
+    color: rgba(${props => props.theme.colors.text.primary});
+  }
+`;
+
+export const TaskDetailsEditor = styled(TextareaAutosize)`
+  min-height: 108px;
+  color: #c2c6dc;
+  background: #262c49;
+  border-radius: 3px;
+  line-height: 20px;
+  margin-left: 32px;
+  margin-right: 32px;
+  padding: 9px 8px 7px 8px;
+  outline: none;
+  border: none;
+`;
--- a/frontend/src/shared/components/TaskDetails/index.tsx
+++ b/frontend/src/shared/components/TaskDetails/index.tsx
@ -30,6 +30,7 @@ import {
  AssignUserLabel,
  AssignUsersButton,
  AssignedUsersSection,
+  ViewRawButton,
  DueDateTitle,
  Container,
  LeftSidebar,
@ -65,6 +66,7 @@ import {
  CommentProfile,
  CommentInnerWrapper,
  ActivitySection,
+  TaskDetailsEditor,
 } from './Styles';
 import Checklist, { ChecklistItem, ChecklistItems } from '../Checklist';
 import onDragEnd from './onDragEnd';
@ -153,6 +155,7 @@ const TaskDetails: React.FC<TaskDetailsProps> = ({
    return true;
  });
  const [saveTimeout, setSaveTimeout] = useState<any>(null);
+  const [showRaw, setShowRaw] = useState(false);
  const [showCommentActions, setShowCommentActions] = useState(false);
  const taskDescriptionRef = useRef(task.description ?? '');
  const $noMemberBtn = useRef<HTMLDivElement>(null);
@ -309,28 +312,34 @@ const TaskDetails: React.FC<TaskDetailsProps> = ({
        </HeaderContainer>
        <InnerContentContainer>
          <DescriptionContainer>
-            <EditorContainer
-              onClick={e => {
-                if (!editTaskDescription) {
-                  setEditTaskDescription(true);
-                }
-              }}
-            >
-              <Editor
-                defaultValue={task.description ?? ''}
-                theme={dark}
-                readOnly={!editTaskDescription}
-                autoFocus
-                onChange={value => {
-                  setSaveTimeout(() => {
-                    clearTimeout(saveTimeout);
-                    return setTimeout(saveDescription, 2000);
-                  });
-                  const text = value();
-                  taskDescriptionRef.current = text;
+            {showRaw ? (
+              <TaskDetailsEditor value={taskDescriptionRef.current} />
+            ) : (
+              <EditorContainer
+                onClick={e => {
+                  if (!editTaskDescription) {
+                    setEditTaskDescription(true);
+                  }
                }}
-              />
-            </EditorContainer>
+              >
+                <Editor
+                  defaultValue={task.description ?? ''}
+                  theme={dark}
+                  readOnly={!editTaskDescription}
+                  autoFocus
+                  onChange={value => {
+                    setSaveTimeout(() => {
+                      clearTimeout(saveTimeout);
+                      return setTimeout(saveDescription, 2000);
+                    });
+                    const text = value();
+                    taskDescriptionRef.current = text;
+                  }}
+                />
+              </EditorContainer>
+            )}
+
+            <ViewRawButton onClick={() => setShowRaw(!showRaw)}>{showRaw ? 'Show editor' : 'Show raw'}</ViewRawButton>
          </DescriptionContainer>
          <ChecklistSection>
            <DragDropContext onDragEnd={result => onDragEnd(result, task, onChecklistDrop, onChecklistItemDrop)}>
--- a/frontend/src/shared/generated/graphql.tsx
+++ b/frontend/src/shared/generated/graphql.tsx
@ -209,8 +209,7 @@ export enum ObjectType {
  Org = 'ORG',
  Team = 'TEAM',
  Project = 'PROJECT',
-  Task = 'TASK',
-  TaskGroup = 'TASK_GROUP'
+  Task = 'TASK'
 }

 export type Query = {
@ -723,7 +722,7 @@ export type UpdateProjectMemberRolePayload = {
 };

 export type NewTask = {
-  taskGroupID: Scalars['UUID'];
+  taskGroupID: Scalars['String'];
  name: Scalars['String'];
  position: Scalars['Float'];
 };
@ -1473,7 +1472,7 @@ export type UpdateProjectMemberRoleMutation = (
 );

 export type CreateTaskMutationVariables = {
-  taskGroupID: Scalars['UUID'];
+  taskGroupID: Scalars['String'];
  name: Scalars['String'];
  position: Scalars['Float'];
 };
@ -3045,7 +3044,7 @@ export type UpdateProjectMemberRoleMutationHookResult = ReturnType<typeof useUpd
 export type UpdateProjectMemberRoleMutationResult = ApolloReactCommon.MutationResult<UpdateProjectMemberRoleMutation>;
 export type UpdateProjectMemberRoleMutationOptions = ApolloReactCommon.BaseMutationOptions<UpdateProjectMemberRoleMutation, UpdateProjectMemberRoleMutationVariables>;
 export const CreateTaskDocument = gql`
-    mutation createTask($taskGroupID: UUID!, $name: String!, $position: Float!) {
+    mutation createTask($taskGroupID: String!, $name: String!, $position: Float!) {
  createTask(input: {taskGroupID: $taskGroupID, name: $name, position: $position}) {
    ...TaskFields
  }
--- a/frontend/src/shared/graphql/task/createTask.ts
+++ b/frontend/src/shared/graphql/task/createTask.ts
@ -2,7 +2,7 @@ import gql from 'graphql-tag';
 import TASK_FRAGMENT from '../fragments/task';

 const CREATE_TASK_MUTATION = gql`
-  mutation createTask($taskGroupID: UUID!, $name: String!, $position: Float!) {
+  mutation createTask($taskGroupID: String!, $name: String!, $position: Float!) {
    createTask(input: { taskGroupID: $taskGroupID, name: $name, position: $position }) {
      ...TaskFields
    }
--- a/frontend/src/shared/icons/Eye.tsx
+++ b/frontend/src/shared/icons/Eye.tsx
@ -0,0 +1,12 @@
+import React from 'react';
+import Icon, { IconProps } from './Icon';
+
+const Eye: React.FC<IconProps> = ({ width = '16px', height = '16px', className }) => {
+  return (
+    <Icon width={width} height={height} className={className} viewBox="0 0 576 512">
+      <path d="M288 144a110.94 110.94 0 0 0-31.24 5 55.4 55.4 0 0 1 7.24 27 56 56 0 0 1-56 56 55.4 55.4 0 0 1-27-7.24A111.71 111.71 0 1 0 288 144zm284.52 97.4C518.29 135.59 410.93 64 288 64S57.68 135.64 3.48 241.41a32.35 32.35 0 0 0 0 29.19C57.71 376.41 165.07 448 288 448s230.32-71.64 284.52-177.41a32.35 32.35 0 0 0 0-29.19zM288 400c-98.65 0-189.09-55-237.93-144C98.91 167 189.34 112 288 112s189.09 55 237.93 144C477.1 345 386.66 400 288 400z" />
+    </Icon>
+  );
+};
+
+export default Eye;
--- a/frontend/src/shared/icons/List.tsx
+++ b/frontend/src/shared/icons/List.tsx
@ -0,0 +1,12 @@
+import React from 'react';
+import Icon, { IconProps } from './Icon';
+
+const List: React.FC<IconProps> = ({ width = '16px', height = '16px', className }) => {
+  return (
+    <Icon width={width} height={height} className={className} viewBox="0 0 512 512">
+      <path d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z" />
+    </Icon>
+  );
+};
+
+export default List;
--- a/frontend/src/shared/icons/index.ts
+++ b/frontend/src/shared/icons/index.ts
@ -1,5 +1,7 @@
 import Cross from './Cross';
 import Cog from './Cog';
+import Eye from './Eye';
+import List from './List';
 import At from './At';
 import Task from './Task';
 import Smile from './Smile';
@ -85,4 +87,6 @@ export {
  Clone,
  Paperclip,
  Share,
+  Eye,
+  List,
 };
--- a/frontend/src/shared/utils/accessToken.ts
+++ b/frontend/src/shared/utils/accessToken.ts
@ -1,6 +1,7 @@
 let accessToken = '';

 export function setAccessToken(newToken: string) {
+  console.log(newToken);
  accessToken = newToken;
 }
 export function getAccessToken() {
--- a/frontend/src/shared/utils/error.ts
+++ b/frontend/src/shared/utils/error.ts
@ -1,13 +0,0 @@
-import { ApolloError } from '@apollo/client';
-
-export default function hasNotFoundError(...errors: Array<ApolloError | undefined>) {
-  for (const error of errors) {
-    if (error && error.graphQLErrors.length !== 0) {
-      const notFound = error.graphQLErrors.find(e => e.extensions && e.extensions.code === '404');
-      if (notFound) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
--- a/internal/auth/auth.go
+++ b/internal/auth/auth.go
@ -7,8 +7,6 @@ import (
 	log "github.com/sirupsen/logrus"
 )

-var jwtKey = []byte("taskcafe_test_key")
-
 // RestrictedMode is used restrict JWT access to just the install route
 type RestrictedMode string

@ -54,7 +52,7 @@ func (r *ErrMalformedToken) Error() string {
 }

 // NewAccessToken generates a new JWT access token with the correct claims
-func NewAccessToken(userID string, restrictedMode RestrictedMode, orgRole string) (string, error) {
+func NewAccessToken(userID string, restrictedMode RestrictedMode, orgRole string, jwtKey []byte) (string, error) {
 	role := RoleMember
 	if orgRole == "admin" {
 		role = RoleAdmin
@ -76,7 +74,7 @@ func NewAccessToken(userID string, restrictedMode RestrictedMode, orgRole string
 }

 // NewAccessTokenCustomExpiration creates an access token with a custom duration
-func NewAccessTokenCustomExpiration(userID string, dur time.Duration) (string, error) {
+func NewAccessTokenCustomExpiration(userID string, dur time.Duration, jwtKey []byte) (string, error) {
 	accessExpirationTime := time.Now().Add(dur)
 	accessClaims := &AccessTokenClaims{
 		UserID:         userID,
@ -94,7 +92,7 @@ func NewAccessTokenCustomExpiration(userID string, dur time.Duration) (string, e
 }

 // ValidateAccessToken validates a JWT access token and returns the contained claims or an error if it's invalid
-func ValidateAccessToken(accessTokenString string) (AccessTokenClaims, error) {
+func ValidateAccessToken(accessTokenString string, jwtKey []byte) (AccessTokenClaims, error) {
 	accessClaims := &AccessTokenClaims{}
 	accessToken, err := jwt.ParseWithClaims(accessTokenString, accessClaims, func(token *jwt.Token) (interface{}, error) {
 		return jwtKey, nil
--- a/internal/commands/token.go
+++ b/internal/commands/token.go
@ -1,12 +1,15 @@
 package commands

 import (
+	"errors"
 	"fmt"
+	"strings"
 	"time"

 	"github.com/jordanknott/taskcafe/internal/auth"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 )

 func newTokenCmd() *cobra.Command {
@ -15,13 +18,18 @@ func newTokenCmd() *cobra.Command {
 		Short: "Create a long lived JWT token for dev purposes",
 		Long:  "Create a long lived JWT token for dev purposes",
 		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			token, err := auth.NewAccessTokenCustomExpiration(args[0], time.Hour*24)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			secret := viper.GetString("server.secret")
+			if strings.TrimSpace(secret) == "" {
+				return errors.New("server.secret must be set (TASKCAFE_SERVER_SECRET)")
+			}
+			token, err := auth.NewAccessTokenCustomExpiration(args[0], time.Hour*24, []byte(secret))
 			if err != nil {
 				log.WithError(err).Error("issue while creating access token")
-				return
+				return err
 			}
 			fmt.Println(token)
+			return nil
 		},
 	}
 }
--- a/internal/commands/web.go
+++ b/internal/commands/web.go
@ -3,11 +3,13 @@ package commands
 import (
 	"fmt"
 	"net/http"
+	"strings"
 	"time"

 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database/postgres"
 	"github.com/golang-migrate/migrate/v4/source/httpfs"
+	"github.com/google/uuid"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

@ -38,16 +40,21 @@ func newWebCmd() *cobra.Command {
 			)
 			var db *sqlx.DB
 			var err error
-			retryNumber := 0
-			for i := 0; retryNumber <= 3; i++ {
-				retryNumber++
+			var retryDuration time.Duration
+			maxRetryNumber := 4
+			for i := 0; i < maxRetryNumber; i++ {
 				db, err = sqlx.Connect("postgres", connection)
 				if err == nil {
 					break
 				}
-				retryDuration := time.Duration(i*2) * time.Second
-				log.WithFields(log.Fields{"retryNumber": retryNumber, "retryDuration": retryDuration}).WithError(err).Error("issue connecting to database, retrying")
-				time.Sleep(retryDuration)
+				retryDuration = time.Duration(i*2) * time.Second
+				log.WithFields(log.Fields{"retryNumber": i, "retryDuration": retryDuration}).WithError(err).Error("issue connecting to database, retrying")
+				if i != maxRetryNumber-1 {
+					time.Sleep(retryDuration)
+				}
+			}
+			if err != nil {
+				return err
 			}
 			db.SetMaxOpenConns(25)
 			db.SetMaxIdleConns(25)
@ -62,7 +69,12 @@ func newWebCmd() *cobra.Command {
 			}

 			log.WithFields(log.Fields{"url": viper.GetString("server.hostname")}).Info("starting server")
-			r, _ := route.NewRouter(db)
+			secret := viper.GetString("server.secret")
+			if strings.TrimSpace(secret) == "" {
+				log.Warn("server.secret is not set, generating a random secret")
+				secret = uuid.New().String()
+			}
+			r, _ := route.NewRouter(db, []byte(secret))
 			http.ListenAndServe(viper.GetString("server.hostname"), r)
 			return nil
 		},
--- a/internal/graph/generated.go
+++ b/internal/graph/generated.go
@ -2648,7 +2648,6 @@ enum ObjectType {
  TEAM
  PROJECT
  TASK
-  TASK_GROUP
 }

 directive @hasRole(roles: [RoleLevel!]!, level: ActionLevel!, type: ObjectType!) on FIELD_DEFINITION
@ -2852,20 +2851,20 @@ type UpdateProjectMemberRolePayload {

 extend type Mutation {
  createTask(input: NewTask!):
-    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK_GROUP)
+    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)
  deleteTask(input: DeleteTaskInput!):
-    DeleteTaskPayload! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
+    DeleteTaskPayload! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)

  updateTaskDescription(input: UpdateTaskDescriptionInput!):
-    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
+    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)
  updateTaskLocation(input: NewTaskLocation!):
-    UpdateTaskLocationPayload! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
+    UpdateTaskLocationPayload! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)
  updateTaskName(input: UpdateTaskName!):
-    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
+    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)
  setTaskComplete(input: SetTaskComplete!):
-    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
+    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)
  updateTaskDueDate(input: UpdateTaskDueDate!):
-    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
+    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)

  assignTask(input: AssignTaskInput):
    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
@ -2874,7 +2873,7 @@ extend type Mutation {
 }

 input NewTask {
-  taskGroupID: UUID!
+  taskGroupID: String!
  name: String!
  position: Float!
 }
@ -6534,7 +6533,7 @@ func (ec *executionContext) _Mutation_createTask(ctx context.Context, field grap
 			if err != nil {
 				return nil, err
 			}
-			typeArg, err := ec.unmarshalNObjectType2githubᚗcomᚋjordanknottᚋtaskcafeᚋinternalᚋgraphᚐObjectType(ctx, "TASK_GROUP")
+			typeArg, err := ec.unmarshalNObjectType2githubᚗcomᚋjordanknottᚋtaskcafeᚋinternalᚋgraphᚐObjectType(ctx, "PROJECT")
 			if err != nil {
 				return nil, err
 			}
@ -6607,7 +6606,7 @@ func (ec *executionContext) _Mutation_deleteTask(ctx context.Context, field grap
 			if err != nil {
 				return nil, err
 			}
-			typeArg, err := ec.unmarshalNObjectType2githubᚗcomᚋjordanknottᚋtaskcafeᚋinternalᚋgraphᚐObjectType(ctx, "TASK")
+			typeArg, err := ec.unmarshalNObjectType2githubᚗcomᚋjordanknottᚋtaskcafeᚋinternalᚋgraphᚐObjectType(ctx, "PROJECT")
 			if err != nil {
 				return nil, err
 			}
@ -6680,7 +6679,7 @@ func (ec *executionContext) _Mutation_updateTaskDescription(ctx context.Context,
 			if err != nil {
 				return nil, err
 			}
-			typeArg, err := ec.unmarshalNObjectType2githubᚗcomᚋjordanknottᚋtaskcafeᚋinternalᚋgraphᚐObjectType(ctx, "TASK")
+			typeArg, err := ec.unmarshalNObjectType2githubᚗcomᚋjordanknottᚋtaskcafeᚋinternalᚋgraphᚐObjectType(ctx, "PROJECT")
 			if err != nil {
 				return nil, err
 			}
@ -6753,7 +6752,7 @@ func (ec *executionContext) _Mutation_updateTaskLocation(ctx context.Context, fi
 			if err != nil {
 				return nil, err
 			}
-			typeArg, err := ec.unmarshalNObjectType2githubᚗcomᚋjordanknottᚋtaskcafeᚋinternalᚋgraphᚐObjectType(ctx, "TASK")
+			typeArg, err := ec.unmarshalNObjectType2githubᚗcomᚋjordanknottᚋtaskcafeᚋinternalᚋgraphᚐObjectType(ctx, "PROJECT")
 			if err != nil {
 				return nil, err
 			}
@ -6826,7 +6825,7 @@ func (ec *executionContext) _Mutation_updateTaskName(ctx context.Context, field
 			if err != nil {
 				return nil, err
 			}
-			typeArg, err := ec.unmarshalNObjectType2githubᚗcomᚋjordanknottᚋtaskcafeᚋinternalᚋgraphᚐObjectType(ctx, "TASK")
+			typeArg, err := ec.unmarshalNObjectType2githubᚗcomᚋjordanknottᚋtaskcafeᚋinternalᚋgraphᚐObjectType(ctx, "PROJECT")
 			if err != nil {
 				return nil, err
 			}
@ -6899,7 +6898,7 @@ func (ec *executionContext) _Mutation_setTaskComplete(ctx context.Context, field
 			if err != nil {
 				return nil, err
 			}
-			typeArg, err := ec.unmarshalNObjectType2githubᚗcomᚋjordanknottᚋtaskcafeᚋinternalᚋgraphᚐObjectType(ctx, "TASK")
+			typeArg, err := ec.unmarshalNObjectType2githubᚗcomᚋjordanknottᚋtaskcafeᚋinternalᚋgraphᚐObjectType(ctx, "PROJECT")
 			if err != nil {
 				return nil, err
 			}
@ -6972,7 +6971,7 @@ func (ec *executionContext) _Mutation_updateTaskDueDate(ctx context.Context, fie
 			if err != nil {
 				return nil, err
 			}
-			typeArg, err := ec.unmarshalNObjectType2githubᚗcomᚋjordanknottᚋtaskcafeᚋinternalᚋgraphᚐObjectType(ctx, "TASK")
+			typeArg, err := ec.unmarshalNObjectType2githubᚗcomᚋjordanknottᚋtaskcafeᚋinternalᚋgraphᚐObjectType(ctx, "PROJECT")
 			if err != nil {
 				return nil, err
 			}
@ -15195,7 +15194,7 @@ func (ec *executionContext) unmarshalInputNewTask(ctx context.Context, obj inter
 		switch k {
 		case "taskGroupID":
 			var err error
-			it.TaskGroupID, err = ec.unmarshalNUUID2githubᚗcomᚋgoogleᚋuuidᚐUUID(ctx, v)
+			it.TaskGroupID, err = ec.unmarshalNString2string(ctx, v)
 			if err != nil {
 				return it, err
 			}
--- a/internal/graph/graph.go
+++ b/internal/graph/graph.go
@ -19,7 +19,6 @@ import (
 	"github.com/jordanknott/taskcafe/internal/db"
 	"github.com/jordanknott/taskcafe/internal/utils"
 	log "github.com/sirupsen/logrus"
-	"github.com/vektah/gqlparser/v2/gqlerror"
 )

 // NewHandler returns a new graphql endpoint handler.
@ -52,8 +51,6 @@ func NewHandler(repo db.Repository) http.Handler {
 			fieldName = "TeamID"
 		case ObjectTypeTask:
 			fieldName = "TaskID"
-		case ObjectTypeTaskGroup:
-			fieldName = "TaskGroupID"
 		default:
 			fieldName = "ProjectID"
 		}
@ -71,13 +68,6 @@ func NewHandler(repo db.Repository) http.Handler {
 				if err != nil {
 					return nil, err
 				}
-			} else if typeArg == ObjectTypeTaskGroup {
-				log.WithFields(log.Fields{"subjectID": subjectID}).Info("fetching project ID using task group ID")
-				taskGroup, err := repo.GetTaskGroupByID(ctx, subjectID)
-				if err != nil {
-					return nil, err
-				}
-				subjectID = taskGroup.ProjectID
 			}
 			roles, err := GetProjectRoles(ctx, repo, subjectID)
 			if err != nil {
@ -196,13 +186,3 @@ func GetActionType(actionType int32) ActionType {
 		panic("Not a valid entity type!")
 	}
 }
-
-// NotFoundError creates a 404 gqlerror
-func NotFoundError(message string) error {
-	return &gqlerror.Error{
-		Message: message,
-		Extensions: map[string]interface{}{
-			"code": "404",
-		},
-	}
-}
--- a/internal/graph/models_gen.go
+++ b/internal/graph/models_gen.go
@ -229,9 +229,9 @@ type NewRefreshToken struct {
 }

 type NewTask struct {
-	TaskGroupID uuid.UUID `json:"taskGroupID"`
-	Name        string    `json:"name"`
-	Position    float64   `json:"position"`
+	TaskGroupID string  `json:"taskGroupID"`
+	Name        string  `json:"name"`
+	Position    float64 `json:"position"`
 }

 type NewTaskGroup struct {
@ -648,11 +648,10 @@ func (e EntityType) MarshalGQL(w io.Writer) {
 type ObjectType string

 const (
-	ObjectTypeOrg       ObjectType = "ORG"
-	ObjectTypeTeam      ObjectType = "TEAM"
-	ObjectTypeProject   ObjectType = "PROJECT"
-	ObjectTypeTask      ObjectType = "TASK"
-	ObjectTypeTaskGroup ObjectType = "TASK_GROUP"
+	ObjectTypeOrg     ObjectType = "ORG"
+	ObjectTypeTeam    ObjectType = "TEAM"
+	ObjectTypeProject ObjectType = "PROJECT"
+	ObjectTypeTask    ObjectType = "TASK"
 )

 var AllObjectType = []ObjectType{
@ -660,12 +659,11 @@ var AllObjectType = []ObjectType{
 	ObjectTypeTeam,
 	ObjectTypeProject,
 	ObjectTypeTask,
-	ObjectTypeTaskGroup,
 }

 func (e ObjectType) IsValid() bool {
 	switch e {
-	case ObjectTypeOrg, ObjectTypeTeam, ObjectTypeProject, ObjectTypeTask, ObjectTypeTaskGroup:
+	case ObjectTypeOrg, ObjectTypeTeam, ObjectTypeProject, ObjectTypeTask:
 		return true
 	}
 	return false
--- a/internal/graph/schema.graphqls
+++ b/internal/graph/schema.graphqls
@ -174,7 +174,6 @@ enum ObjectType {
  TEAM
  PROJECT
  TASK
-  TASK_GROUP
 }

 directive @hasRole(roles: [RoleLevel!]!, level: ActionLevel!, type: ObjectType!) on FIELD_DEFINITION
@ -378,20 +377,20 @@ type UpdateProjectMemberRolePayload {

 extend type Mutation {
  createTask(input: NewTask!):
-    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK_GROUP)
+    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)
  deleteTask(input: DeleteTaskInput!):
-    DeleteTaskPayload! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
+    DeleteTaskPayload! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)

  updateTaskDescription(input: UpdateTaskDescriptionInput!):
-    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
+    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)
  updateTaskLocation(input: NewTaskLocation!):
-    UpdateTaskLocationPayload! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
+    UpdateTaskLocationPayload! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)
  updateTaskName(input: UpdateTaskName!):
-    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
+    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)
  setTaskComplete(input: SetTaskComplete!):
-    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
+    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)
  updateTaskDueDate(input: UpdateTaskDueDate!):
-    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
+    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)

  assignTask(input: AssignTaskInput):
    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
@ -400,7 +399,7 @@ extend type Mutation {
 }

 input NewTask {
-  taskGroupID: UUID!
+  taskGroupID: String!
  name: String!
  position: Float!
 }
--- a/internal/graph/schema.resolvers.go
+++ b/internal/graph/schema.resolvers.go
@ -179,9 +179,14 @@ func (r *mutationResolver) UpdateProjectMemberRole(ctx context.Context, input Up
 }

 func (r *mutationResolver) CreateTask(ctx context.Context, input NewTask) (*db.Task, error) {
+	taskGroupID, err := uuid.Parse(input.TaskGroupID)
+	if err != nil {
+		log.WithError(err).Error("issue while parsing task group ID")
+		return &db.Task{}, err
+	}
 	createdAt := time.Now().UTC()
-	log.WithFields(log.Fields{"positon": input.Position, "taskGroupID": input.TaskGroupID}).Info("creating task")
-	task, err := r.Repository.CreateTask(ctx, db.CreateTaskParams{input.TaskGroupID, createdAt, input.Name, input.Position})
+	log.WithFields(log.Fields{"positon": input.Position, "taskGroupID": taskGroupID}).Info("creating task")
+	task, err := r.Repository.CreateTask(ctx, db.CreateTaskParams{taskGroupID, createdAt, input.Name, input.Position})
 	if err != nil {
 		log.WithError(err).Error("issue while creating task")
 		return &db.Task{}, err
@ -233,9 +238,6 @@ func (r *mutationResolver) SetTaskComplete(ctx context.Context, input SetTaskCom
 	completedAt := time.Now().UTC()
 	task, err := r.Repository.SetTaskComplete(ctx, db.SetTaskCompleteParams{TaskID: input.TaskID, Complete: input.Complete, CompletedAt: sql.NullTime{Time: completedAt, Valid: true}})
 	if err != nil {
-		if err == sql.ErrNoRows {
-			return &db.Task{}, NotFoundError("task does not exist")
-		}
 		return &db.Task{}, err
 	}
 	return &task, nil
@ -1031,14 +1033,6 @@ func (r *queryResolver) FindProject(ctx context.Context, input FindProject) (*db

 func (r *queryResolver) FindTask(ctx context.Context, input FindTask) (*db.Task, error) {
 	task, err := r.Repository.GetTaskByID(ctx, input.TaskID)
-	if err == sql.ErrNoRows {
-		return &db.Task{}, &gqlerror.Error{
-			Message: "Task does not exist",
-			Extensions: map[string]interface{}{
-				"code": "404",
-			},
-		}
-	}
 	return &task, err
 }

@ -1246,9 +1240,6 @@ func (r *taskResolver) Assigned(ctx context.Context, obj *db.Task) ([]Member, er
 	taskMemberLinks, err := r.Repository.GetAssignedMembersForTask(ctx, obj.TaskID)
 	taskMembers := []Member{}
 	if err != nil {
-		if err == sql.ErrNoRows {
-			return taskMembers, nil
-		}
 		return taskMembers, err
 	}
 	for _, taskMemberLink := range taskMemberLinks {
@ -1283,19 +1274,11 @@ func (r *taskResolver) Assigned(ctx context.Context, obj *db.Task) ([]Member, er
 }

 func (r *taskResolver) Labels(ctx context.Context, obj *db.Task) ([]db.TaskLabel, error) {
-	labels, err := r.Repository.GetTaskLabelsForTaskID(ctx, obj.TaskID)
-	if err != nil && err != sql.ErrNoRows {
-		return []db.TaskLabel{}, err
-	}
-	return labels, nil
+	return r.Repository.GetTaskLabelsForTaskID(ctx, obj.TaskID)
 }

 func (r *taskResolver) Checklists(ctx context.Context, obj *db.Task) ([]db.TaskChecklist, error) {
-	checklists, err := r.Repository.GetTaskChecklistsForTask(ctx, obj.TaskID)
-	if err != nil && err != sql.ErrNoRows {
-		return []db.TaskChecklist{}, err
-	}
-	return checklists, nil
+	return r.Repository.GetTaskChecklistsForTask(ctx, obj.TaskID)
 }

 func (r *taskResolver) Badges(ctx context.Context, obj *db.Task) (*TaskBadges, error) {
--- a/internal/graph/schema/_root.gql
+++ b/internal/graph/schema/_root.gql
@ -14,7 +14,6 @@ enum ObjectType {
  TEAM
  PROJECT
  TASK
-  TASK_GROUP
 }

 directive @hasRole(roles: [RoleLevel!]!, level: ActionLevel!, type: ObjectType!) on FIELD_DEFINITION
--- a/internal/graph/schema/task.gql
+++ b/internal/graph/schema/task.gql
@ -1,19 +1,19 @@
 extend type Mutation {
  createTask(input: NewTask!):
-    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK_GROUP)
+    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)
  deleteTask(input: DeleteTaskInput!):
-    DeleteTaskPayload! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
+    DeleteTaskPayload! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)

  updateTaskDescription(input: UpdateTaskDescriptionInput!):
-    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
+    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)
  updateTaskLocation(input: NewTaskLocation!):
-    UpdateTaskLocationPayload! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
+    UpdateTaskLocationPayload! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)
  updateTaskName(input: UpdateTaskName!):
-    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
+    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)
  setTaskComplete(input: SetTaskComplete!):
-    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
+    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)
  updateTaskDueDate(input: UpdateTaskDueDate!):
-    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
+    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: PROJECT)

  assignTask(input: AssignTaskInput):
    Task! @hasRole(roles: [ADMIN], level: PROJECT, type: TASK)
@ -22,7 +22,7 @@ extend type Mutation {
 }

 input NewTask {
-  taskGroupID: UUID!
+  taskGroupID: String!
  name: String!
  position: Float!
 }
--- a/internal/route/auth.go
+++ b/internal/route/auth.go
@ -14,8 +14,6 @@ import (
 	"golang.org/x/crypto/bcrypt"
 )

-var jwtKey = []byte("taskcafe_test_key")
-
 type authResource struct{}

 // LoginRequestData is the request data when a user logs in
@ -69,7 +67,7 @@ func (h *TaskcafeHandler) RefreshTokenHandler(w http.ResponseWriter, r *http.Req
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
-		accessTokenString, err := auth.NewAccessToken(user.UserID.String(), auth.InstallOnly, user.RoleCode)
+		accessTokenString, err := auth.NewAccessToken(user.UserID.String(), auth.InstallOnly, user.RoleCode, h.jwtKey)
 		if err != nil {
 			w.WriteHeader(http.StatusInternalServerError)
 		}
@ -123,7 +121,7 @@ func (h *TaskcafeHandler) RefreshTokenHandler(w http.ResponseWriter, r *http.Req
 		w.WriteHeader(http.StatusInternalServerError)
 	}

-	accessTokenString, err := auth.NewAccessToken(token.UserID.String(), auth.Unrestricted, user.RoleCode)
+	accessTokenString, err := auth.NewAccessToken(token.UserID.String(), auth.Unrestricted, user.RoleCode, h.jwtKey)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 	}
@ -190,7 +188,7 @@ func (h *TaskcafeHandler) LoginHandler(w http.ResponseWriter, r *http.Request) {
 	refreshExpiresAt := refreshCreatedAt.AddDate(0, 0, 1)
 	refreshTokenString, err := h.repo.CreateRefreshToken(r.Context(), db.CreateRefreshTokenParams{user.UserID, refreshCreatedAt, refreshExpiresAt})

-	accessTokenString, err := auth.NewAccessToken(user.UserID.String(), auth.Unrestricted, user.RoleCode)
+	accessTokenString, err := auth.NewAccessToken(user.UserID.String(), auth.Unrestricted, user.RoleCode, h.jwtKey)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 	}
@ -251,10 +249,12 @@ func (h *TaskcafeHandler) InstallHandler(w http.ResponseWriter, r *http.Request)
 	refreshExpiresAt := refreshCreatedAt.AddDate(0, 0, 1)
 	refreshTokenString, err := h.repo.CreateRefreshToken(r.Context(), db.CreateRefreshTokenParams{user.UserID, refreshCreatedAt, refreshExpiresAt})

-	accessTokenString, err := auth.NewAccessToken(user.UserID.String(), auth.Unrestricted, user.RoleCode)
+	log.WithField("userID", user.UserID.String()).Info("creating install access token")
+	accessTokenString, err := auth.NewAccessToken(user.UserID.String(), auth.Unrestricted, user.RoleCode, h.jwtKey)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 	}
+	log.Info(accessTokenString)

 	w.Header().Set("Content-type", "application/json")
 	http.SetCookie(w, &http.Cookie{
--- a/internal/route/avatar.go
+++ b/internal/route/avatar.go
@ -5,7 +5,9 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
+	"net/url"
 	"os"
+	"strings"

 	"github.com/google/uuid"
 	log "github.com/sirupsen/logrus"
@ -48,22 +50,24 @@ func (h *TaskcafeHandler) ProfileImageUpload(w http.ResponseWriter, r *http.Requ
 		return
 	}
 	defer file.Close()
-	log.WithFields(log.Fields{"filename": handler.Filename, "size": handler.Size, "header": handler.Header}).Info("file metadata")
+	filename := strings.ReplaceAll(handler.Filename, " ", "-")
+	encodedFilename := url.QueryEscape(filename)
+	log.WithFields(log.Fields{"filename": encodedFilename, "size": handler.Size, "header": handler.Header}).Info("file metadata")

 	fileBytes, err := ioutil.ReadAll(file)
 	if err != nil {
 		log.WithError(err).Error("while reading file")
 		return
 	}
-	err = ioutil.WriteFile("uploads/"+handler.Filename, fileBytes, 0644)
+	err = ioutil.WriteFile("uploads/"+filename, fileBytes, 0644)
 	if err != nil {
 		log.WithError(err).Error("while reading file")
 		return
 	}

-	h.repo.UpdateUserAccountProfileAvatarURL(r.Context(), db.UpdateUserAccountProfileAvatarURLParams{UserID: userID, ProfileAvatarUrl: sql.NullString{String: "http://localhost:3333/uploads/" + handler.Filename, Valid: true}})
+	h.repo.UpdateUserAccountProfileAvatarURL(r.Context(), db.UpdateUserAccountProfileAvatarURLParams{UserID: userID, ProfileAvatarUrl: sql.NullString{String: "/uploads/" + encodedFilename, Valid: true}})
 	// return that we have successfully uploaded our file!
 	log.Info("file uploaded")
-	json.NewEncoder(w).Encode(AvatarUploadResponseData{URL: "http://localhost:3333/uploads/" + handler.Filename, UserID: userID.String()})
+	json.NewEncoder(w).Encode(AvatarUploadResponseData{URL: "/uploads/" + encodedFilename, UserID: userID.String()})

 }
--- a/internal/route/middleware.go
+++ b/internal/route/middleware.go
@ -12,7 +12,12 @@ import (
 )

 // AuthenticationMiddleware is a middleware that requires a valid JWT token to be passed via the Authorization header
-func AuthenticationMiddleware(next http.Handler) http.Handler {
+type AuthenticationMiddleware struct {
+	jwtKey []byte
+}
+
+// Middleware returns the middleware handler
+func (m *AuthenticationMiddleware) Middleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		bearerTokenRaw := r.Header.Get("Authorization")
 		splitToken := strings.Split(bearerTokenRaw, "Bearer")
@ -21,7 +26,7 @@ func AuthenticationMiddleware(next http.Handler) http.Handler {
 			return
 		}
 		accessTokenString := strings.TrimSpace(splitToken[1])
-		accessClaims, err := auth.ValidateAccessToken(accessTokenString)
+		accessClaims, err := auth.ValidateAccessToken(accessTokenString, m.jwtKey)
 		if err != nil {
 			if _, ok := err.(*auth.ErrExpiredToken); ok {
 				w.WriteHeader(http.StatusUnauthorized)
--- a/internal/route/route.go
+++ b/internal/route/route.go
@ -59,11 +59,12 @@ func (h FrontendHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {

 // TaskcafeHandler contains all the route handlers
 type TaskcafeHandler struct {
-	repo db.Repository
+	repo   db.Repository
+	jwtKey []byte
 }

 // NewRouter creates a new router for chi
-func NewRouter(dbConnection *sqlx.DB) (chi.Router, error) {
+func NewRouter(dbConnection *sqlx.DB, jwtKey []byte) (chi.Router, error) {
 	formatter := new(log.TextFormatter)
 	formatter.TimestampFormat = "02-01-2006 15:04:05"
 	formatter.FullTimestamp = true
@ -79,7 +80,7 @@ func NewRouter(dbConnection *sqlx.DB) (chi.Router, error) {
 	r.Use(middleware.Timeout(60 * time.Second))

 	repository := db.NewRepository(dbConnection)
-	taskcafeHandler := TaskcafeHandler{*repository}
+	taskcafeHandler := TaskcafeHandler{*repository, jwtKey}

 	var imgServer = http.FileServer(http.Dir("./uploads/"))
 	r.Group(func(mux chi.Router) {
@ -88,8 +89,9 @@ func NewRouter(dbConnection *sqlx.DB) (chi.Router, error) {
 		mux.Mount("/uploads/", http.StripPrefix("/uploads/", imgServer))

 	})
+	auth := AuthenticationMiddleware{jwtKey}
 	r.Group(func(mux chi.Router) {
-		mux.Use(AuthenticationMiddleware)
+		mux.Use(auth.Middleware)
 		mux.Post("/users/me/avatar", taskcafeHandler.ProfileImageUpload)
 		mux.Post("/auth/install", taskcafeHandler.InstallHandler)
 		mux.Handle("/graphql", graph.NewHandler(*repository))
--- a/migrations/0053_add-notification-tables.up.sql
+++ b/migrations/0053_add-notification-tables.up.sql
Author	SHA1	Message	Date
Jordan Knott	c7538a98e5	fix: segfault on database connection failure	2020-09-12 18:23:23 -05:00
Jordan Knott	fe84f97f18	fix: url encode avatar filename when showing path fixes #61	2020-09-12 18:12:12 -05:00
Jordan Knott	52c60abcd7	fix: secret key is no longer hard coded the secret key for signing JWT tokens is now read from server.secret. if that does not exist, then a random UUID v4 is generated and used instead. a log warning is also shown.	2020-09-12 18:03:17 -05:00
Jordan Knott	9fdb3008db	docs(bug_report): add note about server logs	2020-09-12 03:33:24 -05:00
Jordan Knott	e2ef8a1a19	fix: initial access token after install is now set correctly	2020-09-12 03:24:09 -05:00
Jordan Knott	61cd376bfd	fix: rename host to hostname in example config fixes #59	2020-09-12 01:32:01 -05:00
Jordan Knott	ba9fc64fd9	fix: do not add localhost:3333 url to avatar urls fixes #58	2020-09-12 01:23:48 -05:00
Jordan Knott	03dafe9b7b	fix: remove font awesome library	2020-09-11 19:58:42 -05:00
Jordan Knott	12a767947a	fix: duplicate schema migration	2020-09-11 19:29:41 -05:00
Jordan Knott	40557ba79f	feat: add view raw markdown button to task details	2020-09-11 16:21:46 -05:00