Merge with Develop 2024-1-14 (#2656)

* 20241114064415 Deleted all files in the main branch in anticipation of merging develop into main cleanly

* 20241114064453 Merge develop into main

.github/dependabot.yaml

@@ -7,7 +7,7 @@ updates:
     directory: "/"
     # Schedule automated updates to run weekly
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     # Labels to apply to Dependabot PRs
     labels:
       - "dependencies"

.github/workflows/codeql-codescan.yml

@@ -21,7 +21,8 @@ on:
 
 jobs:
   CodeQL:
-    name: CodeQL
+    if: ${{ github.actor != 'dependabot[bot]' }}
+    name: Analyse Code With CodeQL
     runs-on: ubuntu-latest
     permissions:
       actions: read

.github/workflows/pull-request.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Count number of lines
         run: |
           chmod +x ./.github/workflows/countline.py
-          ./.github/workflows/countline.py --lines 600 --exclude_files src/types/generatedGraphQLTypes.ts tests src/typeDefs/types.ts src/constants.ts
+          ./.github/workflows/countline.py --lines 600 --exclude_files src/types/generatedGraphQLTypes.ts tests src/typeDefs/types.ts src/constants.ts src/typeDefs/inputs.ts
 
       - name: Check for TSDoc comments
         run: npm run check-tsdoc # Run the TSDoc check script
@@ -90,8 +90,9 @@ jobs:
           echo "Error: Source and Target Branches are the same. Please ensure they are different."
           exit 1
 
-  Check-Unauthorized-Changes:
-    name: Checks if no unauthorized files are changed
+  Check-Sensitive-Files:
+    if: ${{ github.actor != 'dependabot[bot]' && !contains(github.event.pull_request.labels.*.name, 'ignore-sensitive-files-pr') }}
+    name: Checks if sensitive files have been changed without authorization
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -126,6 +127,13 @@ jobs:
             setup.ts
             schema.graphql
             .coderabbit.yaml
+            CODE_OF_CONDUCT.md
+            CONTRIBUTING.md
+            DOCUMENTATION.md
+            INSTALLATION.md
+            ISSUE_GUIDELINES.md
+            PR_GUIDELINES.md
+            README.md
 
       - name: List all changed unauthorized files
         if: steps.changed-unauth-files.outputs.any_changed == 'true' || steps.changed-unauth-files.outputs.any_deleted == 'true'
@@ -138,6 +146,7 @@ jobs:
           exit 1
 
   File-count-check:
+    if: ${{ github.actor != 'dependabot[bot]' }}
     name: Checks if number of files changed is acceptable
     runs-on: ubuntu-latest
     steps:
@@ -288,6 +297,7 @@ jobs:
           min_coverage: 95.0
 
   JSDocs:
+    if: ${{ github.actor != 'dependabot[bot]' }}
     name: 'JSDocs comments and pipeline'
     runs-on: ubuntu-latest
     needs: Test-Application
@@ -303,6 +313,7 @@ jobs:
         run: echo "Run JSdocs :${{ env.RUN_JSDOCS }}"
 
   Branch-check:
+    if: ${{ github.actor != 'dependabot[bot]' }}
     name: "Base branch check"
     runs-on: ubuntu-latest
     steps:

.github/workflows/push.yml

@@ -26,6 +26,7 @@ jobs:
   ##############################################################################
 
   Push-Workflow:
+    if: ${{ github.actor != 'dependabot[bot]' }}
     name: Testing Application
     runs-on: ubuntu-latest
     strategy:
@@ -54,8 +55,6 @@ jobs:
       MONGO_DB_URL: mongodb://localhost:27017/talawa-test-db
       REDIS_HOST: localhost
       REDIS_PORT: 6379
-#       ACCESS_TOKEN_SECRET: ${{ secrets.ACCESS_TOKEN_SECRET }}
-#       REFRESH_TOKEN_SECRET: ${{ secrets.REFRESH_TOKEN_SECRET }}
 
     # We checkout the content of the Talawa-API repository in a directory called `api`
     steps:
@@ -95,6 +94,7 @@ jobs:
 
 # You can find the deployment instructions in the scripts/cloud-api-demo/README.md file
   Deploy-Workflow:
+    if: ${{ github.actor != 'dependabot[bot]' }}
     name: Deploying Application to Cloud VPS
     needs: Push-Workflow
     runs-on: ubuntu-latest
@@ -130,6 +130,7 @@ jobs:
             python3 /usr/local/bin/scripts/deploy.py --path ~/develop --branch develop
 
   Check-Schema: 
+    if: ${{ github.actor != 'dependabot[bot]' }}
     name: Check Schema
     runs-on: ubuntu-latest
 

INSTALLATION.md

@@ -836,7 +836,7 @@ We use `reCAPTCHA` for two factor authentication (2FA). Follow these steps:
 
 1. Visit the [reCAPTCHA Key Generation](https://www.google.com/recaptcha/admin/create) URL.
 1. Fill in the input blocks as shown in the screenshot:
-   ![Set up recaptcha page](public/markdown/images/recaptcha_set_up.webp)
+   ![Set up recaptcha page](public/markdown/images/recaptcha_set_up.png)
 1. Click on `Submit` button.
 1. Copy the generated `Secret Key` to variable named `RECAPTCHA_SECRET_KEY` in `.env` file.
 

README.md

@@ -21,7 +21,7 @@ Core features include:
 
 `talawa` is based on the original `quito` code created by the [Palisadoes Foundation](http://www.palisadoes.org) as part of its annual Calico Challenge program. Calico provides paid summer internships for Jamaican university students to work on selected open source projects. They are mentored by software professionals and receive stipends based on the completion of predefined milestones. Calico was started in 2015. Visit [The Palisadoes Foundation's website](http://www.palisadoes.org/) for more details on its origin and activities.
 
-## Table of Contents
+##  Table of Contents
 
 <!-- toc -->
 

codegen.ts

@@ -40,16 +40,13 @@ const config: CodegenConfig = {
 
           CheckIn: "../models/CheckIn#InterfaceCheckIn",
 
-          MessageChat: "../models/MessageChat#InterfaceMessageChat",
-
           Comment: "../models/Comment#InterfaceComment",
 
           Community: "../models/Community#InterfaceCommunity",
 
-          DirectChat: "../models/DirectChat#InterfaceDirectChat",
+          Chat: "../models/Chat#InterfaceChat",
 
-          DirectChatMessage:
-            "../models/DirectChatMessage#InterfaceDirectChatMessage",
+          ChatMessage: "../models/ChatMessage#InterfaceChatMessage",
 
           Donation: "../models/Donation#InterfaceDonation",
 
@@ -75,11 +72,6 @@ const config: CodegenConfig = {
 
           Group: "../models/Group#InterfaceGroup",
 
-          GroupChat: "../models/GroupChat#InterfaceGroupChat",
-
-          GroupChatMessage:
-            "../models/GroupChatMessage#InterfaceGroupChatMessage",
-
           // ImageHash: '../models/ImageHash#InterfaceImageHash',
 
           Language: "../models/Language#InterfaceLanguage",
@@ -106,6 +98,9 @@ const config: CodegenConfig = {
           User: "../models/User#InterfaceUser",
 
           Venue: "../models/Venue#InterfaceVenue",
+
+          VolunteerMembership:
+            "../models/VolunteerMembership#InterfaceVolunteerMembership",
         },
 
         useTypeImports: true,

config/vitestSetup.ts

@@ -1,6 +1,5 @@
 // FAIL LOUDLY on unhandled promise rejections / errors
 process.on("unhandledRejection", (reason) => {
-  // eslint-disable-next-line no-console
   console.log("FAILED TO HANDLE PROMISE REJECTION");
   throw reason;
 });