Feature/react query (KHO-262, KHO-263)

backend/internal/handlers/auth/auth.go

@@ -142,12 +142,20 @@ func (service *AuthService) GetCurrentUser() fiber.Handler {
 			return errs.AuthenticationError()
 		}
 
-		user, err := client.GetCurrentUser(c.Context())
+		githubUser, err := client.GetCurrentUser(c.Context())
 		if err != nil {
 			return errs.AuthenticationError()
 		}
 
-		return c.Status(fiber.StatusOK).JSON(fiber.Map{"user": user})
+		user, err := service.store.GetUserByGitHubID(c.Context(), githubUser.ID)
+		if err != nil {
+			return errs.InternalServerError()
+		}
+
+		return c.Status(fiber.StatusOK).JSON(fiber.Map{
+			"github_user": githubUser,
+			"user":        user,
+		})
 	}
 }
 

backend/internal/handlers/classrooms/assignments/assignments.go

@@ -125,6 +125,14 @@ func (s *AssignmentService) generateAssignmentToken() fiber.Handler {
 			return errs.BadRequest(err)
 		}
 
+		// if the link is permenant, use the existing permanent token
+		if body.Duration == nil {
+			assignmentToken, err := s.store.GetPermanentAssignmentTokenByAssignmentID(c.Context(), assignmentID)
+			if err == nil {
+				return c.Status(http.StatusOK).JSON(fiber.Map{"token": assignmentToken.Token})
+			}
+		}
+
 		token, err := utils.GenerateToken(16)
 		if err != nil {
 			return errs.InternalServerError()

backend/internal/handlers/classrooms/classrooms.go

@@ -192,7 +192,6 @@ func (s *ClassroomService) getClassroomUsers() fiber.Handler {
 
 		usersInClassroom, err := s.store.GetUsersInClassroom(c.Context(), classroomID)
 		if err != nil {
-
 			return errs.InternalServerError()
 		}
 
@@ -213,6 +212,7 @@ func (s *ClassroomService) getClassroomUsers() fiber.Handler {
 		return c.Status(http.StatusOK).JSON(fiber.Map{"users": updatedUsersInClassroom})
 	}
 }
+
 func (s *ClassroomService) getRubricsInClassroom() fiber.Handler {
 	return func(c *fiber.Ctx) error {
 		classroomID, err := strconv.ParseInt(c.Params("classroom_id"), 10, 64)
@@ -321,6 +321,14 @@ func (s *ClassroomService) generateClassroomToken() fiber.Handler {
 			return err
 		}
 
+		// if the link is permenant, use the existing permanent token
+		if body.Duration == nil {
+			classroomToken, err := s.store.GetPermanentClassroomTokenByClassroomIDAndRole(c.Context(), classroomID, classroomRole)
+			if err == nil {
+				return c.Status(http.StatusOK).JSON(fiber.Map{"token": classroomToken.Token})
+			}
+		}
+
 		token, err := utils.GenerateToken(16)
 		if err != nil {
 			return errs.InternalServerError()

backend/internal/handlers/users/users.go

@@ -20,13 +20,19 @@ func (s *UserService) GetUser() fiber.Handler {
 			return errs.BadRequest(err)
 		}
 
-		user, err := client.GetUser(c.Context(), userName)
+		githubUser, err := client.GetUser(c.Context(), userName)
+		if err != nil {
+			return errs.AuthenticationError()
+		}
+
+		user, err := s.store.GetUserByGitHubID(c.Context(), *githubUser.ID)
 		if err != nil {
 			return errs.AuthenticationError()
 		}
 
 		return c.Status(http.StatusOK).JSON(fiber.Map{
-			"user": user,
+			"user":        user,
+			"github_user": githubUser,
 		})
 	}
 }

backend/internal/storage/postgres/assignment_outlines.go

@@ -57,6 +57,26 @@ func (db *DB) GetAssignmentByToken(ctx context.Context, token string) (models.As
 	return assignmentOutline, nil
 }
 
+func (db *DB) GetPermanentAssignmentTokenByAssignmentID(ctx context.Context, assignmentID int64) (models.AssignmentToken, error) {
+	var tokenData models.AssignmentToken
+	err := db.connPool.QueryRow(ctx, `
+		SELECT assignment_outline_id, token, created_at, expires_at
+		FROM assignment_outline_tokens
+		WHERE assignment_outline_id = $1 AND expires_at IS NULL
+	`, assignmentID).Scan(
+		&tokenData.AssignmentID,
+		&tokenData.Token,
+		&tokenData.CreatedAt,
+		&tokenData.ExpiresAt,
+	)
+
+	if err != nil {
+		return models.AssignmentToken{}, errs.NewDBError(err)
+	}
+
+	return tokenData, nil
+}
+
 func (db *DB) GetAssignmentsInClassroom(ctx context.Context, classroomID int64) ([]models.AssignmentOutline, error) {
 	rows, err := db.connPool.Query(ctx, "SELECT * FROM assignment_outlines WHERE classroom_id = $1", classroomID)
 	if err != nil {

backend/internal/storage/postgres/classrooms.go

@@ -302,6 +302,27 @@ func (db *DB) GetClassroomToken(ctx context.Context, token string) (models.Class
 	return tokenData, nil
 }
 
+func (db *DB) GetPermanentClassroomTokenByClassroomIDAndRole(ctx context.Context, classroomID int64, classroomRole models.ClassroomRole) (models.ClassroomToken, error) {
+	var tokenData models.ClassroomToken
+	err := db.connPool.QueryRow(ctx, `
+		SELECT classroom_id, classroom_role, token, created_at, expires_at
+		FROM classroom_tokens
+		WHERE classroom_id = $1 AND classroom_role = $2 AND expires_at IS NULL
+	`, classroomID, classroomRole).Scan(
+		&tokenData.ClassroomID,
+		&tokenData.ClassroomRole,
+		&tokenData.Token,
+		&tokenData.CreatedAt,
+		&tokenData.ExpiresAt,
+	)
+
+	if err != nil {
+		return models.ClassroomToken{}, errs.NewDBError(err)
+	}
+
+	return tokenData, nil
+}
+
 func (db *DB) GetNumberOfStudentsInClassroom(ctx context.Context, classroomID int64) (int, error) {
 	var count int
 	err := db.connPool.QueryRow(ctx, `

backend/internal/storage/storage.go

@@ -59,6 +59,7 @@ type Classroom interface {
 	GetUserClassroomsInOrg(ctx context.Context, orgID int64, userID int64) ([]models.ClassroomUser, error)
 	CreateClassroomToken(ctx context.Context, tokenData models.ClassroomToken) (models.ClassroomToken, error)
 	GetClassroomToken(ctx context.Context, token string) (models.ClassroomToken, error)
+	GetPermanentClassroomTokenByClassroomIDAndRole(ctx context.Context, classroomID int64, classroomRole models.ClassroomRole) (models.ClassroomToken, error)
 	GetNumberOfStudentsInClassroom(ctx context.Context, classroomID int64) (int, error)
 }
 
@@ -80,6 +81,7 @@ type AssignmentOutline interface {
 	GetTotalWorkCommits(ctx context.Context, assignmentID int) (int, error)
 	GetAssignmentByToken(ctx context.Context, token string) (models.AssignmentOutline, error)
 	CreateAssignmentToken(ctx context.Context, tokenData models.AssignmentToken) (models.AssignmentToken, error)
+	GetPermanentAssignmentTokenByAssignmentID(ctx context.Context, assignmentID int64) (models.AssignmentToken, error)
 }
 
 type AssignmentTemplate interface {