Merge branch 'next' into fix/responsiveness-issue

Author: potts99

.github/workflows/dev.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - name: Get current time
         uses: 1466587594/get-current-time@v2
@@ -33,7 +33,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v2
         with:
-          platforms: linux/amd64,linux/arm64,linux/arm
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            pepperlabs/peppermint:dev
+            pepperlabs/peppermint:nightly

.github/workflows/main.yml

@@ -0,0 +1,43 @@
+name: Main Client Build
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: self-hosted
+    steps:
+      - name: Get current time
+        uses: 1466587594/get-current-time@v2
+        id: current-time
+        with:
+          format: YYYY-MM-DD--HH
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      # Install QEMU-based emulator
+      - name: Install QEMU
+        run: apt-get update && apt-get install -y qemu-user-static
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            pepperlabs/peppermint:latest

apps/api/.gitignore

@@ -102,3 +102,5 @@ dist
 
 # TernJS port file
 .tern-port
+
+/uploads

apps/api/package.json

@@ -15,6 +15,7 @@
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.0",
+    "@types/formidable": "^3.4.5",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/node": "^17.0.23",
     "@types/nodemailer": "^6.4.14",
@@ -27,14 +28,19 @@
   "dependencies": {
     "@fastify/cookie": "^9.0.4",
     "@fastify/cors": "^8.3.0",
+    "@fastify/multipart": "^8.2.0",
     "@fastify/rate-limit": "^9.0.0",
     "@fastify/session": "^10.4.0",
     "@fastify/swagger": "^8.10.0",
     "@prisma/client": "5.2.0",
+    "add": "^2.0.6",
     "axios": "^1.5.0",
     "bcrypt": "^5.0.1",
     "dotenv": "^16.0.0",
     "fastify": "4.22.2",
+    "fastify-formidable": "^3.0.2",
+    "fastify-multer": "^2.0.3",
+    "formidable": "^3.5.1",
     "got": "^13.0.0",
     "handlebars": "^4.7.8",
     "i": "^0.3.7",

apps/api/src/controllers/auth.ts

@@ -373,7 +373,7 @@ export function authRoutes(fastify: FastifyInstance) {
       reply.send({
         oauth: true,
         success: true,
-        ouath_url: `${url}?client_id=${oauth.clientId}&redirect_uri=${oauth.redirectUri}&state=${email}&login=${email}&scope=user`,
+        ouath_url: `${url}?client_id=${oauth.clientId}&redirect_uri=${oauth.redirectUri}&login=${email}&scope=user`,
       });
     }
   );
@@ -384,62 +384,73 @@ export function authRoutes(fastify: FastifyInstance) {
     async (request: FastifyRequest, reply: FastifyReply) => {
       const { code, state } = request.query as { code: string; state: string };
 
-      const provider = await prisma.provider.findFirst({});
+      console.log("HIT");
 
-      const data = await axios.post(
-        `https://github.com/login/oauth/access_token`,
-        {
-          client_id: provider?.clientId,
-          client_secret: provider?.clientSecret,
-          code: code,
-          redirect_uri: provider?.redirectUri,
-        },
-        {
-          headers: {
-            Accept: "application/json",
-          },
-        }
-      );
+      try {
+        const provider = await prisma.provider.findFirst({});
+        if (!provider) throw new Error("Provider not found");
 
-      const access_token = data.data;
+        const { clientId, clientSecret, redirectUri } = provider;
 
-      if (access_token) {
-        const gh = await axios.get(`https://api.github.com/user/emails`, {
-          headers: {
-            Accept: "application/vnd.github+json",
-            Authorization: `token ${access_token.access_token}`,
+        const { data: github_user } = await axios.post(
+          `https://github.com/login/oauth/access_token`,
+          {
+            client_id: clientId,
+            client_secret: clientSecret,
+            code: code,
+            redirect_uri: redirectUri,
           },
-        });
+          {
+            headers: {
+              Accept: "application/json",
+            },
+          }
+        );
+
+        console.log(github_user);
+
+        // await new Promise((r) => setTimeout(r, 2000));
+
+        const { data: emails } = await axios.get(
+          `https://api.github.com/user/emails`,
+          {
+            headers: {
+              Accept: "application/vnd.github+json",
+              Authorization: `Bearer ${github_user.access_token}`,
+            },
+          }
+        );
 
-        const emails = gh.data;
+        console.log(emails);
 
-        const filter = emails.filter((e: any) => e.primary === true);
+        const primaryEmail = emails.find((e: any) => e.primary === true)?.email;
+        if (!primaryEmail) throw new Error("Primary email not found");
 
         let user = await prisma.user.findUnique({
-          where: { email: filter[0].email },
+          where: { email: primaryEmail },
         });
 
         if (!user) {
-          reply.send({
+          return reply.send({
             success: false,
             message: "Invalid email",
           });
         }
 
         var b64string = process.env.SECRET;
-        var buf = new Buffer(b64string!, "base64"); // Ta-da
+        var secret = new Buffer(b64string!, "base64"); // Ta-da
 
         let token = jwt.sign(
           {
-            data: { id: user!.id },
+            data: { id: user.id },
           },
-          buf,
+          secret,
           { expiresIn: "8h" }
         );
 
         await prisma.session.create({
           data: {
-            userId: user!.id,
+            userId: user.id,
             sessionToken: token,
             expires: new Date(Date.now() + 8 * 60 * 60 * 1000),
           },
@@ -449,9 +460,11 @@ export function authRoutes(fastify: FastifyInstance) {
           token,
           success: true,
         });
-      } else {
+      } catch (error: any) {
+        console.error("Authentication error:", error);
         reply.status(403).send({
           success: false,
+          message: error.message || "Authentication failed",
         });
       }
     }
@@ -577,6 +590,57 @@ export function authRoutes(fastify: FastifyInstance) {
     }
   );
 
+  // Reset password by admin
+  fastify.post(
+    "/api/v1/auth/admin/reset-password",
+    async (request: FastifyRequest, reply: FastifyReply) => {
+      let { password, user } = request.body as {
+        password: string;
+        user: string;
+      };
+
+      console.log(user);
+
+      const bearer = request.headers.authorization!.split(" ")[1];
+      const token = checkToken(bearer);
+
+      if (token) {
+        let session = await prisma.session.findUnique({
+          where: {
+            sessionToken: bearer,
+          },
+        });
+
+        const check = await prisma.user.findUnique({
+          where: { id: session?.userId },
+        });
+
+        if (check?.isAdmin === false) {
+          reply.code(401).send({
+            message: "Unauthorized",
+          });
+        }
+
+        const hashedPass = await bcrypt.hash(password, 10);
+
+        await prisma.user.update({
+          where: { id: user },
+          data: {
+            password: hashedPass,
+          },
+        });
+
+        reply.send({
+          success: true,
+        });
+      } else {
+        reply.send({
+          success: false,
+        });
+      }
+    }
+  );
+
   // Update a users profile/config
   fastify.put(
     "/api/v1/auth/profile",

apps/api/src/controllers/storage.ts

@@ -0,0 +1,42 @@
+//@ts-nocheck
+import { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
+import multer from "fastify-multer";
+import { prisma } from "../prisma";
+const upload = multer({ dest: "uploads/" });
+
+export function objectStoreRoutes(fastify: FastifyInstance) {
+  //
+  fastify.post(
+    "/api/v1/storage/ticket/:id/upload/single",
+    { preHandler: upload.single("file") },
+
+    async (request: FastifyRequest, reply: FastifyReply) => {
+      console.log(request.file);
+      console.log(request.body);
+
+      const uploadedFile = await prisma.ticketFile.create({
+        data: {
+          ticketId: request.params.id,
+          filename: request.file.originalname,
+          path: request.file.path,
+          mime: request.file.mimetype,
+          size: request.file.size,
+          encoding: request.file.encoding,
+          userId: request.body.user,
+        },
+      });
+
+      console.log(uploadedFile);
+
+      reply.send({
+        success: true,
+      });
+    }
+  );
+
+  // Get all ticket attachments
+
+  // Delete an attachment
+
+  // Download an attachment
+}

apps/api/src/controllers/ticket.ts

@@ -183,10 +183,17 @@ export function ticketRoutes(fastify: FastifyInstance) {
           },
         });
 
+        const files = await prisma.ticketFile.findMany({
+          where: {
+            ticketId: id,
+          },
+        });
+
         var t = {
           ...ticket,
           comments: [...comments],
           TimeTracking: [...timeTracking],
+          files: [...files],
         };
 
         reply.send({

apps/api/src/controllers/users.ts

@@ -15,7 +15,20 @@ export function userRoutes(fastify: FastifyInstance) {
       if (bearer) {
         const token = checkToken(bearer);
         if (token) {
-          const users = await prisma.user.findMany({});
+          const users = await prisma.user.findMany({
+            where: {
+              external_user: false,
+            },
+            select: {
+              id: true,
+              name: true,
+              email: true,
+              isAdmin: true,
+              createdAt: true,
+              updatedAt: true,
+              language: true,
+            },
+          });
 
           reply.send({
             users,