1- import { AuthDriver } from './drivers/default/enums/authDriver' ;
2- import { HttpClient } from './httpClient' ;
3- import axios , { AxiosInstance , AxiosRequestConfig } from 'axios' ;
1+ import { AuthDriver } from './drivers/default/enums/authDriver' ;
2+ import { HttpClient } from './httpClient' ;
3+ import axios , { AxiosInstance , AxiosRequestConfig } from 'axios' ;
44
55export class Orion {
6- protected static host : string ;
6+ protected static baseUrl : string ;
77 protected static prefix : string ;
88 protected static authDriver : AuthDriver ;
99 protected static token : string | null = null ;
@@ -12,12 +12,12 @@ export class Orion {
1212 protected static makeHttpClientCallback : ( ( ) => AxiosInstance ) | null = null ;
1313
1414 public static init (
15- host : string ,
15+ baseUrl : string ,
1616 prefix : string = 'api' ,
1717 authDriver : AuthDriver = AuthDriver . Default ,
1818 token ?: string
1919 ) : void {
20- Orion . setHost ( host ) ;
20+ Orion . setBaseUrl ( baseUrl ) ;
2121 if ( token ) {
2222 Orion . setToken ( token ) ;
2323 }
@@ -27,13 +27,13 @@ export class Orion {
2727 this . httpClientConfig = Orion . buildHttpClientConfig ( ) ;
2828 }
2929
30- public static setHost ( apiUrl : string ) : Orion {
31- Orion . host = apiUrl ;
30+ public static setBaseUrl ( baseUrl : string ) : Orion {
31+ Orion . baseUrl = baseUrl ;
3232 return Orion ;
3333 }
3434
35- public static getHost ( ) : string {
36- return Orion . host . endsWith ( '/' ) ? Orion . host : `${ Orion . host } /` ;
35+ public static getBaseUrl ( ) : string {
36+ return Orion . baseUrl . endsWith ( '/' ) ? Orion . baseUrl : `${ Orion . baseUrl } /` ;
3737 }
3838
3939 public static setPrefix ( prefix : string ) : Orion {
@@ -57,7 +57,7 @@ export class Orion {
5757 }
5858
5959 public static getApiUrl ( ) : string {
60- return Orion . getHost ( ) + Orion . getPrefix ( ) ;
60+ return Orion . getBaseUrl ( ) + Orion . getPrefix ( ) ;
6161 }
6262
6363 public static setToken ( token : string ) : Orion {
@@ -85,12 +85,16 @@ export class Orion {
8585 return Orion ;
8686 }
8787
88- public static makeHttpClient ( baseUrl ?: string ) : HttpClient {
88+ public static makeHttpClient ( baseUrl ?: string , withPrefix = true ) : HttpClient {
8989 const client : AxiosInstance = this . makeHttpClientCallback
9090 ? this . makeHttpClientCallback ( )
9191 : axios . create ( ) ;
9292
93- return new HttpClient ( baseUrl || Orion . getApiUrl ( ) , client , this . getAuthDriver ( ) ) ;
93+ if ( ! baseUrl ) {
94+ baseUrl = withPrefix ? Orion . getApiUrl ( ) : Orion . getBaseUrl ( )
95+ }
96+
97+ return new HttpClient ( baseUrl , client , this . getAuthDriver ( ) ) ;
9498 }
9599
96100 public static makeHttpClientUsing ( callback : ( ) => AxiosInstance ) : Orion {
0 commit comments