fix: some url issues

watscho · watscho · commit c997799e802e · 2023-03-04T14:19:11.000+04:00
diff --git a/.env.example b/.env.example
@@ -1,5 +1,6 @@
-PORT=8000
-ORIGIN=http://localhost
+APP_PORT=8000
+APP_URL=http://localhost:8000
+CLIENT_URL=http://localhost:3000
 
 MONGODB_URI=mongodb+srv://user:example@user.mongodb.net/example
 
diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
@@ -7,8 +7,9 @@ export declare global {
 
   namespace NodeJS {
     interface ProcessEnv {
-      PORT: number
-      ORIGIN: string
+      APP_PORT: number
+      APP_URL: string
+      CLIENT_URL: string
       MONGODB_URI: string
       REDIS_URI: string
       REDIS_TOKEN_EXPIRATION: number
diff --git a/src/controllers/mediaController.ts b/src/controllers/mediaController.ts
@@ -14,7 +14,7 @@ export const mediaController = {
       const image = await new Image(media).sharp()
 
       return res.status(StatusCodes.OK).json({
-        data: { id: media.id, image },
+        data: { id: media.id, image: `${process.env.APP_URL}/${image}` },
         message: ReasonPhrases.OK,
         status: StatusCodes.OK
       })
diff --git a/src/index.ts b/src/index.ts
@@ -32,4 +32,4 @@ app.use(
   notFoundMiddleware
 )
 
-app.listen(process.env.PORT)
+app.listen(process.env.APP_PORT)
diff --git a/src/mailer/mailer.ts b/src/mailer/mailer.ts
@@ -21,7 +21,7 @@ export abstract class Mailer {
       views: {
         root: joinRelativeToMainPath(process.env.MAIL_TPL_PATH),
         locals: {
-          origin: process.env.ORIGIN,
+          clientUrl: process.env.CLIENT_URL,
           t: i18next.t
         },
         options: { extension: 'ejs' }
diff --git a/src/middlewares/corsMiddleware.ts b/src/middlewares/corsMiddleware.ts
@@ -2,6 +2,6 @@ import cors from 'cors'
 import { StatusCodes } from 'http-status-codes'
 
 export const corsMiddleware = cors({
-  origin: process.env.ORIGIN,
+  origin: process.env.CLIENT_URL,
   optionsSuccessStatus: StatusCodes.OK
 })
diff --git a/src/templates/resetPassword/html.ejs b/src/templates/resetPassword/html.ejs
@@ -2,8 +2,8 @@
 <html>
   <head>
     <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
     <title><%=t('resetPassword')%></title>
     <style>
       * {
@@ -42,7 +42,10 @@
       </tr>
       <tr>
         <td>
-          <a href="<%=`${origin}/reset-password/${accessToken}`%>" target="_blank">
+          <a
+            href="<%=`${clientUrl}/reset-password/${accessToken}`%>"
+            target="_blank"
+          >
             <%=t('followUp')%>
           </a>
         </td>
diff --git a/src/templates/verification/html.ejs b/src/templates/verification/html.ejs
@@ -43,7 +43,7 @@
       <tr>
         <td>
           <a
-            href="<%=`${origin}/verification/${accessToken}`%>"
+            href="<%=`${clientUrl}/verification/${accessToken}`%>"
             target="_blank"
           >
             <%=t('followUp')%>

Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,4 @@ app.use(`
`32`	`32`	`notFoundMiddleware`
`33`	`33`	`)`
`34`	`34`
`35`		`-app.listen(process.env.PORT)`
	`35`	`+app.listen(process.env.APP_PORT)`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`<tr>`
`44`	`44`	`<td>`
`45`	`45`	`<a`
`46`		- href="<%=`${origin}/verification/${accessToken}`%>"
	`46`	+ href="<%=`${clientUrl}/verification/${accessToken}`%>"
`47`	`47`	`target="_blank"`
`48`	`48`	`>`
`49`	`49`	`<%=t('followUp')%>`