Refactor cookie management and remove ngx-cookie-service dependency

sentemon · Jan 7, 2025 · 4dfc638 · 4dfc638
1 parent 3ef6fb2
commit 4dfc638
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 82 deletions.
diff --git a/backend/src/AuthService/AuthService.Api/GraphQL/Mutation.cs b/backend/src/AuthService/AuthService.Api/GraphQL/Mutation.cs
@@ -32,10 +32,10 @@ public async Task<KeycloakTokenResponse> Register(RegisterDto input, [Service] R
 
         _httpContextAccessor.HttpContext?.Response.Cookies.Append("token", result.Response.AccessToken, new CookieOptions
         {
-            HttpOnly = true,
-            Secure = true,
+            Path = "/",
+            HttpOnly = false,
+            Secure = false,
             SameSite = SameSiteMode.Strict,
-            Expires = DateTimeOffset.FromUnixTimeSeconds(result.Response.ExpiresIn)
         });
 
         return result.Response;
@@ -53,10 +53,10 @@ public async Task<KeycloakTokenResponse> Login(LoginDto input, [Service] LoginCo
 
         _httpContextAccessor.HttpContext?.Response.Cookies.Append("token", result.Response.AccessToken, new CookieOptions
         {
-            HttpOnly = true,
-            Secure = true,
-            SameSite = SameSiteMode.Strict,
-            Expires = DateTimeOffset.FromUnixTimeSeconds(result.Response.ExpiresIn)
+            Path = "/",
+            HttpOnly = false,
+            Secure = false,
+            SameSite = SameSiteMode.Strict
         });
 
         return result.Response;

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -21,7 +21,6 @@
     "@apollo/client": "^3.11.10",
     "apollo-angular": "^8.0.0",
     "graphql": "^16.9.0",
-    "ngx-cookie-service": "^18.0.0",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
     "zone.js": "~0.14.10"

diff --git a/frontend/src/app/apollo.config.ts b/frontend/src/app/apollo.config.ts
@@ -0,0 +1,29 @@
+import { ApolloClientOptions, InMemoryCache, ApolloLink, HttpLink } from '@apollo/client/core';
+import { setContext } from '@apollo/client/link/context';
+import { environment } from '../environments/environment';
+
+export function createApolloClientOptions(): ApolloClientOptions<any> {
+  const httpLink = new HttpLink({
+    uri: environment.auth_service,
+    credentials: 'include',
+  });
+
+  const authLink = setContext(() => {
+    const token = document.cookie
+      .split('; ')
+      .find(row => row.startsWith('token='))
+      ?.split('=')[1];
+    return {
+      headers: {
+        Authorization: token ? `Bearer ${token}` : '',
+      }
+    };
+  });
+
+  const link = ApolloLink.from([authLink, httpLink]);
+
+  return {
+    link: link,
+    cache: new InMemoryCache()
+  };
+}
diff --git a/frontend/src/app/app.config.ts b/frontend/src/app/app.config.ts
@@ -4,11 +4,9 @@ import { provideRouter } from '@angular/router';
 import { routes } from './app.routes';
 import {provideHttpClient, withFetch} from '@angular/common/http';
 import { provideApollo } from 'apollo-angular';
-import { ApolloLink, InMemoryCache} from '@apollo/client/core';
-import {setContext} from "@apollo/client/link/context";
 import {environment} from "../environments/environment";
-import {HttpLink} from "apollo-angular/http";
 import {loadDevMessages, loadErrorMessages} from "@apollo/client/dev";
+import { createApolloClientOptions } from "./apollo.config";
 
 export const appConfig: ApplicationConfig = {
   providers: [
@@ -20,30 +18,8 @@ export const appConfig: ApplicationConfig = {
         loadDevMessages();
         loadErrorMessages();
       }
-      const httpLink = inject(HttpLink);
 
-      const authLink = setContext(() => {
-        const token = document.cookie
-          .split('; ')
-          .find(row => row.startsWith('token='))
-          ?.split('=')[1];
-        return {
-
-          headers: {
-            Authorization: token ? `Bearer ${token}` : '',
-          }
-        };
-      });
-
-      const link = ApolloLink.from([
-        authLink,
-        httpLink.create({ uri: environment.auth_service }),
-      ]);
-
-      return {
-        link: link,
-        cache: new InMemoryCache(),
-      };
+      return createApolloClientOptions();
     })
   ]
 };
diff --git a/frontend/src/app/core/services/token.service.ts b/frontend/src/app/core/services/token.service.ts
diff --git a/frontend/src/app/features/auth/services/auth.service.ts b/frontend/src/app/features/auth/services/auth.service.ts
@@ -2,24 +2,16 @@ import {Injectable} from '@angular/core';
 import {Apollo} from "apollo-angular";
 import {map, Observable} from "rxjs";
 import {LOGIN, REGISTER} from "../requests/mutations";
-import {TokenService} from "../../../core/services/token.service";
 import {MutationResponse} from "../responses/mutation.response";
 import {QueryResponses} from "../responses/query.responses";
 import {IS_AUTHENTICATED} from "../requests/queries";
-import {environment} from "../../../../environments/environment";
-import {InMemoryCache} from "@apollo/client/core";
 
 @Injectable({
   providedIn: 'root'
 })
 export class AuthService {
 
-  constructor(private apollo: Apollo, private tokenService: TokenService) {
-    // apollo.create({
-    //   uri: environment.auth_service,
-    //   cache: new InMemoryCache()
-    // });
-  }
+  constructor(private apollo: Apollo) { }
 
   public login(username: string, password: string): Observable<boolean> {
     return this.apollo.mutate<MutationResponse>({
@@ -30,7 +22,6 @@ export class AuthService {
         const token = response.data?.login;
 
         if (token) {
-          this.tokenService.set(token);
           return true;
         } else {
           console.error("Login failed: no token received.");
@@ -55,7 +46,6 @@ export class AuthService {
         const token = response.data?.register;
 
         if (token) {
-          this.tokenService.set(token);
           return true;
         } else {
           console.error("Registration failed: no token received.");