fix(authentication-service): export all artifacts of modules from root (

#1951) export models and providers from modules to make them able to import from service by user BREAKING CHANGE: this will affect the projects where imports are from dist gh-1950
sourcefuse · Feb 1, 2024 · d842b81 · d842b81
1 parent bddc93b
commit d842b81
Show file tree

Hide file tree

Showing 15 changed files with 111 additions and 106 deletions.
diff --git a/services/authentication-service/src/__tests__/unit/sequelize/sequelize.component.unit.ts b/services/authentication-service/src/__tests__/unit/sequelize/sequelize.component.unit.ts
@@ -10,6 +10,7 @@ import {
   LoginController,
   OtpController,
 } from '../../../controllers';
+import {AppleLoginController} from '../../../modules/auth/controllers';
 import {
   AuthClientRepository,
   LoginActivityRepository,
@@ -21,8 +22,6 @@ import {
   UserRepository,
   UserTenantRepository,
 } from '../../../repositories/sequelize';
-
-import {AppleLoginController} from '../../../modules/auth/apple-login.controller';
 import {LoginHelperService, OtpService} from '../../../services';
 import {getBaseClass} from '../../utils/getBaseClass';
 import {SequelizeAuthenticationServiceApplication} from './sequelize.application';

diff --git a/services/authentication-service/src/controllers/index.ts b/services/authentication-service/src/controllers/index.ts
@@ -2,24 +2,26 @@
 //
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
-import {AppleLoginController} from '../modules/auth/apple-login.controller';
-import {FacebookLoginController} from '../modules/auth/facebook-login.controller';
-import {GoogleLoginController} from '../modules/auth/google-login.controller';
-import {InstagramLoginController} from '../modules/auth/instagram-login.controller';
-import {KeycloakLoginController} from '../modules/auth/keycloak-login.controller';
-import {LoginController} from '../modules/auth/login.controller';
-import {LogoutController} from '../modules/auth/logout.controller';
 import {ForgetPasswordController} from './forget-password.controller';
-import {OtpController} from '../modules/auth/otp.controller';
 import {SignupRequestController} from './signup-request.controller';
-import {AzureLoginController} from '../modules/auth/azure-login.controller';
-import {CognitoLoginController} from '../modules/auth/cognito-login.controller';
-import {SamlLoginController} from '../modules/auth/saml-login.controller';
 import {LoginActivityController} from './login-activity.controller';
+import {
+  AppleLoginController,
+  FacebookLoginController,
+  GoogleLoginController,
+  InstagramLoginController,
+  KeycloakLoginController,
+  LoginController,
+  LogoutController,
+  OtpController,
+  AzureLoginController,
+  CognitoLoginController,
+  SamlLoginController,
+} from '../modules/auth/controllers';
 
-export * from '../modules/auth/login.controller';
-export * from '../modules/auth/logout.controller';
-export * from '../modules/auth/otp.controller';
+export * from '../modules/auth/controllers/login.controller';
+export * from '../modules/auth/controllers/logout.controller';
+export * from '../modules/auth/controllers/otp.controller';
 export * from './forget-password.controller';
 export * from './signup-request.controller';
 export * from './login-activity.controller';

diff --git a/services/authentication-service/src/index.ts b/services/authentication-service/src/index.ts
@@ -6,6 +6,7 @@ import './load-env';
 export * from './component';
 export * from './keys';
 export * from './models';
+export * from './modules/auth';
 export * from './providers';
 export * from './repositories';
 export * from './services';

diff --git a/...rc/modules/auth/apple-login.controller.ts → ...uth/controllers/apple-login.controller.ts b/...rc/modules/auth/apple-login.controller.ts → ...uth/controllers/apple-login.controller.ts
@@ -31,11 +31,10 @@ import {
 } from 'loopback4-authentication';
 import {authorize} from 'loopback4-authorization';
 import {URLSearchParams} from 'url';
-import {AuthCodeBindings, AuthCodeGeneratorFn} from '../../providers';
-import {AuthClientRepository} from '../../repositories';
-import {AuthUser} from './models/auth-user.model';
-import {ClientAuthRequest} from './models/client-auth-request.dto';
-import {TokenResponse} from './models/token-response.dto';
+import {AuthCodeBindings, AuthCodeGeneratorFn} from '../../../providers';
+import {AuthClientRepository} from '../../../repositories';
+import {AuthUser, ClientAuthRequest, TokenResponse} from '../models';
+
 const queryGen = (from: 'body' | 'query') => {
   return (req: Request) => {
     return {

diff --git a/...rc/modules/auth/azure-login.controller.ts → ...uth/controllers/azure-login.controller.ts b/...rc/modules/auth/azure-login.controller.ts → ...uth/controllers/azure-login.controller.ts
@@ -27,11 +27,10 @@ import {
   STRATEGY,
 } from 'loopback4-authentication';
 import {authorize} from 'loopback4-authorization';
-import {AuthCodeBindings, AuthCodeGeneratorFn} from '../../providers';
-import {AuthClientRepository} from '../../repositories';
-import {AuthUser} from './models/auth-user.model';
-import {ClientAuthRequest} from './models/client-auth-request.dto';
-import {TokenResponse} from './models/token-response.dto';
+import {AuthCodeBindings, AuthCodeGeneratorFn} from '../../../providers';
+import {AuthClientRepository} from '../../../repositories';
+import {AuthUser, ClientAuthRequest, TokenResponse} from '../models';
+
 const queryGen = (from: 'body' | 'query') => {
   return (req: Request) => {
     return {

diff --git a/.../modules/auth/cognito-login.controller.ts → ...h/controllers/cognito-login.controller.ts b/.../modules/auth/cognito-login.controller.ts → ...h/controllers/cognito-login.controller.ts
@@ -32,11 +32,9 @@ import {
 } from 'loopback4-authentication';
 import {authorize} from 'loopback4-authorization';
 import {URLSearchParams} from 'url';
-import {AuthCodeBindings, AuthCodeGeneratorFn} from '../../providers';
-import {AuthClientRepository} from '../../repositories';
-import {AuthUser} from './models/auth-user.model';
-import {ClientAuthRequest} from './models/client-auth-request.dto';
-import {TokenResponse} from './models/token-response.dto';
+import {AuthCodeBindings, AuthCodeGeneratorFn} from '../../../providers';
+import {AuthClientRepository} from '../../../repositories';
+import {AuthUser, ClientAuthRequest, TokenResponse} from '../models';
 
 const queryGen = (from: 'body' | 'query') => {
   return (req: Request) => {

diff --git a/...modules/auth/facebook-login.controller.ts → .../controllers/facebook-login.controller.ts b/...modules/auth/facebook-login.controller.ts → .../controllers/facebook-login.controller.ts
@@ -31,11 +31,9 @@ import {
 } from 'loopback4-authentication';
 import {authorize} from 'loopback4-authorization';
 import {URLSearchParams} from 'url';
-import {AuthCodeBindings, AuthCodeGeneratorFn} from '../../providers';
-import {AuthClientRepository} from '../../repositories';
-import {AuthUser} from './models/auth-user.model';
-import {ClientAuthRequest} from './models/client-auth-request.dto';
-import {TokenResponse} from './models/token-response.dto';
+import {AuthCodeBindings, AuthCodeGeneratorFn} from '../../../providers';
+import {AuthClientRepository} from '../../../repositories';
+import {AuthUser, ClientAuthRequest, TokenResponse} from '../models';
 
 const queryGen = (from: 'body' | 'query') => {
   return (req: Request) => {

diff --git a/...c/modules/auth/google-login.controller.ts → ...th/controllers/google-login.controller.ts b/...c/modules/auth/google-login.controller.ts → ...th/controllers/google-login.controller.ts
@@ -32,11 +32,10 @@ import {
 } from 'loopback4-authentication';
 import {authorize} from 'loopback4-authorization';
 import {URLSearchParams} from 'url';
-import {AuthCodeBindings, AuthCodeGeneratorFn} from '../../providers';
-import {AuthClientRepository} from '../../repositories';
-import {AuthUser} from './models/auth-user.model';
-import {ClientAuthRequest} from './models/client-auth-request.dto';
-import {TokenResponse} from './models/token-response.dto';
+import {AuthCodeBindings, AuthCodeGeneratorFn} from '../../../providers';
+import {AuthClientRepository} from '../../../repositories';
+import {AuthUser, ClientAuthRequest, TokenResponse} from '../models';
+
 const queryGen = (from: 'body' | 'query') => {
   return (req: Request) => {
     return {

diff --git a/services/authentication-service/src/modules/auth/controllers/index.ts b/services/authentication-service/src/modules/auth/controllers/index.ts
@@ -0,0 +1,11 @@
+export * from './apple-login.controller';
+export * from './azure-login.controller';
+export * from './cognito-login.controller';
+export * from './facebook-login.controller';
+export * from './google-login.controller';
+export * from './instagram-login.controller';
+export * from './keycloak-login.controller';
+export * from './login.controller';
+export * from './logout.controller';
+export * from './otp.controller';
+export * from './saml-login.controller';
diff --git a/...odules/auth/instagram-login.controller.ts → ...controllers/instagram-login.controller.ts b/...odules/auth/instagram-login.controller.ts → ...controllers/instagram-login.controller.ts
@@ -31,11 +31,9 @@ import {
 } from 'loopback4-authentication';
 import {authorize} from 'loopback4-authorization';
 import {URLSearchParams} from 'url';
-import {AuthCodeBindings, AuthCodeGeneratorFn} from '../../providers';
-import {AuthClientRepository} from '../../repositories';
-import {AuthUser} from './models/auth-user.model';
-import {ClientAuthRequest} from './models/client-auth-request.dto';
-import {TokenResponse} from './models/token-response.dto';
+import {AuthCodeBindings, AuthCodeGeneratorFn} from '../../../providers';
+import {AuthClientRepository} from '../../../repositories';
+import {AuthUser, ClientAuthRequest, TokenResponse} from '../models';
 
 const queryGen = (from: 'body' | 'query') => {
   return (req: Request) => {

diff --git a/...modules/auth/keycloak-login.controller.ts → .../controllers/keycloak-login.controller.ts b/...modules/auth/keycloak-login.controller.ts → .../controllers/keycloak-login.controller.ts
@@ -32,11 +32,10 @@ import {
 } from 'loopback4-authentication';
 import {authorize} from 'loopback4-authorization';
 import {URLSearchParams} from 'url';
-import {AuthCodeBindings, AuthCodeGeneratorFn} from '../../providers';
-import {AuthClientRepository} from '../../repositories';
-import {AuthUser} from './models/auth-user.model';
-import {ClientAuthRequest} from './models/client-auth-request.dto';
-import {TokenResponse} from './models/token-response.dto';
+import {AuthCodeBindings, AuthCodeGeneratorFn} from '../../../providers';
+import {AuthClientRepository} from '../../../repositories';
+import {AuthUser, ClientAuthRequest, TokenResponse} from '../models';
+
 const queryGen = (from: 'body' | 'query') => {
   return (req: Request) => {
     return {

diff --git a/...vice/src/modules/auth/login.controller.ts → ...ules/auth/controllers/login.controller.ts b/...vice/src/modules/auth/login.controller.ts → ...ules/auth/controllers/login.controller.ts
@@ -5,14 +5,14 @@
 import {inject} from '@loopback/context';
 import {AnyObject, DataObject, Model, repository} from '@loopback/repository';
 import {
-  HttpErrors,
-  RequestContext,
   get,
   getModelSchemaRef,
+  HttpErrors,
   param,
   patch,
   post,
   requestBody,
+  RequestContext,
 } from '@loopback/rest';
 import {
   AuthenticateErrorKeys,
@@ -27,66 +27,66 @@ import {
   UserStatus,
   X_TS_TYPE,
 } from '@sourceloop/core';
-
 import crypto from 'crypto';
 import * as jwt from 'jsonwebtoken';
 import {
-  AuthErrorKeys,
+  authenticate,
+  authenticateClient,
   AuthenticationBindings,
+  AuthErrorKeys,
   ClientAuthCode,
   STRATEGY,
-  authenticate,
-  authenticateClient,
 } from 'loopback4-authentication';
-import {AuthorizeErrorKeys, authorize} from 'loopback4-authorization';
+import {authorize, AuthorizeErrorKeys} from 'loopback4-authorization';
 import moment from 'moment-timezone';
-import {LoginType} from '../../enums/login-type.enum';
-import {AuthServiceBindings} from '../../keys';
+import {LoginType} from '../../../enums';
+import {AuthServiceBindings} from '../../../keys';
 import {
   AuthClient,
   LoginActivity,
   RefreshToken,
   User,
   UserTenant,
-} from '../../models';
+} from '../../../models';
 import {
   AuthCodeBindings,
   AuthCodeGeneratorFn,
   CodeReaderFn,
-  JWTSignerFn,
   JwtPayloadFn,
+  JWTSignerFn,
   UserValidationServiceBindings,
-} from '../../providers';
+} from '../../../providers';
 import {
   AuthClientRepository,
   LoginActivityRepository,
   OtpCacheRepository,
   RefreshTokenRepository,
   RevokedTokenRepository,
   RoleRepository,
+  TenantConfigRepository,
   UserCredentialsRepository,
   UserLevelPermissionRepository,
   UserLevelResourceRepository,
   UserRepository,
   UserTenantRepository,
-} from '../../repositories';
-import {TenantConfigRepository} from '../../repositories/tenant-config.repository';
-import {LoginHelperService} from '../../services';
+} from '../../../repositories';
+import {LoginHelperService} from '../../../services';
 import {
   ActorId,
   ExternalTokens,
   IUserActivity,
   UserValidationFn,
-} from '../../types';
+} from '../../../types';
 import {
   AuthRefreshTokenRequest,
   AuthTokenRequest,
-  CodeResponse,
+  AuthUser,
   LoginRequest,
-} from './';
-import {AuthUser} from './models/auth-user.model';
-import {ResetPassword} from './models/reset-password.dto';
-import {TokenResponse} from './models/token-response.dto';
+  ResetPassword,
+  TokenResponse,
+} from '../models';
+import {CodeResponse} from '../types';
+
 export class LoginController {
   constructor(
     @inject(AuthenticationBindings.CURRENT_CLIENT)

diff --git a/...ice/src/modules/auth/logout.controller.ts → ...les/auth/controllers/logout.controller.ts b/...ice/src/modules/auth/logout.controller.ts → ...les/auth/controllers/logout.controller.ts
@@ -5,14 +5,14 @@
 import {inject} from '@loopback/context';
 import {repository} from '@loopback/repository';
 import {
-  HttpErrors,
-  Request,
-  RequestContext,
-  RestBindings,
   getModelSchemaRef,
+  HttpErrors,
   param,
   post,
+  Request,
   requestBody,
+  RequestContext,
+  RestBindings,
 } from '@loopback/rest';
 import {
   AuthenticateErrorKeys,
@@ -29,33 +29,34 @@ import {encode} from 'base-64';
 import crypto from 'crypto';
 import {HttpsProxyAgent} from 'https-proxy-agent';
 import {
-  AuthErrorKeys,
+  authenticate,
   AuthenticationBindings,
+  AuthErrorKeys,
   STRATEGY,
-  authenticate,
 } from 'loopback4-authentication';
 import {authorize} from 'loopback4-authorization';
 import fetch from 'node-fetch';
 import {URLSearchParams} from 'url';
+import {LoginType} from '../../../enums';
+import {AuthServiceBindings} from '../../../keys';
 import {
   AuthClient,
-  IUserActivity,
-  JwtPayloadFn,
-  LoginType,
+  LoginActivity,
   RefreshToken,
+  RefreshTokenRequest,
   User,
   UserTenant,
-} from '../..';
-import {AuthServiceBindings} from '../../keys';
-import {LoginActivity, RefreshTokenRequest} from '../../models';
+} from '../../../models';
+import {JwtPayloadFn} from '../../../providers';
 import {
   LoginActivityRepository,
   RefreshTokenRepository,
   RevokedTokenRepository,
   UserRepository,
   UserTenantRepository,
-} from '../../repositories';
-import {ActorId} from '../../types';
+} from '../../../repositories';
+import {ActorId, IUserActivity} from '../../../types';
+
 const proxyUrl = process.env.HTTPS_PROXY ?? process.env.HTTP_PROXY;
 
 const getProxyAgent = () => {

diff --git a/...ervice/src/modules/auth/otp.controller.ts → ...odules/auth/controllers/otp.controller.ts b/...ervice/src/modules/auth/otp.controller.ts → ...odules/auth/controllers/otp.controller.ts
@@ -25,23 +25,26 @@ import {
 import {authorize} from 'loopback4-authorization';
 import {authenticator} from 'otplib';
 import qrcode from 'qrcode';
-import {User, UserCredentials} from '../../models';
-import {AuthCodeBindings, CodeReaderFn, CodeWriterFn} from '../../providers';
+import {User, UserCredentials} from '../../../models';
+import {AuthCodeBindings, CodeReaderFn, CodeWriterFn} from '../../../providers';
 import {
   AuthClientRepository,
   OtpCacheRepository,
   UserCredentialsRepository,
   UserRepository,
-} from '../../repositories';
+} from '../../../repositories';
 import {
   AuthTokenRequest,
-  CodeResponse,
+  AuthUser,
   OtpLoginRequest,
+  OtpSendRequest,
+} from '../models';
+import {
+  CodeResponse,
   QrCodeCheckResponse,
   QrCodeCreateResponse,
-} from './';
-import {AuthUser} from './models/auth-user.model';
-import {OtpSendRequest} from './models/otp-send-request.dto';
+} from '../types';
+
 export class OtpController {
   constructor(
     @repository(AuthClientRepository)