Merge pull request #461 from VitNode/http_support

feat(backend): Add support for http protocol
VitNode · Aug 21, 2024 · d5b01ac · d5b01ac
2 parents b3a4539 + b90dc5a
commit d5b01ac
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 18 deletions.
diff --git a/packages/backend/src/app.module.ts b/packages/backend/src/app.module.ts
@@ -132,12 +132,7 @@ const replaceUrlToDomain = (url: string) => {
     hostname = hostname.split('.').slice(1).join('.');
   }
 
-  const domainParts = hostname.split('.');
-  if (domainParts.length > 1) {
-    domainParts.pop();
-  }
-
-  return domainParts.join('.');
+  return hostname;
 };
 
 const config = () => {
@@ -151,6 +146,7 @@ const config = () => {
     port: process.env.PORT ? parseInt(process.env.PORT, 10) : 8080,
     cookies: {
       domain: replaceUrlToDomain(frontend_url.url),
+      secure: frontend_url.protocol === 'https:',
       login_token: {
         expiresIn: 3, // 3 days
         expiresInRemember: 90, // 90 days

diff --git a/packages/backend/src/core/admin/sessions/sign_out/sign_out.service.ts b/packages/backend/src/core/admin/sessions/sign_out/sign_out.service.ts
@@ -34,10 +34,12 @@ export class SignOutAdminSessionsService {
       this.configService.getOrThrow('cookies.login_token.admin.name'),
       {
         httpOnly: true,
-        secure: true,
+        secure: !!this.configService.getOrThrow('cookies.secure'),
         domain: this.configService.getOrThrow('cookies.domain'),
         path: '/',
-        sameSite: 'none',
+        sameSite: this.configService.getOrThrow('cookies.secure')
+          ? 'none'
+          : 'lax',
       },
     );
 

diff --git a/packages/backend/src/core/sessions/authorization/internal/internal_authorization.service.ts b/packages/backend/src/core/sessions/authorization/internal/internal_authorization.service.ts
@@ -119,11 +119,13 @@ export class InternalAuthorizationCoreSessionsService {
       know_device_id,
       {
         httpOnly: true,
-        secure: true,
+        secure: !!this.configService.getOrThrow('cookies.secure'),
         domain: this.configService.getOrThrow('cookies.domain'),
         path: '/',
         expires,
-        sameSite: 'none',
+        sameSite: this.configService.getOrThrow('cookies.secure')
+          ? 'none'
+          : 'lax',
       },
     );
 

diff --git a/packages/backend/src/core/sessions/sign_in/device.service.ts b/packages/backend/src/core/sessions/sign_in/device.service.ts
@@ -50,11 +50,13 @@ export class DeviceSignInCoreSessionsService {
       device.id,
       {
         httpOnly: true,
-        secure: true,
+        secure: !!this.configService.getOrThrow('cookies.secure'),
         domain: this.configService.getOrThrow('cookies.domain'),
         path: '/',
         expires,
-        sameSite: 'none',
+        sameSite: this.configService.getOrThrow('cookies.secure')
+          ? 'none'
+          : 'lax',
       },
     );
 

diff --git a/packages/backend/src/core/sessions/sign_in/sign_in.service.ts b/packages/backend/src/core/sessions/sign_in/sign_in.service.ts
@@ -112,11 +112,13 @@ export class SignInCoreSessionsService {
         login_token,
         {
           httpOnly: true,
-          secure: true,
+          secure: !!this.configService.getOrThrow('cookies.secure'),
           domain: this.configService.getOrThrow('cookies.domain'),
           path: '/',
           expires,
-          sameSite: 'none',
+          sameSite: this.configService.getOrThrow('cookies.secure')
+            ? 'none'
+            : 'lax',
         },
       );
 
@@ -161,11 +163,13 @@ export class SignInCoreSessionsService {
       login_token,
       {
         httpOnly: true,
-        secure: true,
+        secure: !!this.configService.getOrThrow('cookies.secure'),
         domain: this.configService.getOrThrow('cookies.domain'),
         path: '/',
         expires: remember ? expires : undefined,
-        sameSite: 'none',
+        sameSite: this.configService.getOrThrow('cookies.secure')
+          ? 'none'
+          : 'lax',
       },
     );
 

diff --git a/packages/backend/src/core/sessions/sign_out/sign_out.service.ts b/packages/backend/src/core/sessions/sign_out/sign_out.service.ts
@@ -30,10 +30,12 @@ export class SignOutCoreSessionsService {
 
     res.clearCookie(this.configService.getOrThrow('cookies.login_token.name'), {
       httpOnly: true,
-      secure: true,
+      secure: !!this.configService.getOrThrow('cookies.secure'),
       domain: this.configService.getOrThrow('cookies.domain'),
       path: '/',
-      sameSite: 'none',
+      sameSite: this.configService.getOrThrow('cookies.secure')
+        ? 'none'
+        : 'lax',
     });
 
     return 'You are logged out';