@cratis/arc 18.9.0 → 18.9.2

package/identity/IdentityProvider.ts

@@ -7,6 +7,7 @@ import { IIdentity } from './IIdentity';
 import { IdentityProviderResult } from './IdentityProviderResult';
 import { GetHttpHeaders } from 'GetHttpHeaders';
 import { Globals } from '../Globals';
+import { UrlHelpers } from '../UrlHelpers';
 import { joinPaths } from '../joinPaths';
 
 /**
@@ -75,8 +76,10 @@ export class IdentityProvider extends IIdentityProvider {
 
     static async refresh<TDetails extends object = object>(type?: Constructor<TDetails>): Promise<IIdentity<TDetails>> {
         IdentityProvider.clearCookie();
+        const origin = IdentityProvider.origin || Globals.origin || '';
         const apiBasePath = IdentityProvider.apiBasePath || Globals.apiBasePath || '';
-        const url = joinPaths(apiBasePath, '/.cratis/me');
+        const route = joinPaths(apiBasePath, '/.cratis/me');
+        const url = UrlHelpers.createUrlFrom(origin, apiBasePath, route);
         const response = await fetch(
             url, {
             method: 'GET',

package/identity/for_IdentityProvider/given/an_identity_provider.ts

@@ -17,7 +17,12 @@ export class an_identity_provider {
         
         // Mock document for tests that need it
         if (typeof document === 'undefined') {
-            (global as { document?: { cookie: string } }).document = { cookie: '' };
+            (global as { document?: { cookie: string; location: { origin: string } } }).document = {
+                cookie: '',
+                location: {
+                    origin: 'http://localhost'
+                }
+            };
         }
         
         this.fetchHelper = createFetchHelper();

package/identity/for_IdentityProvider/when_refreshing/with_api_base_path_set.ts

@@ -6,6 +6,8 @@ import { an_identity_provider } from '../given/an_identity_provider';
 import { given } from '../../../given';
 
 describe('when refreshing with api base path set', given(an_identity_provider, context => {
+    let actualUrl: URL;
+
     beforeEach(async () => {
         context.fetchStub.resolves({
             ok: true,
@@ -18,13 +20,15 @@ describe('when refreshing with api base path set', given(an_identity_provider, c
 
         IdentityProvider.setApiBasePath('/custom/api');
         await IdentityProvider.refresh();
+        
+        actualUrl = context.fetchStub.firstCall.args[0];
     });
 
     afterEach(() => {
         IdentityProvider.setApiBasePath('');
     });
 
-    it('should call fetch with api base path prefixed', () => {
-        context.fetchStub.should.have.been.calledWith('/custom/api/.cratis/me');
+    it('should_call_fetch_with_api_base_path_prefixed', () => {
+        actualUrl.pathname.should.equal('/custom/api/.cratis/me');
     });
 }));

package/identity/for_IdentityProvider/when_refreshing/with_globals_api_base_path.ts

@@ -8,6 +8,7 @@ import { given } from '../../../given';
 
 describe('when refreshing with globals api base path', given(an_identity_provider, context => {
     let originalGlobalsApiBasePath: string;
+    let actualUrl: URL;
 
     beforeEach(async () => {
         context.fetchStub.resolves({
@@ -23,6 +24,8 @@ describe('when refreshing with globals api base path', given(an_identity_provide
         Globals.apiBasePath = '/global/api';
         IdentityProvider.setApiBasePath('');
         await IdentityProvider.refresh();
+        
+        actualUrl = context.fetchStub.firstCall.args[0];
     });
 
     afterEach(() => {
@@ -30,7 +33,7 @@ describe('when refreshing with globals api base path', given(an_identity_provide
         IdentityProvider.setApiBasePath('');
     });
 
-    it('should call fetch with globals api base path prefixed', () => {
-        context.fetchStub.should.have.been.calledWith('/global/api/.cratis/me');
+    it('should_call_fetch_with_globals_api_base_path_prefixed', () => {
+        actualUrl.pathname.should.equal('/global/api/.cratis/me');
     });
 }));

package/identity/for_IdentityProvider/when_refreshing/with_origin_set.ts

@@ -0,0 +1,45 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { IdentityProvider } from '../../IdentityProvider';
+import { an_identity_provider } from '../given/an_identity_provider';
+import { given } from '../../../given';
+
+describe('when refreshing with origin set', given(an_identity_provider, context => {
+    let actualUrl: URL;
+
+    beforeEach(async () => {
+        context.fetchStub.resolves({
+            ok: true,
+            json: async () => ({
+                id: 'test-user-id',
+                name: 'Test User',
+                details: { role: 'admin' }
+            })
+        } as Response);
+
+        IdentityProvider.setOrigin('https://example.com');
+        IdentityProvider.setApiBasePath('/api/v1');
+        
+        await IdentityProvider.refresh();
+        
+        actualUrl = context.fetchStub.firstCall.args[0];
+    });
+
+    afterEach(() => {
+        IdentityProvider.setOrigin('');
+        IdentityProvider.setApiBasePath('');
+    });
+
+    it('should_call_fetch_with_full_url_including_origin', () => {
+        actualUrl.href.should.equal('https://example.com/api/v1/.cratis/me');
+    });
+
+    it('should_have_correct_origin', () => {
+        actualUrl.origin.should.equal('https://example.com');
+    });
+
+    it('should_have_correct_pathname', () => {
+        actualUrl.pathname.should.equal('/api/v1/.cratis/me');
+    });
+}));

package/identity/for_IdentityProvider/when_refreshing/without_api_base_path.ts

@@ -8,6 +8,7 @@ import { given } from '../../../given';
 
 describe('when refreshing without api base path', given(an_identity_provider, context => {
     let originalGlobalsApiBasePath: string;
+    let actualUrl: URL;
 
     beforeEach(async () => {
         context.fetchStub.resolves({
@@ -23,13 +24,15 @@ describe('when refreshing without api base path', given(an_identity_provider, co
         Globals.apiBasePath = '';
         IdentityProvider.setApiBasePath('');
         await IdentityProvider.refresh();
+        
+        actualUrl = context.fetchStub.firstCall.args[0];
     });
 
     afterEach(() => {
         Globals.apiBasePath = originalGlobalsApiBasePath;
     });
 
-    it('should call fetch with default path', () => {
-        context.fetchStub.should.have.been.calledWith('/.cratis/me');
+    it('should_call_fetch_with_default_path', () => {
+        actualUrl.pathname.should.equal('/.cratis/me');
     });
 }));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cratis/arc",
-    "version": "18.9.0",
+    "version": "18.9.2",
     "description": "",
     "author": "Cratis",
     "license": "MIT",