Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(descope-ui-mixin): use descopecdn.com #804

Merged
merged 9 commits into from
Nov 6, 2024
Merged

feat(descope-ui-mixin): use descopecdn.com #804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a2b548a
feat(descope-ui-mixin): use dscpcdn.net
omercnet Sep 23, 2024
4a41cb7
rename domain
omercnet Sep 26, 2024
69993ca
Merge remote-tracking branch 'origin/main' into feat/dscpcdn
omercnet Oct 22, 2024
fa718b2
jsdelivr
omercnet Oct 22, 2024
5091782
jsdelivr
omercnet Oct 22, 2024
d9446ee
Update constants.ts
omercnet Oct 27, 2024
15c8ab2
optimize
omercnet Oct 28, 2024
e5b61c6
Merge branch 'main' into feat/dscpcdn
omercnet Nov 5, 2024
72b3871
small improvement
nirgur Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion packages/libs/sdk-mixins/src/mixins/descopeUiMixin/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,20 @@ import { IS_LOCAL_STORAGE } from '../../constants';

export const DESCOPE_UI_SCRIPT_ID = 'load-descope-ui';
export const DESCOPE_UI_FALLBACK_SCRIPT_ID = 'load-descope-ui-fallback-script';
export const DESCOPE_UI_FALLBACK_2_SCRIPT_ID =
'load-descope-ui-fallback-script-2';

export const UI_COMPONENTS_URL_KEY = 'base.ui.components.url';

export const UI_COMPONENTS_URL =
(IS_LOCAL_STORAGE && localStorage.getItem(UI_COMPONENTS_URL_KEY)) ||
'https://static.descope.com/npm/@descope/web-components-ui@<version>/dist/umd/index.js';
'https://descopecdn.com/npm/@descope/web-components-ui@<version>/dist/umd/index.js';

export const UI_COMPONENTS_FALLBACK_URL =
(IS_LOCAL_STORAGE && localStorage.getItem(UI_COMPONENTS_URL_KEY)) ||
'https://static.descope.com/npm/@descope/web-components-ui@<version>/dist/umd/index.js';

export const UI_COMPONENTS_FALLBACK_2_URL =
(IS_LOCAL_STORAGE && localStorage.getItem(UI_COMPONENTS_URL_KEY)) ||
'https://cdn.jsdelivr.net/npm/@descope/web-components-ui@<version>/dist/umd/index.js';
omercnet marked this conversation as resolved.
Show resolved Hide resolved

Expand Down
27 changes: 23 additions & 4 deletions packages/libs/sdk-mixins/src/mixins/descopeUiMixin/descopeUiMixin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ import { compose, createSingletonMixin } from '@descope/sdk-helpers';
import { configMixin } from '../configMixin';
import { loggerMixin } from '../loggerMixin';
import {
DESCOPE_UI_FALLBACK_2_SCRIPT_ID,
DESCOPE_UI_FALLBACK_SCRIPT_ID,
DESCOPE_UI_SCRIPT_ID,
UI_COMPONENTS_FALLBACK_2_URL,
UI_COMPONENTS_FALLBACK_URL,
UI_COMPONENTS_URL,
} from './constants';
Expand Down Expand Up @@ -64,9 +66,14 @@ export const descopeUiMixin = createSingletonMixin(
});
}

async #handleFallbackScript(errorCbs: ErrorCb[], loadCbs: LoadCb[]) {
async #handleFallbackScript(
errorCbs: ErrorCb[],
loadCbs: LoadCb[],
elemId: string,
scriptUrl: string,
) {
this.logger.debug('Trying to load DescopeUI from a fallback URL');
const fallbackScriptEle = setupScript(DESCOPE_UI_FALLBACK_SCRIPT_ID);
const fallbackScriptEle = setupScript(elemId);
document.body.append(fallbackScriptEle);

fallbackScriptEle.addEventListener('error', () => {
Expand All @@ -82,7 +89,7 @@ export const descopeUiMixin = createSingletonMixin(
});

fallbackScriptEle.src = generateScriptUrl(
UI_COMPONENTS_FALLBACK_URL,
scriptUrl,
await this.#getComponentsVersion(),
);
}
Expand All @@ -97,8 +104,20 @@ export const descopeUiMixin = createSingletonMixin(

// in case we could not load DescopeUI from the main URL, we are trying to load it from a fallback URL
this.#handleFallbackScript(
scriptEle[this.#errorCbsSym],
[
// we are adding a second fallback
this.#handleFallbackScript.bind(
this,
scriptEle[this.#errorCbsSym],
scriptEle[this.#loadCbsSym],
DESCOPE_UI_FALLBACK_2_SCRIPT_ID,
UI_COMPONENTS_FALLBACK_2_URL,
),
...scriptEle[this.#errorCbsSym],
],
scriptEle[this.#loadCbsSym],
DESCOPE_UI_FALLBACK_SCRIPT_ID,
UI_COMPONENTS_FALLBACK_URL,
);
});

Expand Down
4 changes: 2 additions & 2 deletions packages/sdks/web-component/src/lib/constants/uiComponents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ export const UI_COMPONENTS_URL_KEY = 'base.ui.components.url';

export const UI_COMPONENTS_URL =
(IS_LOCAL_STORAGE && localStorage.getItem(UI_COMPONENTS_URL_KEY)) ||
'https://static.descope.com/npm/@descope/web-components-ui@<version>/dist/umd/index.js';
omercnet marked this conversation as resolved.
Show resolved Hide resolved
'https://descopecdn.com/npm/@descope/web-components-ui@<version>/dist/umd/index.js';
omercnet marked this conversation as resolved.
Show resolved Hide resolved

export const UI_COMPONENTS_FALLBACK_URL =
(IS_LOCAL_STORAGE && localStorage.getItem(UI_COMPONENTS_URL_KEY)) ||
'https://cdn.jsdelivr.net/npm/@descope/web-components-ui@<version>/dist/umd/index.js';
'https://static.descope.com/npm/@descope/web-components-ui@<version>/dist/umd/index.js';

export const UI_COMPONENTS_URL_VERSION_PLACEHOLDER = '<version>';
2 changes: 1 addition & 1 deletion packages/widgets/access-key-management-widget/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ DESCOPE_WIDGET_ID= # default: "access-key-management-widget"

```
// replace x.x.x with the latest release of the widget: https://www.npmjs.com/package/@descope/access-key-management-widget
<script src="https://static.descope.com/npm/@descope/access-key-management-widget@x.x.x/dist/index.js"></script>
<script src="https://descopecdn.com/npm/@descope/access-key-management-widget@x.x.x/dist/index.js"></script>
<descope-access-key-management-widget
base-url="<DESCOPE_BASE_URL>"
project-id="<DESCOPE_PROJECT_ID>"
Expand Down
2 changes: 1 addition & 1 deletion packages/widgets/applications-portal-widget/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ DESCOPE_THEME= # "light" / "dark" / "os", default: "light"

```
// replace x.x.x with the latest release of the widget: https://www.npmjs.com/package/@descope/applications-portal-widget
<script src="https://static.descope.com/npm/@descope/applications-portal-widget@x.x.x/dist/index.js"></script>
<script src="https://descopecdn.com/npm/@descope/applications-portal-widget@x.x.x/dist/index.js"></script>
<descope-applications-portal-widget
base-url="<DESCOPE_BASE_URL>"
project-id="<DESCOPE_PROJECT_ID>"
Expand Down
2 changes: 1 addition & 1 deletion packages/widgets/audit-management-widget/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ DESCOPE_WIDGET_ID= # default: "audit-management-widget"

```
// replace x.x.x with the latest release of the widget: https://www.npmjs.com/package/@descope/audit-management-widget
<script src="https://static.descope.com/npm/@descope/audit-management-widget@x.x.x/dist/index.js"></script>
<script src="https://descopecdn.com/npm/@descope/audit-management-widget@x.x.x/dist/index.js"></script>
<descope-audit-management-widget
base-url="<DESCOPE_BASE_URL>"
project-id="<DESCOPE_PROJECT_ID>"
Expand Down
2 changes: 1 addition & 1 deletion packages/widgets/role-management-widget/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ DESCOPE_WIDGET_ID= # default: "role-management-widget"

```
// replace x.x.x with the latest release of the widget: https://www.npmjs.com/package/@descope/role-management-widget
<script src="https://static.descope.com/npm/@descope/role-management-widget@x.x.x/dist/index.js"></script>
<script src="https://descopecdn.com/npm/@descope/role-management-widget@x.x.x/dist/index.js"></script>
<descope-role-management-widget
base-url="<DESCOPE_BASE_URL>"
project-id="<DESCOPE_PROJECT_ID>"
Expand Down
2 changes: 1 addition & 1 deletion packages/widgets/user-management-widget/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ DESCOPE_WIDGET_ID= # default: "user-management-widget"

```
// replace x.x.x with the latest release of the widget: https://www.npmjs.com/package/@descope/user-management-widget
<script src="https://static.descope.com/npm/@descope/user-management-widget@x.x.x/dist/index.js"></script>
<script src="https://descopecdn.com/npm/@descope/user-management-widget@x.x.x/dist/index.js"></script>
<descope-user-management-widget
base-url="<DESCOPE_BASE_URL>"
project-id="<DESCOPE_PROJECT_ID>"
Expand Down
2 changes: 1 addition & 1 deletion packages/widgets/user-profile-widget/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ DESCOPE_THEME= # "light" / "dark" / "os", default: "light"

```
// replace x.x.x with the latest release of the widget: https://www.npmjs.com/package/@descope/user-profile-widget
<script src="https://static.descope.com/npm/@descope/user-profile-widget@x.x.x/dist/index.js"></script>
<script src="https://descopecdn.com/npm/@descope/user-profile-widget@x.x.x/dist/index.js"></script>
<descope-user-profile-widget
base-url="<DESCOPE_BASE_URL>"
project-id="<DESCOPE_PROJECT_ID>"
Expand Down
Loading