Skip to content
Open

Dev #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5c57b23
Testing releases
unknownpersonog Jul 30, 2023
5ebbce1
Merge pull request #4 from unknownpersonog/master
unknownpersonog Jul 30, 2023
61f70a6
Ping command to get API Status
unknownpersonog Jul 30, 2023
d86b33d
Fix for ping
unknownpersonog Jul 30, 2023
7927b9f
Ping now returns time taken to process using headers
unknownpersonog Jul 30, 2023
f82471e
Added /addvps (#1 Test)
unknownpersonog Jul 30, 2023
5087a32
Fixed Queues (Older Alternative) Test #2
unknownpersonog Jul 31, 2023
6722e43
Added /assignvps
unknownpersonog Aug 1, 2023
1a6d24e
Added /assignvps
unknownpersonog Aug 1, 2023
3148b82
vps is now a array instead
unknownpersonog Aug 5, 2023
5434f71
vps info and more changed
unknownpersonog Aug 6, 2023
46ad0a4
Create README.md
unknownpersonog Aug 8, 2023
72d2d3f
Update version.txt
unknownpersonog Aug 8, 2023
0e3138c
Minor Fix
unknownpersonog Aug 8, 2023
f4c1694
Update README.md
unknownpersonog Aug 8, 2023
5661717
Merge branch 'master' into dev
unknownpersonog Aug 8, 2023
2f32edb
Changes:
unknownpersonog Oct 6, 2023
a129d43
Merge branch 'dev' of https://github.com/unknownpersonog/unknownvps-v…
unknownpersonog Oct 6, 2023
79dae04
Added settings.json to .gitignore
unknownpersonog Oct 6, 2023
cd29195
Env file has now been reduced
unknownpersonog Oct 6, 2023
0023753
Readme to master
unknownpersonog Oct 6, 2023
c52cb0a
error
unknownpersonog Oct 18, 2023
63ecae7
Merge branch 'dev' of https://github.com/unknownpersonog/unknownvps-v…
unknownpersonog Oct 18, 2023
92ae72d
Removed settings.json and switched to env.
unknownpersonog Oct 19, 2023
961c09b
Version Upgrade, README and removed traces of settings.json
unknownpersonog Oct 19, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .env-example
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
PORT=3001
ENVIRONMENT=
MONGODB_DATABASE_URI=
ADMIN_TOKEN=
ADMIN_TOKEN=
COMPANY=
SMTP_HOST=
SMTP_USER=
SMTP_PASS=
SMTP_MAIL=
SMTP_PORT=
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,7 @@ This guide considers you have Node 16 or 18 installed and you are doing all thin
```bash
nano .env
```
##### Step 10 - Create a settings.json file and fill the required details from example settings.json in the repository
```bash
nano settings.json
```
##### Step 11 - Run the API
##### Step 10 - Run the API
```bash
node index.js
```
Expand Down Expand Up @@ -142,3 +138,5 @@ This guide considers you have Node 16 or 18 installed and you are doing all thin
| Parameter | Type | Description |
| :-------- | :------- | :-------------------------------- |
| `discordId` | `string` | **Required**. Discord ID to assign VPS to. |

### These API routes can change without being updated on every updated, check code for better infomation
10 changes: 0 additions & 10 deletions settings.json.example

This file was deleted.

14 changes: 6 additions & 8 deletions src/routes/users/verify/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { config } from 'dotenv'
import { Request, Response, Router } from "express";
import nodemailer from 'nodemailer';
import { DiscordAPI } from "../../../database/schemas";
import { settingsParser } from '../../../services/settingsParser';
config();

const router = Router();
Expand All @@ -27,19 +26,18 @@ router.post('/mail', async(req: Request, res: Response) => {
{ verificationToken, verificationTokenExpiresAt: expiresAt }
);

const settings = settingsParser();
const transporter = nodemailer.createTransport({
host: String(settings.smtp.host),
port: Number(settings.smtp.port),
host: String(process.env.SMTP_HOST),
port: Number(process.env.SMTP_PORT),
secure: false, // upgrade later with STARTTLS
auth: {
user: String(settings.smtp.user),
pass: String(settings.smtp.pass),
user: String(process.env.SMTP_USER),
pass: String(process.env.SMTP_PASS),
},
});

const mailOptions = {
from: `${settings.companyName} <${settings.smtp.mail}>`,
from: `${process.env.COMPANY} <${process.env.SMTP_MAIL}>`,
to: email,
subject: 'Email Verification',
text: `Your code for verification is:
Expand Down Expand Up @@ -78,7 +76,7 @@ router.post('/mail', async(req: Request, res: Response) => {
<p style="padding-bottom: 16px;" align="center">Please use the verification code below to sign in.</p>
<p style="padding-bottom: 16px; font-size: 30px; " align="center"><strong style="font-size: 130%">${verificationToken}</strong></p>
<p style="padding-bottom: 16px;" align="center">If you didn’t request this, you can ignore this email.</p>
<p style="padding-bottom: 16px" align="center">Thanks,<br> ${settings.companyName}</p>
<p style="padding-bottom: 16px" align="center">Thanks,<br> ${process.env.COMPANY}</p>
</div>
</div>
<div style="padding-top: 20px; color: rgb(153, 153, 153); text-align: center; --darkreader-inline-color: #a8a095;"
Expand Down
9 changes: 0 additions & 9 deletions src/services/settingsParser.ts

This file was deleted.

14 changes: 1 addition & 13 deletions src/utils/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,4 @@ export type PartialInfo = {
id: String,
}
],
}

export interface Settings {
companyName: String,

smtp: {
host: String,
port: Number,
user: String,
pass: String,
mail: String
}
}
}
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.1
1.2.2