Skip to content

Commit

Permalink
Merge branch 'main' into feat/cookieSameSite
Browse files Browse the repository at this point in the history
  • Loading branch information
omercnet authored Feb 11, 2025
2 parents 56da19a + 3868d1b commit d901544
Show file tree
Hide file tree
Showing 83 changed files with 1,831 additions and 1,065 deletions.
2 changes: 2 additions & 0 deletions packages/libs/escape-markdown/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

## [0.1.5](https://github.com/descope/descope-js/compare/escape-markdown-0.1.4...escape-markdown-0.1.5) (2025-02-11)

## [0.1.4](https://github.com/descope/descope-js/compare/escape-markdown-0.1.3...escape-markdown-0.1.4) (2025-02-01)

## [0.1.3](https://github.com/descope/descope-js/compare/escape-markdown-0.1.2...escape-markdown-0.1.3) (2025-02-01)
Expand Down
2 changes: 1 addition & 1 deletion packages/libs/escape-markdown/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@descope/escape-markdown",
"version": "0.1.4",
"version": "0.1.5",
"author": "Descope Team <[email protected]>",
"homepage": "https://github.com/descope/descope-js",
"bugs": {
Expand Down
5 changes: 5 additions & 0 deletions packages/libs/sdk-component-drivers/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

## [0.2.50](https://github.com/descope/descope-js/compare/sdk-component-drivers-0.2.49...sdk-component-drivers-0.2.50) (2025-02-11)

### Dependency Updates

* `sdk-helpers` updated to version `0.1.67`
## [0.2.49](https://github.com/descope/descope-js/compare/sdk-component-drivers-0.2.48...sdk-component-drivers-0.2.49) (2025-02-02)

### Dependency Updates
Expand Down
2 changes: 1 addition & 1 deletion packages/libs/sdk-component-drivers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@descope/sdk-component-drivers",
"version": "0.2.49",
"version": "0.2.50",
"author": "Descope Team <[email protected]>",
"homepage": "https://github.com/descope/sdk-component-drivers",
"bugs": {
Expand Down
2 changes: 2 additions & 0 deletions packages/libs/sdk-helpers/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

## [0.1.67](https://github.com/descope/descope-js/compare/sdk-helpers-0.1.66...sdk-helpers-0.1.67) (2025-02-11)

## [0.1.66](https://github.com/descope/descope-js/compare/sdk-helpers-0.1.65...sdk-helpers-0.1.66) (2025-02-02)

## [0.1.65](https://github.com/descope/descope-js/compare/sdk-helpers-0.1.64...sdk-helpers-0.1.65) (2025-02-02)
Expand Down
2 changes: 1 addition & 1 deletion packages/libs/sdk-helpers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@descope/sdk-helpers",
"version": "0.1.66",
"version": "0.1.67",
"author": "Descope Team <[email protected]>",
"homepage": "https://github.com/descope/sdk-helpers",
"bugs": {
Expand Down
17 changes: 17 additions & 0 deletions packages/libs/sdk-mixins/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

## [0.7.0](https://github.com/descope/descope-js/compare/sdk-mixins-0.6.7...sdk-mixins-0.7.0) (2025-02-11)

### Dependency Updates

* `sdk-helpers` updated to version `0.1.67`
* `sdk-component-drivers` updated to version `0.2.50`

### Features

* **web-component:** add base-cdn-url attribute ([#1013](https://github.com/descope/descope-js/issues/1013)) ([8346412](https://github.com/descope/descope-js/commit/834641285494f842978b4111dae1db4e643cb494))


### Bug Fixes

* add baseCdnUrl attribute in all packages ([#1014](https://github.com/descope/descope-js/issues/1014)) ([c78190a](https://github.com/descope/descope-js/commit/c78190ac4992a158ebbac79e55da1dab2d4c11a0))
* duplicate config.json call ([#942](https://github.com/descope/descope-js/issues/942)) ([9ced429](https://github.com/descope/descope-js/commit/9ced429c7bd9872790b1012a73e9b14a593f724b))

## [0.6.7](https://github.com/descope/descope-js/compare/sdk-mixins-0.6.6...sdk-mixins-0.6.7) (2025-02-02)

### Dependency Updates
Expand Down
4 changes: 2 additions & 2 deletions packages/libs/sdk-mixins/jest.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ module.exports = {
global: {
branches: 12,
functions: 16,
lines: 36,
statements: 36,
lines: 35,
statements: 35,
},
},
// A set of global variables that need to be available in all test environments
Expand Down
2 changes: 1 addition & 1 deletion packages/libs/sdk-mixins/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@descope/sdk-mixins",
"version": "0.6.7",
"version": "0.7.0",
"author": "Descope Team <[email protected]>",
"homepage": "https://github.com/descope/sdk-mixins",
"bugs": {
Expand Down
1 change: 0 additions & 1 deletion packages/libs/sdk-mixins/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ export * from './mixins/initElementMixin';
export * from './mixins/initLifecycleMixin';
export * from './mixins/projectIdMixin';
export * from './mixins/baseUrlMixin';
export * from './mixins/baseStaticUrlMixin';
11 changes: 0 additions & 11 deletions packages/libs/sdk-mixins/src/mixins/baseStaticUrlMixin.ts

This file was deleted.

19 changes: 19 additions & 0 deletions packages/sdks/angular-sdk/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,25 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

## [0.7.26](https://github.com/descope/descope-js/compare/angular-sdk-0.7.25...angular-sdk-0.7.26) (2025-02-11)

### Dependency Updates

* `access-key-management-widget` updated to version `0.3.17`
* `audit-management-widget` updated to version `0.2.21`
* `role-management-widget` updated to version `0.2.21`
* `user-management-widget` updated to version `0.6.16`
* `user-profile-widget` updated to version `0.2.17`
* `applications-portal-widget` updated to version `0.2.20`
* `web-component` updated to version `3.33.0`
* `web-js-sdk` updated to version `1.23.9`
* `core-js-sdk` updated to version `2.33.6`

### Bug Fixes

* add baseCdnUrl attribute in all packages ([#1014](https://github.com/descope/descope-js/issues/1014)) ([c78190a](https://github.com/descope/descope-js/commit/c78190ac4992a158ebbac79e55da1dab2d4c11a0))
* duplicate config.json call ([#942](https://github.com/descope/descope-js/issues/942)) ([9ced429](https://github.com/descope/descope-js/commit/9ced429c7bd9872790b1012a73e9b14a593f724b))

## [0.7.25](https://github.com/descope/descope-js/compare/angular-sdk-0.7.24...angular-sdk-0.7.25) (2025-02-02)

### Dependency Updates
Expand Down
2 changes: 1 addition & 1 deletion packages/sdks/angular-sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@descope/angular-sdk",
"version": "0.7.25",
"version": "0.7.26",
"peerDependencies": {
"@angular/common": ">=16.0.0",
"@angular/core": ">=16.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export class AccessKeyManagementComponent implements OnInit, OnChanges {
projectId: string;
baseUrl?: string;
baseStaticUrl?: string;
baseCdnUrl?: string;
@Input() tenant: string;
@Input() widgetId: string;

Expand All @@ -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() {
Expand All @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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() {
Expand All @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export class AuditManagementComponent implements OnInit, OnChanges {
projectId: string;
baseUrl?: string;
baseStaticUrl?: string;
baseCdnUrl?: string;
@Input() tenant: string;
@Input() widgetId: string;

Expand All @@ -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() {
Expand All @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export class DescopeComponent implements OnInit, OnChanges {
projectId: string;
baseUrl?: string;
baseStaticUrl?: string;
baseCdnUrl?: string;
storeLastAuthenticatedUser?: boolean;
@Input() flowId: string;

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export class RoleManagementComponent implements OnInit, OnChanges {
projectId: string;
baseUrl?: string;
baseStaticUrl?: string;
baseCdnUrl?: string;
@Input() tenant: string;
@Input() widgetId: string;

Expand All @@ -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() {
Expand All @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export class UserManagementComponent implements OnInit, OnChanges {
projectId: string;
baseUrl?: string;
baseStaticUrl?: string;
baseCdnUrl?: string;
@Input() tenant: string;
@Input() widgetId: string;

Expand All @@ -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() {
Expand All @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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() {
Expand All @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 | { SameSite: 'Strict' | 'Lax' | 'None' };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export function initializeApp(authService: DescopeAuthService) {
projectId: environment.descopeProjectId,
baseUrl: environment.descopeBaseUrl || '',
baseStaticUrl: environment.descopeBaseStaticUrl || '',
baseCdnUrl: environment.descopeBaseCdnUrl || '',
sessionTokenViaCookie: true
})
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ export interface Env {
descopeProjectId: string;
descopeBaseUrl?: string;
descopeBaseStaticUrl?: string;
descopeBaseCdnUrl?: string;
descopeFlowId?: string;
descopeDebugMode?: false;
descopeTheme?: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export const environment: Env = {
descopeProjectId: '',
descopeBaseUrl: '',
descopeBaseStaticUrl: '',
descopeBaseCdnUrl: '',
descopeFlowId: '',
descopeDebugMode: false,
descopeTheme: '',
Expand Down
7 changes: 7 additions & 0 deletions packages/sdks/core-js-sdk/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

## [2.33.6](https://github.com/descope/descope-js/compare/core-js-sdk-2.33.5...core-js-sdk-2.33.6) (2025-02-11)


### Bug Fixes

* add baseCdnUrl attribute in all packages ([#1014](https://github.com/descope/descope-js/issues/1014)) ([c78190a](https://github.com/descope/descope-js/commit/c78190ac4992a158ebbac79e55da1dab2d4c11a0))

## [2.33.5](https://github.com/descope/descope-js/compare/core-js-sdk-2.33.4...core-js-sdk-2.33.5) (2025-02-02)

## [2.33.4](https://github.com/descope/descope-js/compare/core-js-sdk-2.33.3...core-js-sdk-2.33.4) (2025-02-02)
Expand Down
4 changes: 2 additions & 2 deletions packages/sdks/core-js-sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@descope/core-js-sdk",
"version": "2.33.5",
"version": "2.33.6",
"author": "Descope Team <[email protected]>",
"homepage": "https://github.com/descope/descope-js",
"bugs": {
Expand Down Expand Up @@ -49,7 +49,7 @@
"@types/jest": "^29.0.0",
"@types/node": "20.17.13",
"@typescript-eslint/parser": "^7.0.0",
"esbuild": "^0.24.0",
"esbuild": "^0.25.0",
"eslint": "8.57.1",
"eslint-config-airbnb-typescript": "18.0.0",
"eslint-config-prettier": "9.1.0",
Expand Down
Loading

0 comments on commit d901544

Please sign in to comment.