chore: refactor out absolute imports

I've tried everything to get absolute imports working, unfortunately they were more of a pain than they were worth. Maybe one day there will be better support. For now, they were causing problems for end users see this issue: jaredpalmer/tsdx#91
jasonraimondi · Oct 4, 2020 · 92720f3 · 92720f3
1 parent a8c4f49
commit 92720f3
Show file tree

Hide file tree

Showing 40 changed files with 245 additions and 226 deletions.
diff --git a/examples/in_memory/database.ts b/examples/in_memory/database.ts
@@ -1,8 +1,8 @@
-import { OAuthToken } from "~/entities/token.entity";
-import { OAuthAuthCode } from "~/entities/auth_code.entity";
-import { OAuthClient } from "~/entities/client.entity";
-import { OAuthScope } from "~/entities/scope.entity";
-import { OAuthUser } from "~/entities/user.entity";
+import { OAuthAuthCode } from "../../src/entities/auth_code.entity";
+import { OAuthClient } from "../../src/entities/client.entity";
+import { OAuthScope } from "../../src/entities/scope.entity";
+import { OAuthToken } from "../../src/entities/token.entity";
+import { OAuthUser } from "../../src/entities/user.entity";
 
 export interface InMemory {
   users: { [id: string]: OAuthUser };

diff --git a/examples/in_memory/main.ts b/examples/in_memory/main.ts
@@ -1,9 +1,9 @@
 import { json, urlencoded } from "body-parser";
 import Express from "express";
 
-import { OAuthException } from "~/exceptions/oauth.exception";
-import { OAuthRequest } from "~/requests/request";
-import { OAuthResponse } from "~/responses/response";
+import { OAuthException } from "../../src/exceptions/oauth.exception";
+import { OAuthRequest } from "../../src/requests/request";
+import { OAuthResponse } from "../../src/responses/response";
 import { inMemoryAuthorizationServer } from "./oauth_authorization_server";
 
 const app = Express();

diff --git a/examples/in_memory/oauth_authorization_server.ts b/examples/in_memory/oauth_authorization_server.ts
@@ -1,6 +1,6 @@
-import { AuthorizationServer } from "~/authorization_server";
-import { DateInterval } from "~/utils/date_interval";
-import { JwtService } from "~/utils/jwt";
+import { AuthorizationServer } from "../../src/authorization_server";
+import { DateInterval } from "../../src/utils/date_interval";
+import { JwtService } from "../../src/utils/jwt";
 import {
   inMemoryAccessTokenRepository,
   inMemoryAuthCodeRepository,

diff --git a/examples/in_memory/repository.ts b/examples/in_memory/repository.ts
@@ -1,15 +1,15 @@
-import { OAuthAuthCode } from "~/entities/auth_code.entity";
-import { OAuthClient } from "~/entities/client.entity";
-import { OAuthScope } from "~/entities/scope.entity";
-import { OAuthToken } from "~/entities/token.entity";
-import { OAuthUser } from "~/entities/user.entity";
-import { GrantIdentifier } from "~/grants/abstract/grant.interface";
-import { OAuthTokenRepository } from "~/repositories/access_token.repository";
-import { OAuthAuthCodeRepository } from "~/repositories/auth_code.repository";
-import { OAuthClientRepository } from "~/repositories/client.repository";
-import { OAuthScopeRepository } from "~/repositories/scope.repository";
-import { OAuthUserRepository } from "~/repositories/user.repository";
-import { DateInterval } from "~/utils/date_interval";
+import { OAuthAuthCode } from "../../src/entities/auth_code.entity";
+import { OAuthClient } from "../../src/entities/client.entity";
+import { OAuthScope } from "../../src/entities/scope.entity";
+import { OAuthToken } from "../../src/entities/token.entity";
+import { OAuthUser } from "../../src/entities/user.entity";
+import { GrantIdentifier } from "../../src/grants/abstract/grant.interface";
+import { OAuthTokenRepository } from "../../src/repositories/access_token.repository";
+import { OAuthAuthCodeRepository } from "../../src/repositories/auth_code.repository";
+import { OAuthClientRepository } from "../../src/repositories/client.repository";
+import { OAuthScopeRepository } from "../../src/repositories/scope.repository";
+import { OAuthUserRepository } from "../../src/repositories/user.repository";
+import { DateInterval } from "../../src/utils/date_interval";
 import { inMemoryDatabase } from "./database";
 
 const oneHourInFuture = new DateInterval("1h").getEndDate();

diff --git a/jest.config.js b/jest.config.js
@@ -9,11 +9,11 @@ module.exports = {
     "json",
     "ts",
   ],
-  modulePathIgnorePatterns: ['<rootDir>/dist'],
-  moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, {
-    prefix: "<rootDir>/",
-  }),
-  rootDir: "./",
+  // modulePathIgnorePatterns: ['<rootDir>/dist'],
+  // moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, {
+  //   prefix: "<rootDir>/",
+  // }),
+  // rootDir: "./",
   testRegex: ".spec.ts$",
   transform: {
     "^.+\\.(t|j)s$": "ts-jest",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.0",
+  "version": "1.0.0-beta.1",
   "name": "@jmondi/oauth2-server",
   "author": "Jason Raimondi <[email protected]>",
   "module": "dist/oauth2-server.esm.js",

diff --git a/src/authorization_server.ts b/src/authorization_server.ts
@@ -1,20 +1,20 @@
-import { OAuthException } from "~/exceptions/oauth.exception";
-import { GrantIdentifier, GrantInterface } from "~/grants/abstract/grant.interface";
-import { AuthCodeGrant } from "~/grants/auth_code.grant";
-import { ClientCredentialsGrant } from "~/grants/client_credentials.grant";
-import { ImplicitGrant } from "~/grants/implicit.grant";
-import { PasswordGrant } from "~/grants/password.grant";
-import { RefreshTokenGrant } from "~/grants/refresh_token.grant";
-import { OAuthTokenRepository } from "~/repositories/access_token.repository";
-import { OAuthAuthCodeRepository } from "~/repositories/auth_code.repository";
-import { OAuthClientRepository } from "~/repositories/client.repository";
-import { OAuthScopeRepository } from "~/repositories/scope.repository";
-import { OAuthUserRepository } from "~/repositories/user.repository";
-import { AuthorizationRequest } from "~/requests/authorization.request";
-import { RequestInterface } from "~/requests/request";
-import { ResponseInterface } from "~/responses/response";
-import { DateInterval } from "~/utils/date_interval";
-import { JwtInterface } from "~/utils/jwt";
+import { OAuthException } from "./exceptions/oauth.exception";
+import { GrantIdentifier, GrantInterface } from "./grants/abstract/grant.interface";
+import { AuthCodeGrant } from "./grants/auth_code.grant";
+import { ClientCredentialsGrant } from "./grants/client_credentials.grant";
+import { ImplicitGrant } from "./grants/implicit.grant";
+import { PasswordGrant } from "./grants/password.grant";
+import { RefreshTokenGrant } from "./grants/refresh_token.grant";
+import { OAuthTokenRepository } from "./repositories/access_token.repository";
+import { OAuthAuthCodeRepository } from "./repositories/auth_code.repository";
+import { OAuthClientRepository } from "./repositories/client.repository";
+import { OAuthScopeRepository } from "./repositories/scope.repository";
+import { OAuthUserRepository } from "./repositories/user.repository";
+import { AuthorizationRequest } from "./requests/authorization.request";
+import { RequestInterface } from "./requests/request";
+import { ResponseInterface } from "./responses/response";
+import { DateInterval } from "./utils/date_interval";
+import { JwtInterface } from "./utils/jwt";
 
 export class AuthorizationServer {
   private readonly enabledGrantTypes: { [key: string]: GrantInterface } = {};

diff --git a/src/code_verifiers/plain.verifier.ts b/src/code_verifiers/plain.verifier.ts
@@ -1,4 +1,4 @@
-import { ICodeChallenge } from "~/code_verifiers/verifier";
+import { ICodeChallenge } from "./verifier";
 
 export class PlainVerifier implements ICodeChallenge {
   public readonly method = "plain";

diff --git a/src/code_verifiers/s256.verifier.ts b/src/code_verifiers/s256.verifier.ts
@@ -1,7 +1,7 @@
 import crypto from "crypto";
 
-import { base64urlencode } from "~/utils/base64";
-import { ICodeChallenge } from "~/code_verifiers/verifier";
+import { base64urlencode } from "../utils/base64";
+import { ICodeChallenge } from "./verifier";
 
 export class S256Verifier implements ICodeChallenge {
   public readonly method = "S256";

diff --git a/src/entities/auth_code.entity.ts b/src/entities/auth_code.entity.ts
@@ -1,6 +1,6 @@
-import { OAuthScope } from "~/entities/scope.entity";
-import { OAuthUser } from "~/entities/user.entity";
-import { OAuthClient } from "~/entities/client.entity";
+import { OAuthClient } from "./client.entity";
+import { OAuthScope } from "./scope.entity";
+import { OAuthUser } from "./user.entity";
 
 export interface OAuthAuthCode {
   code: string;

diff --git a/src/entities/client.entity.ts b/src/entities/client.entity.ts
@@ -1,5 +1,5 @@
-import { OAuthScope } from "~/entities/scope.entity";
-import { GrantIdentifier } from "~/grants/abstract/grant.interface";
+import { GrantIdentifier } from "../grants/abstract/grant.interface";
+import { OAuthScope } from "./scope.entity";
 
 export interface OAuthClient {
   id: string;

diff --git a/src/entities/token.entity.ts b/src/entities/token.entity.ts
@@ -1,6 +1,6 @@
-import { OAuthScope } from "~/entities/scope.entity";
-import { OAuthClient } from "~/entities/client.entity";
-import { OAuthUser } from "~/entities/user.entity";
+import { OAuthClient } from "./client.entity";
+import { OAuthScope } from "./scope.entity";
+import { OAuthUser } from "./user.entity";
 
 export interface OAuthToken {
   accessToken: string;

diff --git a/src/grants/abstract/abstract.grant.ts b/src/grants/abstract/abstract.grant.ts
@@ -1,24 +1,23 @@
-import { OAuthAuthCode } from "~/entities/auth_code.entity";
-import { isClientConfidential, OAuthClient } from "~/entities/client.entity";
-import { OAuthScope } from "~/entities/scope.entity";
-import { OAuthToken } from "~/entities/token.entity";
-import { OAuthUser } from "~/entities/user.entity";
-import { OAuthException } from "~/exceptions/oauth.exception";
-import { GrantIdentifier, GrantInterface } from "~/grants/abstract/grant.interface";
-import { OAuthTokenRepository } from "~/repositories/access_token.repository";
-import { OAuthAuthCodeRepository } from "~/repositories/auth_code.repository";
-import { OAuthClientRepository } from "~/repositories/client.repository";
-import { OAuthScopeRepository } from "~/repositories/scope.repository";
-import { OAuthUserRepository } from "~/repositories/user.repository";
-import { AuthorizationRequest } from "~/requests/authorization.request";
-import { RequestInterface } from "~/requests/request";
-import { BearerTokenResponse } from "~/responses/bearer_token.response";
-import { ResponseInterface } from "~/responses/response";
-import { arrayDiff } from "~/utils/array";
-import { base64decode } from "~/utils/base64";
-import { DateInterval } from "~/utils/date_interval";
-import { JwtInterface } from "~/utils/jwt";
-import { getSecondsUntil, roundToSeconds } from "~/utils/time";
+import { isClientConfidential, OAuthClient } from "../../entities/client.entity";
+import { OAuthScope } from "../../entities/scope.entity";
+import { OAuthToken } from "../../entities/token.entity";
+import { OAuthUser } from "../../entities/user.entity";
+import { OAuthException } from "../../exceptions/oauth.exception";
+import { OAuthTokenRepository } from "../../repositories/access_token.repository";
+import { OAuthAuthCodeRepository } from "../../repositories/auth_code.repository";
+import { OAuthClientRepository } from "../../repositories/client.repository";
+import { OAuthScopeRepository } from "../../repositories/scope.repository";
+import { OAuthUserRepository } from "../../repositories/user.repository";
+import { AuthorizationRequest } from "../../requests/authorization.request";
+import { RequestInterface } from "../../requests/request";
+import { BearerTokenResponse } from "../../responses/bearer_token.response";
+import { ResponseInterface } from "../../responses/response";
+import { arrayDiff } from "../../utils/array";
+import { base64decode } from "../../utils/base64";
+import { DateInterval } from "../../utils/date_interval";
+import { JwtInterface } from "../../utils/jwt";
+import { getSecondsUntil, roundToSeconds } from "../../utils/time";
+import { GrantIdentifier, GrantInterface } from "./grant.interface";
 
 export interface ITokenData {
   iss: undefined;

diff --git a/src/grants/abstract/abstract_authorized.grant.ts b/src/grants/abstract/abstract_authorized.grant.ts
@@ -1,8 +1,8 @@
 import querystring, { ParsedUrlQueryInput } from "querystring";
-import { OAuthClient } from "~/entities/client.entity";
-import { OAuthException } from "~/exceptions/oauth.exception";
 
-import { AbstractGrant } from "~/grants/abstract/abstract.grant";
+import { OAuthClient } from "../../entities/client.entity";
+import { OAuthException } from "../../exceptions/oauth.exception";
+import { AbstractGrant } from "./abstract.grant";
 
 export abstract class AbstractAuthorizedGrant extends AbstractGrant {
   protected makeRedirectUrl(uri: string, params: ParsedUrlQueryInput, queryDelimiter = "?") {

diff --git a/src/grants/abstract/grant.interface.ts b/src/grants/abstract/grant.interface.ts
@@ -1,7 +1,7 @@
-import { AuthorizationRequest } from "~/requests/authorization.request";
-import { RequestInterface } from "~/requests/request";
-import { ResponseInterface } from "~/responses/response";
-import { DateInterval } from "~/utils/date_interval";
+import { AuthorizationRequest } from "../../requests/authorization.request";
+import { RequestInterface } from "../../requests/request";
+import { ResponseInterface } from "../../responses/response";
+import { DateInterval } from "../../utils/date_interval";
 
 export type GrantIdentifier = "authorization_code" | "client_credentials" | "refresh_token" | "password" | "implicit";
 

diff --git a/src/grants/auth_code.grant.ts b/src/grants/auth_code.grant.ts
@@ -1,18 +1,18 @@
-import { PlainVerifier } from "~/code_verifiers/plain.verifier";
-import { S256Verifier } from "~/code_verifiers/s256.verifier";
-import { CodeChallengeMethod, ICodeChallenge } from "~/code_verifiers/verifier";
-import { OAuthAuthCode } from "~/entities/auth_code.entity";
-import { OAuthClient } from "~/entities/client.entity";
-import { OAuthScope } from "~/entities/scope.entity";
-import { OAuthException } from "~/exceptions/oauth.exception";
-import { AbstractAuthorizedGrant } from "~/grants/abstract/abstract_authorized.grant";
-import { GrantIdentifier } from "~/grants/abstract/grant.interface";
-import { AuthorizationRequest } from "~/requests/authorization.request";
-import { RequestInterface } from "~/requests/request";
-import { RedirectResponse } from "~/responses/redirect.response";
-import { ResponseInterface } from "~/responses/response";
-import { base64decode } from "~/utils/base64";
-import { DateInterval } from "~/utils/date_interval";
+import { PlainVerifier } from "../code_verifiers/plain.verifier";
+import { S256Verifier } from "../code_verifiers/s256.verifier";
+import { CodeChallengeMethod, ICodeChallenge } from "../code_verifiers/verifier";
+import { OAuthAuthCode } from "../entities/auth_code.entity";
+import { OAuthClient } from "../entities/client.entity";
+import { OAuthScope } from "../entities/scope.entity";
+import { OAuthException } from "../exceptions/oauth.exception";
+import { AuthorizationRequest } from "../requests/authorization.request";
+import { RequestInterface } from "../requests/request";
+import { RedirectResponse } from "../responses/redirect.response";
+import { ResponseInterface } from "../responses/response";
+import { base64decode } from "../utils/base64";
+import { DateInterval } from "../utils/date_interval";
+import { AbstractAuthorizedGrant } from "./abstract/abstract_authorized.grant";
+import { GrantIdentifier } from "./abstract/grant.interface";
 
 export interface IAuthCodePayload {
   client_id: string;

diff --git a/src/grants/client_credentials.grant.ts b/src/grants/client_credentials.grant.ts
@@ -1,7 +1,7 @@
-import { AbstractGrant } from "~/grants/abstract/abstract.grant";
-import { RequestInterface } from "~/requests/request";
-import { ResponseInterface } from "~/responses/response";
-import { DateInterval } from "~/utils/date_interval";
+import { RequestInterface } from "../requests/request";
+import { ResponseInterface } from "../responses/response";
+import { DateInterval } from "../utils/date_interval";
+import { AbstractGrant } from "./abstract/abstract.grant";
 
 export class ClientCredentialsGrant extends AbstractGrant {
   readonly identifier = "client_credentials";

diff --git a/src/grants/implicit.grant.ts b/src/grants/implicit.grant.ts
@@ -1,11 +1,11 @@
-import { OAuthException } from "~/exceptions/oauth.exception";
-import { AbstractAuthorizedGrant } from "~/grants/abstract/abstract_authorized.grant";
-import { AuthorizationRequest } from "~/requests/authorization.request";
-import { RequestInterface } from "~/requests/request";
-import { RedirectResponse } from "~/responses/redirect.response";
-import { ResponseInterface } from "~/responses/response";
-import { DateInterval } from "~/utils/date_interval";
-import { getSecondsUntil } from "~/utils/time";
+import { OAuthException } from "../exceptions/oauth.exception";
+import { AuthorizationRequest } from "../requests/authorization.request";
+import { RequestInterface } from "../requests/request";
+import { RedirectResponse } from "../responses/redirect.response";
+import { ResponseInterface } from "../responses/response";
+import { DateInterval } from "../utils/date_interval";
+import { getSecondsUntil } from "../utils/time";
+import { AbstractAuthorizedGrant } from "./abstract/abstract_authorized.grant";
 
 export class ImplicitGrant extends AbstractAuthorizedGrant {
   readonly identifier = "implicit";

diff --git a/src/grants/password.grant.ts b/src/grants/password.grant.ts
@@ -1,10 +1,10 @@
-import { OAuthClient } from "~/entities/client.entity";
-import { OAuthUser } from "~/entities/user.entity";
-import { OAuthException } from "~/exceptions/oauth.exception";
-import { AbstractGrant } from "~/grants/abstract/abstract.grant";
-import { RequestInterface } from "~/requests/request";
-import { ResponseInterface } from "~/responses/response";
-import { DateInterval } from "~/utils/date_interval";
+import { OAuthClient } from "../entities/client.entity";
+import { OAuthUser } from "../entities/user.entity";
+import { OAuthException } from "../exceptions/oauth.exception";
+import { RequestInterface } from "../requests/request";
+import { ResponseInterface } from "../responses/response";
+import { DateInterval } from "../utils/date_interval";
+import { AbstractGrant } from "./abstract/abstract.grant";
 
 export class PasswordGrant extends AbstractGrant {
   readonly identifier = "password";