Merge pull request #1141 from FoalTS/reorganize-utils-jwt-sessions

Reorganize utils in `jwt/` and `sessions/`
FoalTS · Aug 19, 2022 · 3092ac1 · 3092ac1
2 parents f970d92 + c0f1e16
commit 3092ac1
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 19 deletions.
diff --git a/packages/core/src/sessions/http/use-sessions.hook.ts b/packages/core/src/sessions/http/use-sessions.hook.ts
@@ -20,10 +20,7 @@ import {
 import { SESSION_DEFAULT_COOKIE_NAME } from './constants';
 import { createSession, readSession, SessionStore } from '../core';
 import { FetchUser } from './fetch-user.interface';
-import { removeSessionCookie } from './remove-session-cookie';
-import { setSessionCookie } from './set-session-cookie';
-import { getCsrfTokenFromRequest } from './get-csrf-token-from-request';
-import { shouldVerifyCsrfToken } from './utils';
+import { getCsrfTokenFromRequest, removeSessionCookie, setSessionCookie, shouldVerifyCsrfToken } from './utils';
 
 export interface UseSessionOptions {
   user?: FetchUser;

diff --git a/.../http/get-csrf-token-from-request.spec.ts → ...utils/get-csrf-token-from-request.spec.ts b/.../http/get-csrf-token-from-request.spec.ts → ...utils/get-csrf-token-from-request.spec.ts
@@ -2,7 +2,7 @@
 import { strictEqual } from 'assert';
 
 // FoalTS
-import { Context } from '../../core';
+import { Context } from '../../../core';
 import { getCsrfTokenFromRequest } from './get-csrf-token-from-request';
 
 function createRequest(body: { [name: string]: any }, headers: { [name: string ]: string}): Context['request'] {

diff --git a/...sions/http/get-csrf-token-from-request.ts → ...http/utils/get-csrf-token-from-request.ts b/...sions/http/get-csrf-token-from-request.ts → ...http/utils/get-csrf-token-from-request.ts
@@ -1,4 +1,4 @@
-import { Context } from '../../core';
+import { Context } from '../../../core';
 
 export function getCsrfTokenFromRequest(request: Context['request']): string|undefined {
   return request.body._csrf || request.get('X-CSRF-Token') || request.get('X-XSRF-Token');

diff --git a/packages/core/src/sessions/http/utils/index.ts b/packages/core/src/sessions/http/utils/index.ts
@@ -1 +1,4 @@
-export { shouldVerifyCsrfToken } from './should-verify-csrf-token';
+export { getCsrfTokenFromRequest } from './get-csrf-token-from-request';
+export { shouldVerifyCsrfToken } from './should-verify-csrf-token';
+export { removeSessionCookie } from './remove-session-cookie';
+export { setSessionCookie } from './set-session-cookie';
diff --git a/...ssions/http/remove-session-cookie.spec.ts → .../http/utils/remove-session-cookie.spec.ts b/...ssions/http/remove-session-cookie.spec.ts → .../http/utils/remove-session-cookie.spec.ts
@@ -2,15 +2,15 @@
 import { strictEqual } from 'assert';
 
 // FoalTS
-import { Config, HttpResponse, HttpResponseOK } from '../../core';
+import { Config, HttpResponse, HttpResponseOK } from '../../../core';
 import {
   SESSION_DEFAULT_COOKIE_HTTP_ONLY,
   SESSION_DEFAULT_COOKIE_NAME,
   SESSION_DEFAULT_COOKIE_PATH,
   SESSION_DEFAULT_CSRF_COOKIE_NAME,
   SESSION_DEFAULT_SAME_SITE_ON_CSRF_ENABLED,
   SESSION_USER_COOKIE_NAME,
-} from './constants';
+} from '../constants';
 import { removeSessionCookie } from './remove-session-cookie';
 
 describe('removeSessionCookie', () => {

diff --git a/...rc/sessions/http/remove-session-cookie.ts → ...sions/http/utils/remove-session-cookie.ts b/...rc/sessions/http/remove-session-cookie.ts → ...sions/http/utils/remove-session-cookie.ts
@@ -1,13 +1,13 @@
 // FoalTS
-import { Config, CookieOptions, HttpResponse } from '../../core';
+import { Config, CookieOptions, HttpResponse } from '../../../core';
 import {
   SESSION_DEFAULT_COOKIE_HTTP_ONLY,
   SESSION_DEFAULT_COOKIE_NAME,
   SESSION_DEFAULT_COOKIE_PATH,
   SESSION_DEFAULT_CSRF_COOKIE_NAME,
   SESSION_DEFAULT_SAME_SITE_ON_CSRF_ENABLED,
   SESSION_USER_COOKIE_NAME,
-} from './constants';
+} from '../constants';
 
 /**
  * Deletes the browser cookie containing the session token.

diff --git a/.../sessions/http/set-session-cookie.spec.ts → ...ons/http/utils/set-session-cookie.spec.ts b/.../sessions/http/set-session-cookie.spec.ts → ...ons/http/utils/set-session-cookie.spec.ts
@@ -2,16 +2,16 @@
 import { deepStrictEqual, strictEqual } from 'assert';
 
 // FoalTS
-import { Config, HttpResponse, HttpResponseOK } from '../../core';
+import { Config, HttpResponse, HttpResponseOK } from '../../../core';
 import {
   SESSION_DEFAULT_COOKIE_HTTP_ONLY,
   SESSION_DEFAULT_COOKIE_NAME,
   SESSION_DEFAULT_COOKIE_PATH,
   SESSION_DEFAULT_CSRF_COOKIE_NAME,
   SESSION_DEFAULT_SAME_SITE_ON_CSRF_ENABLED,
   SESSION_USER_COOKIE_NAME,
-} from './constants';
-import { Session } from '../core';
+} from '../constants';
+import { Session } from '../../core';
 import { setSessionCookie } from './set-session-cookie';
 
 describe('setSessionCookie', () => {

diff --git a/...e/src/sessions/http/set-session-cookie.ts → ...sessions/http/utils/set-session-cookie.ts b/...e/src/sessions/http/set-session-cookie.ts → ...sessions/http/utils/set-session-cookie.ts
@@ -1,14 +1,14 @@
 // FoalTS
-import { Config, CookieOptions, HttpResponse } from '../../core';
+import { Config, CookieOptions, HttpResponse } from '../../../core';
 import {
   SESSION_DEFAULT_COOKIE_HTTP_ONLY,
   SESSION_DEFAULT_COOKIE_NAME,
   SESSION_DEFAULT_COOKIE_PATH,
   SESSION_DEFAULT_CSRF_COOKIE_NAME,
   SESSION_DEFAULT_SAME_SITE_ON_CSRF_ENABLED,
   SESSION_USER_COOKIE_NAME,
-} from './constants';
-import { Session } from '../core';
+} from '../constants';
+import { Session } from '../../core';
 
 /**
  * Sends the session token in a cookie.

diff --git a/packages/jwt/src/http/jwt.hook.ts b/packages/jwt/src/http/jwt.hook.ts
@@ -20,9 +20,8 @@ import { decode, verify } from 'jsonwebtoken';
 // FoalTS
 import { JWT_DEFAULT_COOKIE_NAME, JWT_DEFAULT_CSRF_COOKIE_NAME } from './constants';
 import { getSecretOrPublicKey } from '../core';
-import { getCsrfTokenFromRequest } from './get-csrf-token-from-request';
 import { isInvalidTokenError } from './invalid-token.error';
-import { getCsrfTokenFromCookie, shouldVerifyCsrfToken } from './utils';
+import { getCsrfTokenFromCookie, getCsrfTokenFromRequest, shouldVerifyCsrfToken } from './utils';
 
 class InvalidTokenResponse extends HttpResponseUnauthorized {
 

diff --git a/.../http/get-csrf-token-from-request.spec.ts → ...utils/get-csrf-token-from-request.spec.ts b/.../http/get-csrf-token-from-request.spec.ts → ...utils/get-csrf-token-from-request.spec.ts
diff --git a/...t/src/http/get-csrf-token-from-request.ts → ...http/utils/get-csrf-token-from-request.ts b/...t/src/http/get-csrf-token-from-request.ts → ...http/utils/get-csrf-token-from-request.ts
diff --git a/packages/jwt/src/http/utils/index.ts b/packages/jwt/src/http/utils/index.ts
@@ -1,2 +1,3 @@
 export { getCsrfTokenFromCookie } from './get-csrf-token-from-cookie';
+export { getCsrfTokenFromRequest } from './get-csrf-token-from-request';
 export { shouldVerifyCsrfToken } from './should-verify-csrf-token';