fix token

This commit is contained in:
Laurenz Rausche 2024-05-10 20:46:00 +00:00
parent ab0cb85957
commit 04e27a0db9
6 changed files with 10 additions and 36 deletions

View File

@ -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",

View File

@ -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),

View File

@ -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;

View File

@ -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({

View File

@ -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({

View File

@ -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;
};
}