Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor validUrlPATTERN regex and testValidUrl #25

Merged
merged 1 commit into from
Nov 16, 2023
Merged

Refactor validUrlPATTERN regex and testValidUrl #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions server/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ const port = process.env.PORT || 5000;
app.listen(port, () => console.log(`Listening on port ${port}`));

var courses = []; // Predefined courses from allCourses.md
const validUrlPATTERN = /^https:\/\/scientia-eu-v4-api-d3-02\.azurewebsites\.net\/\/api\/ical\/[0-9a-fA-F-]+\/[0-9a-fA-F-]+\/timetable\.ics$/g; // REGEX for valid uom ics uri


// import courses from allCourses.md
Expand All @@ -80,8 +79,9 @@ app.get('/api/v1/:uniqueAPI/tt.ics', function (req, res) {
const { uniqueAPI } = req.params;
const apiUrlDec = decodeURIComponent(uniqueAPI)
//console.log(apiUrlDec)

if (testValidUrl(apiUrlDec)) {
//console.log(testValidUrl(apiUrlDec))
if (testValidUrl(apiUrlDec) == true)
{
let rebuild = "https://scientia-eu-v4-api-d3-02.azurewebsites.net//api/ical/" + apiUrlDec.split('/')[6] + "/" + apiUrlDec.split('/')[7] + "/timetable.ics";
console.log(rebuild)

Expand Down Expand Up @@ -167,6 +167,7 @@ app.get('/api/v2/:steps/:uniqueAPIPart1/:uniqueAPIPart2/tt.ics', function (req,
* @returns boolean if url valid
*/
function testValidUrl(url) {
const validUrlPATTERN = /^https:\/\/scientia-eu-v4-api-d3-02\.azurewebsites\.net\/\/api\/ical\/[0-9a-fA-F-]+\/[0-9a-fA-F-]+\/timetable\.ics$/g; // REGEX for valid uom ics uri
return validUrlPATTERN.test(url);
}

Expand Down
Loading