[AAE-8649] Being able to use input values of discovery (#1378)

* Use the discovery input if passed * Move the setting into proper method * Fix unit test with relative link
Alfresco · May 9, 2022 · 470d9c3 · 470d9c3
1 parent befd13c
commit 470d9c3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/src/authentication/oauth2Auth.ts b/src/authentication/oauth2Auth.ts
@@ -47,7 +47,11 @@ export class Oauth2Auth extends AlfrescoApiClient {
         loginUrl?: string;
         logoutUrl?: string;
         tokenEndpoint?: string;
-    } = {};
+    } = {
+        loginUrl: undefined,
+        logoutUrl: undefined,
+        tokenEndpoint: undefined,
+    };
 
     authentications: Authentication = {
         'oauth2': { accessToken: '' }, type: 'oauth2', 'basicAuth': {}
@@ -58,7 +62,6 @@ export class Oauth2Auth extends AlfrescoApiClient {
     constructor(config: AlfrescoApiConfig, alfrescoApi: AlfrescoApi) {
         super();
         this.storage = new Storage();
-        this.storage.setDomainPrefix(config.domainPrefix);
 
         this.className = 'Oauth2Auth';
 
@@ -69,6 +72,7 @@ export class Oauth2Auth extends AlfrescoApiClient {
 
     setConfig(config: AlfrescoApiConfig, alfrescoApi: AlfrescoApi) {
         this.config = config;
+        this.storage.setDomainPrefix(config.domainPrefix);
 
         if (this.config.oauth2) {
             if (this.config.oauth2.host === undefined || this.config.oauth2.host === null) {
@@ -128,10 +132,10 @@ export class Oauth2Auth extends AlfrescoApiClient {
         }
     }
 
-    discoveryUrls() {
-        this.discovery.loginUrl = this.host + (this.config.oauth2.authorizationUrl || Oauth2Auth.DEFAULT_AUTHORIZATION_URL);
-        this.discovery.logoutUrl = this.host + (this.config.oauth2.logoutUrl || Oauth2Auth.DEFAULT_LOGOUT_URL);
-        this.discovery.tokenEndpoint = this.host + (this.config.oauth2.tokenUrl || Oauth2Auth.DEFAULT_TOKEN_URL);
+     discoveryUrls() {
+        this.discovery.loginUrl = this.config.oauth2.authorizationUrl ||  this.host  + Oauth2Auth.DEFAULT_AUTHORIZATION_URL;
+        this.discovery.logoutUrl = this.config.oauth2.logoutUrl ||  this.host  + Oauth2Auth.DEFAULT_LOGOUT_URL;
+        this.discovery.tokenEndpoint = this.config.oauth2.tokenUrl ||  this.host  + Oauth2Auth.DEFAULT_TOKEN_URL;
     }
 
     hasContentProvider(): boolean {

diff --git a/test/oauth2Auth.spec.ts b/test/oauth2Auth.spec.ts
@@ -25,6 +25,7 @@ describe('Oauth2  test', () => {
         oauth2Mock = new OAuthMock(hostOauth2);
         authResponseMock = new EcmAuthMock(hostOauth2);
 
+
         alfrescoJsApi = new AlfrescoApi({
             hostEcm: 'myecm'
         } as AlfrescoApiConfig);
@@ -76,9 +77,9 @@ describe('Oauth2  test', () => {
                 alfrescoJsApi
             );
 
-            expect(oauth2Auth.discovery.loginUrl).to.be.equal(host + authorizationUrl);
-            expect(oauth2Auth.discovery.tokenEndpoint).to.be.equal(host + tokenUrl);
-            expect(oauth2Auth.discovery.logoutUrl).to.be.equal(host + logoutUrl);
+            expect(oauth2Auth.discovery.loginUrl).to.be.equal(authorizationUrl);
+            expect(oauth2Auth.discovery.tokenEndpoint).to.be.equal(tokenUrl);
+            expect(oauth2Auth.discovery.logoutUrl).to.be.equal(logoutUrl);
         });
 
     });