From 04e27a0db996f2e2bef8e047b14508b643046433 Mon Sep 17 00:00:00 2001
From: Laurenz Rausche <laurenz@laurenz-rausche.de>
Date: Fri, 10 May 2024 20:46:00 +0000
Subject: [PATCH] fix token

---
 packages/client/package.json            |  2 +-
 packages/client/src/auth.ts             |  4 +---
 packages/client/src/methods/check.ts    | 10 ++++------
 packages/client/src/methods/logout.ts   |  5 ++---
 packages/client/src/methods/refresh.ts  |  5 ++---
 packages/client/src/methods/validate.ts | 20 --------------------
 6 files changed, 10 insertions(+), 36 deletions(-)
 delete mode 100644 packages/client/src/methods/validate.ts

diff --git a/packages/client/package.json b/packages/client/package.json
index 3f9c3e2..b1aa112 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@auth-tools/client",
-  "version": "0.0.1-alpha.4",
+  "version": "0.0.1-alpha.5",
   "description": "A structured authentication protocol for Javascript. (client)",
   "main": "dist/index.js",
   "repository": "https://github.com/auth-tools/auth-tools",
diff --git a/packages/client/src/auth.ts b/packages/client/src/auth.ts
index c6d84ce..7262829 100644
--- a/packages/client/src/auth.ts
+++ b/packages/client/src/auth.ts
@@ -9,7 +9,6 @@ import {
 } from "@auth-tools/base";
 import { LogFunction } from "@auth-tools/logger";
 import { undefinedUseEvent } from "./events";
-import { createValidate } from "./methods/validate";
 import { createRegister } from "./methods/register";
 import { createLogin } from "./methods/login";
 import { createLogout } from "./methods/logout";
@@ -67,7 +66,7 @@ export class AuthClient extends AuthBase<
   {}
 > {
   //all methods
-  public methods: AuthClientMethods;
+  public methods: Omit<AuthClientMethods, "validate">;
 
   constructor(config: AuthClientConfig, log: LogFunction) {
     //defaults for use event callbacks
@@ -82,7 +81,6 @@ export class AuthClient extends AuthBase<
 
     //all auth methods
     this.methods = {
-      validate: createValidate(this._internal),
       register: createRegister(this._internal),
       login: createLogin(this._internal),
       logout: createLogout(this._internal),
diff --git a/packages/client/src/methods/check.ts b/packages/client/src/methods/check.ts
index 13af231..69080fd 100644
--- a/packages/client/src/methods/check.ts
+++ b/packages/client/src/methods/check.ts
@@ -15,21 +15,19 @@ export function createCheck(
       type: "refreshToken",
     });
 
-    if (getRefreshToken.error || getRefreshToken.token === null)
-      return { clientError: true, res: null };
+    if (getRefreshToken.error) return { clientError: true, res: null };
 
     const getAccessToken = await internal.useEventCallbacks.getToken({
       type: "accessToken",
     });
 
-    if (getAccessToken.error || getAccessToken.token === null)
-      return { clientError: true, res: null };
+    if (getAccessToken.error) return { clientError: true, res: null };
 
     const checkResponse = await (
       internal.config.connector as AuthClientConnector<"check">
     )("check", {
-      accessToken: getAccessToken.token,
-      refreshToken: getRefreshToken.token,
+      accessToken: getAccessToken.token || undefined,
+      refreshToken: getRefreshToken.token || undefined,
     });
 
     return checkResponse;
diff --git a/packages/client/src/methods/logout.ts b/packages/client/src/methods/logout.ts
index f083364..bf0859c 100644
--- a/packages/client/src/methods/logout.ts
+++ b/packages/client/src/methods/logout.ts
@@ -15,12 +15,11 @@ export function createLogout(
       type: "refreshToken",
     });
 
-    if (getRefreshToken.error || getRefreshToken.token === null)
-      return { clientError: true, res: null };
+    if (getRefreshToken.error) return { clientError: true, res: null };
 
     const logoutResponse = await (
       internal.config.connector as AuthClientConnector<"logout">
-    )("logout", { refreshToken: getRefreshToken.token });
+    )("logout", { refreshToken: getRefreshToken.token || undefined });
 
     if (!logoutResponse.clientError && !logoutResponse.res.error) {
       internal.useEventCallbacks.deleteToken({
diff --git a/packages/client/src/methods/refresh.ts b/packages/client/src/methods/refresh.ts
index 38f9e78..f2e0c72 100644
--- a/packages/client/src/methods/refresh.ts
+++ b/packages/client/src/methods/refresh.ts
@@ -15,12 +15,11 @@ export function createRefresh(
       type: "refreshToken",
     });
 
-    if (getRefreshToken.error || getRefreshToken.token === null)
-      return { clientError: true, res: null };
+    if (getRefreshToken.error) return { clientError: true, res: null };
 
     const refreshResponse = await (
       internal.config.connector as AuthClientConnector<"refresh">
-    )("refresh", { refreshToken: getRefreshToken.token });
+    )("refresh", { refreshToken: getRefreshToken.token || undefined });
 
     if (!refreshResponse.clientError && !refreshResponse.res.error) {
       internal.useEventCallbacks.storeToken({
diff --git a/packages/client/src/methods/validate.ts b/packages/client/src/methods/validate.ts
deleted file mode 100644
index 1160ec0..0000000
--- a/packages/client/src/methods/validate.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { AuthInternal } from "@auth-tools/base";
-import {
-  AuthClientConfig,
-  AuthClientConnector,
-  AuthClientMethod,
-  AuthClientUseEvents,
-} from "../auth";
-
-//create validate method
-export function createValidate(
-  internal: AuthInternal<AuthClientConfig, AuthClientUseEvents, {}>
-): AuthClientMethod<"validate"> {
-  return async ({ accessToken }) => {
-    const validateResponse = await (
-      internal.config.connector as AuthClientConnector<"validate">
-    )("validate", { accessToken });
-
-    return validateResponse;
-  };
-}