fix: add baseCdnUrl attribute in all packages

descope · Feb 10, 2025 · 91a7b14 · 91a7b14
1 parent 8346412
commit 91a7b14
Show file tree

Hide file tree

Showing 26 changed files with 59 additions and 20 deletions.
diff --git a/packages/libs/sdk-mixins/src/index.ts b/packages/libs/sdk-mixins/src/index.ts
@@ -25,4 +25,3 @@ export * from './mixins/initElementMixin';
 export * from './mixins/initLifecycleMixin';
 export * from './mixins/projectIdMixin';
 export * from './mixins/baseUrlMixin';
-export * from './mixins/baseStaticUrlMixin';
diff --git a/packages/libs/sdk-mixins/src/mixins/baseStaticUrlMixin.ts b/packages/libs/sdk-mixins/src/mixins/baseStaticUrlMixin.ts
diff --git a/...s/angular-sdk/src/lib/components/access-key-management/access-key-management.component.ts b/...s/angular-sdk/src/lib/components/access-key-management/access-key-management.component.ts
@@ -12,6 +12,7 @@ export class AccessKeyManagementComponent implements OnInit, OnChanges {
   projectId: string;
   baseUrl?: string;
   baseStaticUrl?: string;
+  baseCdnUrl?: string;
   @Input() tenant: string;
   @Input() widgetId: string;
 
@@ -29,6 +30,7 @@ export class AccessKeyManagementComponent implements OnInit, OnChanges {
     this.projectId = descopeConfig.projectId;
     this.baseUrl = descopeConfig.baseUrl;
     this.baseStaticUrl = descopeConfig.baseStaticUrl;
+    this.baseCdnUrl = descopeConfig.baseCdnUrl;
   }
 
   ngOnInit() {
@@ -50,6 +52,9 @@ export class AccessKeyManagementComponent implements OnInit, OnChanges {
     if (this.baseStaticUrl) {
       this.webComponent.setAttribute('base-static-url', this.baseStaticUrl);
     }
+    if (this.baseCdnUrl) {
+      this.webComponent.setAttribute('base-cdn-url', this.baseCdnUrl);
+    }
     if (this.theme) {
       this.webComponent.setAttribute('theme', this.theme);
     }

diff --git a/...jects/angular-sdk/src/lib/components/applications-portal/applications-portal.component.ts b/...jects/angular-sdk/src/lib/components/applications-portal/applications-portal.component.ts
@@ -20,6 +20,7 @@ export class ApplicationsPortalComponent implements OnInit, OnChanges {
   projectId: string;
   baseUrl?: string;
   baseStaticUrl?: string;
+  baseCdnUrl?: string;
   @Input() widgetId: string;
 
   @Input() theme: 'light' | 'dark' | 'os';
@@ -38,6 +39,7 @@ export class ApplicationsPortalComponent implements OnInit, OnChanges {
     this.projectId = descopeConfig.projectId;
     this.baseUrl = descopeConfig.baseUrl;
     this.baseStaticUrl = descopeConfig.baseStaticUrl;
+    this.baseCdnUrl = descopeConfig.baseCdnUrl;
   }
 
   ngOnInit() {
@@ -58,6 +60,9 @@ export class ApplicationsPortalComponent implements OnInit, OnChanges {
     if (this.baseStaticUrl) {
       this.webComponent.setAttribute('base-static-url', this.baseStaticUrl);
     }
+    if (this.baseCdnUrl) {
+      this.webComponent.setAttribute('base-cdn-url', this.baseCdnUrl);
+    }
     if (this.theme) {
       this.webComponent.setAttribute('theme', this.theme);
     }

diff --git a/...dk/projects/angular-sdk/src/lib/components/audit-management/audit-management.component.ts b/...dk/projects/angular-sdk/src/lib/components/audit-management/audit-management.component.ts
@@ -12,6 +12,7 @@ export class AuditManagementComponent implements OnInit, OnChanges {
   projectId: string;
   baseUrl?: string;
   baseStaticUrl?: string;
+  baseCdnUrl?: string;
   @Input() tenant: string;
   @Input() widgetId: string;
 
@@ -29,6 +30,7 @@ export class AuditManagementComponent implements OnInit, OnChanges {
     this.projectId = descopeConfig.projectId;
     this.baseUrl = descopeConfig.baseUrl;
     this.baseStaticUrl = descopeConfig.baseStaticUrl;
+    this.baseCdnUrl = descopeConfig.baseCdnUrl;
   }
 
   ngOnInit() {
@@ -50,6 +52,9 @@ export class AuditManagementComponent implements OnInit, OnChanges {
     if (this.baseStaticUrl) {
       this.webComponent.setAttribute('base-static-url', this.baseStaticUrl);
     }
+    if (this.baseCdnUrl) {
+      this.webComponent.setAttribute('base-cdn-url', this.baseCdnUrl);
+    }
     if (this.theme) {
       this.webComponent.setAttribute('theme', this.theme);
     }

diff --git a/...ges/sdks/angular-sdk/projects/angular-sdk/src/lib/components/descope/descope.component.ts b/...ges/sdks/angular-sdk/projects/angular-sdk/src/lib/components/descope/descope.component.ts
@@ -23,6 +23,7 @@ export class DescopeComponent implements OnInit, OnChanges {
   projectId: string;
   baseUrl?: string;
   baseStaticUrl?: string;
+  baseCdnUrl?: string;
   storeLastAuthenticatedUser?: boolean;
   @Input() flowId: string;
 
@@ -58,6 +59,7 @@ export class DescopeComponent implements OnInit, OnChanges {
     this.projectId = descopeConfig.projectId;
     this.baseUrl = descopeConfig.baseUrl;
     this.baseStaticUrl = descopeConfig.baseStaticUrl;
+    this.baseCdnUrl = descopeConfig.baseCdnUrl;
     this.storeLastAuthenticatedUser = descopeConfig.storeLastAuthenticatedUser;
   }
 
@@ -103,6 +105,9 @@ export class DescopeComponent implements OnInit, OnChanges {
     if (this.baseStaticUrl) {
       this.webComponent.setAttribute('base-static-url', this.baseStaticUrl);
     }
+    if (this.baseCdnUrl) {
+      this.webComponent.setAttribute('base-cdn-url', this.baseCdnUrl);
+    }
     if (this.storeLastAuthenticatedUser) {
       this.webComponent.setAttribute(
         'store-last-authenticated-user',

diff --git a/...-sdk/projects/angular-sdk/src/lib/components/role-management/role-management.component.ts b/...-sdk/projects/angular-sdk/src/lib/components/role-management/role-management.component.ts
@@ -12,6 +12,7 @@ export class RoleManagementComponent implements OnInit, OnChanges {
   projectId: string;
   baseUrl?: string;
   baseStaticUrl?: string;
+  baseCdnUrl?: string;
   @Input() tenant: string;
   @Input() widgetId: string;
 
@@ -29,6 +30,7 @@ export class RoleManagementComponent implements OnInit, OnChanges {
     this.projectId = descopeConfig.projectId;
     this.baseUrl = descopeConfig.baseUrl;
     this.baseStaticUrl = descopeConfig.baseStaticUrl;
+    this.baseCdnUrl = descopeConfig.baseCdnUrl;
   }
 
   ngOnInit() {
@@ -50,6 +52,9 @@ export class RoleManagementComponent implements OnInit, OnChanges {
     if (this.baseStaticUrl) {
       this.webComponent.setAttribute('base-static-url', this.baseStaticUrl);
     }
+    if (this.baseCdnUrl) {
+      this.webComponent.setAttribute('base-cdn-url', this.baseCdnUrl);
+    }
     if (this.theme) {
       this.webComponent.setAttribute('theme', this.theme);
     }

diff --git a/...-sdk/projects/angular-sdk/src/lib/components/user-management/user-management.component.ts b/...-sdk/projects/angular-sdk/src/lib/components/user-management/user-management.component.ts
@@ -12,6 +12,7 @@ export class UserManagementComponent implements OnInit, OnChanges {
   projectId: string;
   baseUrl?: string;
   baseStaticUrl?: string;
+  baseCdnUrl?: string;
   @Input() tenant: string;
   @Input() widgetId: string;
 
@@ -29,6 +30,7 @@ export class UserManagementComponent implements OnInit, OnChanges {
     this.projectId = descopeConfig.projectId;
     this.baseUrl = descopeConfig.baseUrl;
     this.baseStaticUrl = descopeConfig.baseStaticUrl;
+    this.baseCdnUrl = descopeConfig.baseCdnUrl;
   }
 
   ngOnInit() {
@@ -51,6 +53,9 @@ export class UserManagementComponent implements OnInit, OnChanges {
     if (this.baseStaticUrl) {
       this.webComponent.setAttribute('base-static-url', this.baseStaticUrl);
     }
+    if (this.baseCdnUrl) {
+      this.webComponent.setAttribute('base-cdn-url', this.baseCdnUrl);
+    }
     if (this.theme) {
       this.webComponent.setAttribute('theme', this.theme);
     }

diff --git a/...ngular-sdk/projects/angular-sdk/src/lib/components/user-profile/user-profile.component.ts b/...ngular-sdk/projects/angular-sdk/src/lib/components/user-profile/user-profile.component.ts
@@ -20,6 +20,7 @@ export class UserProfileComponent implements OnInit, OnChanges {
   projectId: string;
   baseUrl?: string;
   baseStaticUrl?: string;
+  baseCdnUrl?: string;
   @Input() widgetId: string;
 
   @Input() theme: 'light' | 'dark' | 'os';
@@ -38,6 +39,7 @@ export class UserProfileComponent implements OnInit, OnChanges {
     this.projectId = descopeConfig.projectId;
     this.baseUrl = descopeConfig.baseUrl;
     this.baseStaticUrl = descopeConfig.baseStaticUrl;
+    this.baseCdnUrl = descopeConfig.baseCdnUrl;
   }
 
   ngOnInit() {
@@ -58,6 +60,9 @@ export class UserProfileComponent implements OnInit, OnChanges {
     if (this.baseStaticUrl) {
       this.webComponent.setAttribute('base-static-url', this.baseStaticUrl);
     }
+    if (this.baseCdnUrl) {
+      this.webComponent.setAttribute('base-cdn-url', this.baseCdnUrl);
+    }
     if (this.theme) {
       this.webComponent.setAttribute('theme', this.theme);
     }

diff --git a/packages/sdks/angular-sdk/projects/angular-sdk/src/lib/types/types.ts b/packages/sdks/angular-sdk/projects/angular-sdk/src/lib/types/types.ts
@@ -4,6 +4,7 @@ export class DescopeAuthConfig {
   projectId = '';
   baseUrl?: string;
   baseStaticUrl?: string;
+  baseCdnUrl?: string;
   // If true, tokens will be stored on local storage
   persistTokens?: boolean;
   sessionTokenViaCookie?: boolean;

diff --git a/packages/sdks/angular-sdk/projects/demo-app/src/app/app.module.ts b/packages/sdks/angular-sdk/projects/demo-app/src/app/app.module.ts
@@ -48,6 +48,7 @@ export function initializeApp(authService: DescopeAuthService) {
       projectId: environment.descopeProjectId,
       baseUrl: environment.descopeBaseUrl || '',
       baseStaticUrl: environment.descopeBaseStaticUrl || '',
+      baseCdnUrl: environment.descopeBaseCdnUrl || '',
       sessionTokenViaCookie: true
     })
   ],

diff --git a/packages/sdks/angular-sdk/projects/demo-app/src/environments/conifg.ts b/packages/sdks/angular-sdk/projects/demo-app/src/environments/conifg.ts
@@ -2,6 +2,7 @@ export interface Env {
   descopeProjectId: string;
   descopeBaseUrl?: string;
   descopeBaseStaticUrl?: string;
+  descopeBaseCdnUrl?: string;
   descopeFlowId?: string;
   descopeDebugMode?: false;
   descopeTheme?: string;

diff --git a/packages/sdks/angular-sdk/projects/demo-app/src/environments/environment.ts b/packages/sdks/angular-sdk/projects/demo-app/src/environments/environment.ts
@@ -8,6 +8,7 @@ export const environment: Env = {
   descopeProjectId: '',
   descopeBaseUrl: '',
   descopeBaseStaticUrl: '',
+  descopeBaseCdnUrl: '',
   descopeFlowId: '',
   descopeDebugMode: false,
   descopeTheme: '',

diff --git a/packages/sdks/core-js-sdk/src/createSdk.ts b/packages/sdks/core-js-sdk/src/createSdk.ts
@@ -10,6 +10,8 @@ type SdkConfig = {
   projectId: string;
   logger?: Logger;
   baseUrl?: string;
+  baseStaticUrl?: string;
+  baseCdnUrl?: string;
   hooks?: Hooks;
   cookiePolicy?: RequestCredentials | null;
   baseHeaders?: HeadersInit;

diff --git a/packages/sdks/react-sdk/src/components/UserProfile.tsx b/packages/sdks/react-sdk/src/components/UserProfile.tsx
@@ -28,7 +28,8 @@ const UserProfile = React.forwardRef<HTMLElement, UserProfileProps>(
 
     useImperativeHandle(ref, () => innerRef);
 
-    const { projectId, baseUrl, baseStaticUrl } = React.useContext(Context);
+    const { projectId, baseUrl, baseStaticUrl, baseCdnUrl } =
+      React.useContext(Context);
 
     useEffect(() => {
       if (innerRef && onLogout) {
@@ -45,6 +46,7 @@ const UserProfile = React.forwardRef<HTMLElement, UserProfileProps>(
           widgetId={widgetId}
           baseUrl={baseUrl}
           baseStaticUrl={baseStaticUrl}
+          baseCdnUrl={baseCdnUrl}
           styleId={styleId}
           ref={setInnerRef}
           {...{

diff --git a/packages/sdks/react-sdk/src/types.ts b/packages/sdks/react-sdk/src/types.ts
@@ -97,6 +97,7 @@ export interface IContext {
   baseUrl?: string;
   styleId?: string;
   baseStaticUrl?: string;
+  baseCdnUrl?: string;
   storeLastAuthenticatedUser?: boolean;
   keepLastAuthenticatedUserAfterLogout?: boolean;
   sdk?: Sdk;

diff --git a/packages/sdks/vue-sdk/src/types.ts b/packages/sdks/vue-sdk/src/types.ts
@@ -5,6 +5,7 @@ export type Options = {
   projectId: string;
   baseUrl?: string;
   baseStaticUrl?: string;
+  baseCdnUrl?: string;
   // If true, tokens will be stored on local storage
   persistTokens?: boolean;
   sessionTokenViaCookie?: boolean;

diff --git a/packages/widgets/user-profile-widget/src/lib/widget/mixins/flowRedirectUrlMixin.ts b/packages/widgets/user-profile-widget/src/lib/widget/mixins/flowRedirectUrlMixin.ts
@@ -37,6 +37,7 @@ export const flowRedirectUrlMixin = createSingletonMixin(
             flowId: widgetFlow,
             baseUrl: this.baseUrl,
             baseStaticUrl: this.baseStaticUrl,
+            baseCdnUrl: this.baseCdnUrl,
           }),
         );
 

diff --git a/packages/widgets/user-profile-widget/src/lib/widget/mixins/helpers.ts b/packages/widgets/user-profile-widget/src/lib/widget/mixins/helpers.ts
@@ -5,6 +5,7 @@ type FlowConfig = {
   flowId: string;
   baseUrl?: string;
   baseStaticUrl?: string;
+  baseCdnUrl?: string;
 };
 
 export const createFlowTemplate = (

diff --git a/...er-profile-widget/src/lib/widget/mixins/initMixin/initComponentsMixins/initAvatarMixin.ts b/...er-profile-widget/src/lib/widget/mixins/initMixin/initComponentsMixins/initAvatarMixin.ts
@@ -8,12 +8,7 @@ import {
   createSingletonMixin,
   withMemCache,
 } from '@descope/sdk-helpers';
-import {
-  baseStaticUrlMixin,
-  loggerMixin,
-  modalMixin,
-  themeMixin,
-} from '@descope/sdk-mixins';
+import { loggerMixin, modalMixin, themeMixin } from '@descope/sdk-mixins';
 import { getName, getPicture } from '../../../state/selectors';
 import { stateManagementMixin } from '../../stateManagementMixin';
 import { initWidgetRootMixin } from './initWidgetRootMixin';
@@ -29,7 +24,6 @@ export const initAvatarMixin = createSingletonMixin(
       loggerMixin,
       initWidgetRootMixin,
       modalMixin,
-      baseStaticUrlMixin,
     )(superclass) {
       avatar: AvatarDriver;
 
@@ -57,6 +51,7 @@ export const initAvatarMixin = createSingletonMixin(
             flowId: this.avatar.flowId,
             baseUrl: this.baseUrl,
             baseStaticUrl: this.baseStaticUrl,
+            baseCdnUrl: this.baseCdnUrl,
           }),
         );
         this.#flow.onSuccess(() => {

diff --git a/...ile-widget/src/lib/widget/mixins/initMixin/initComponentsMixins/initEmailUserAttrMixin.ts b/...ile-widget/src/lib/widget/mixins/initMixin/initComponentsMixins/initEmailUserAttrMixin.ts
@@ -54,6 +54,7 @@ export const initEmailUserAttrMixin = createSingletonMixin(
             flowId: this.emailUserAttr.editFlowId,
             baseUrl: this.baseUrl,
             baseStaticUrl: this.baseStaticUrl,
+            baseCdnUrl: this.baseCdnUrl,
           }),
         );
         this.#editFlow.onSuccess(() => {

diff --git a/...file-widget/src/lib/widget/mixins/initMixin/initComponentsMixins/initNameUserAttrMixin.ts b/...file-widget/src/lib/widget/mixins/initMixin/initComponentsMixins/initNameUserAttrMixin.ts
@@ -54,6 +54,7 @@ export const initNameUserAttrMixin = createSingletonMixin(
             flowId: this.nameUserAttr.editFlowId,
             baseUrl: this.baseUrl,
             baseStaticUrl: this.baseStaticUrl,
+            baseCdnUrl: this.baseCdnUrl,
           }),
         );
         this.#editFlow.onSuccess(() => {
@@ -82,6 +83,7 @@ export const initNameUserAttrMixin = createSingletonMixin(
             flowId: this.nameUserAttr.deleteFlowId,
             baseUrl: this.baseUrl,
             baseStaticUrl: this.baseStaticUrl,
+            baseCdnUrl: this.baseCdnUrl,
           }),
         );
         this.#deleteFlow.onSuccess(() => {

diff --git a/...et/src/lib/widget/mixins/initMixin/initComponentsMixins/initPasskeyUserAuthMethodMixin.ts b/...et/src/lib/widget/mixins/initMixin/initComponentsMixins/initPasskeyUserAuthMethodMixin.ts
@@ -50,6 +50,7 @@ export const initPasskeyUserAuthMethodMixin = createSingletonMixin(
             flowId: this.passkeyUserAuthMethod.flowId,
             baseUrl: this.baseUrl,
             baseStaticUrl: this.baseStaticUrl,
+            baseCdnUrl: this.baseCdnUrl,
           }),
         );
         this.#flow.onSuccess(() => {

diff --git a/...t/src/lib/widget/mixins/initMixin/initComponentsMixins/initPasswordUserAuthMethodMixin.ts b/...t/src/lib/widget/mixins/initMixin/initComponentsMixins/initPasswordUserAuthMethodMixin.ts
@@ -45,6 +45,7 @@ export const initPasswordUserAuthMethodMixin = createSingletonMixin(
             flowId: this.passwordUserAuthMethod.flowId,
             baseUrl: this.baseUrl,
             baseStaticUrl: this.baseStaticUrl,
+            baseCdnUrl: this.baseCdnUrl,
           }),
         );
         this.#flow.onSuccess(() => {

diff --git a/...ile-widget/src/lib/widget/mixins/initMixin/initComponentsMixins/initPhoneUserAttrMixin.ts b/...ile-widget/src/lib/widget/mixins/initMixin/initComponentsMixins/initPhoneUserAttrMixin.ts
@@ -54,6 +54,7 @@ export const initPhoneUserAttrMixin = createSingletonMixin(
             flowId: this.phoneUserAttr.editFlowId,
             baseUrl: this.baseUrl,
             baseStaticUrl: this.baseStaticUrl,
+            baseCdnUrl: this.baseCdnUrl,
           }),
         );
         this.#editFlow.onSuccess(() => {
@@ -82,6 +83,7 @@ export const initPhoneUserAttrMixin = createSingletonMixin(
             flowId: this.phoneUserAttr.deleteFlowId,
             baseUrl: this.baseUrl,
             baseStaticUrl: this.baseStaticUrl,
+            baseCdnUrl: this.baseCdnUrl,
           }),
         );
         this.#deleteFlow.onSuccess(() => {

diff --git a/...get/src/lib/widget/mixins/initMixin/initComponentsMixins/initUserCustomAttributesMixin.ts b/...get/src/lib/widget/mixins/initMixin/initComponentsMixins/initUserCustomAttributesMixin.ts
@@ -52,6 +52,7 @@ export const initUserCustomAttributesMixin = createSingletonMixin(
             flowId,
             baseUrl: this.baseUrl,
             baseStaticUrl: this.baseStaticUrl,
+            baseCdnUrl: this.baseCdnUrl,
           }),
         );
         this.#editFlows[flowId]?.onSuccess(() => {
@@ -68,6 +69,7 @@ export const initUserCustomAttributesMixin = createSingletonMixin(
             flowId,
             baseUrl: this.baseUrl,
             baseStaticUrl: this.baseStaticUrl,
+            baseCdnUrl: this.baseCdnUrl,
           }),
         );
         this.#deleteFlows[flowId]?.onSuccess(() => {