Skip to content

Jdk21auth s8 #20654

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

Open
wants to merge 9 commits into
base: epic/jdk21auth
Choose a base branch
from
Open

Jdk21auth s8 #20654

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
85f7b1d
Update latest configurations for environment
KeerthiSap Aug 11, 2025
dcd4612
CXSPA-10739: redirecting fix and automobile ext
rjsinghraj Aug 11, 2025
1c03cf4
Epic/jdk21auth (#20602)
KeerthiSap Aug 12, 2025
23e0aee
Revert "CXSPA-10739: redirecting fix and automobile ext"
rjsinghraj Aug 12, 2025
1b96431
CXSPA-10739: redirecting fix revert and automobile ext
rjsinghraj Aug 12, 2025
831b2dd
Update cdc-feature.module.ts
rjsinghraj Aug 12, 2025
dc7a82c
CXIEP-8670: disbaled showRealTimeStockInPDP
rjsinghraj Aug 13, 2025
f674870
Merge branch 'epic/jdk21auth' into jdk21auth-s8
anjana-bl Aug 14, 2025
d1f2000
Adding log for checking CXSPA-10782
anjana-bl Aug 18, 2025
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
61 changes: 39 additions & 22 deletions .env-cmdrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,77 @@
{
"dev": {
"CX_BASE_URL": "https://40.76.109.9:9002"
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud"
},
"s1": {
"CX_BASE_URL": "https://api.c432wmya2v-teamspart3-s1-public.model-t.myhybris.cloud"
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud"
},
"local": {
"CX_BASE_URL": "https://localhost:9002"
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud"
},
"local-http": {
"CX_BASE_URL": "http://localhost:9002"
},
"ci": {
"CX_BASE_URL": "https://20.83.184.244:9002"
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud"
},
"ccv2": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-p1-public.model-t.myhybris.cloud"
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud"
},
"cds": {
"CX_CDS": "true"
},
"lighthouse": {
"CX_BASE_URL": "https://api.spartacus.rocks"
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud"
},
"cdc": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s1-public.model-t.myhybris.cloud",
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_CDC": "true"
},
"digital-payments": {
"CX_BASE_URL": "https://backoffice.cp96avkh5f-sapcxteam1-d5-public.model-t.cc.commerce.ondemand.com",
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_DIGITAL_PAYMENTS": "true"
},
"epd-visualization": {
"CX_EPD_VISUALIZATION": "true",
"CX_BASE_URL": "https://api.cp96avkh5f-integrati1-d1-public.model-t.cc.commerce.ondemand.com"
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud"
},
"opf": {
"CX_OPF": "true",
"CX_BASE_URL": "https://api.cp96avkh5f-integrati2-s1-public.model-t.cc.commerce.ondemand.com"
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud"
},
"cpq": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s1-public.model-t.myhybris.cloud/",
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_B2B": "true",
"CX_CPQ": "true"
},
"segment-refs": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-p7-public.model-t.myhybris.cloud",
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_SEGMENT_REFS": "true"
},
"b2c": {
"CX_B2B": "false",
"CX_CDS": "false"
},
"CX_CDS": "false",
"CX_DIGITAL_PAYMENTS": "true",
"CX_MY_ACCOUNT_V2": "true",
"CX_CDC": "true",
"CX_PDF_INVOICES": "true",
"CX_OPPS": "true",
"CX_CDP": "true",
"CX_ESTIMATED_DELIVERY_DATE": "true",
"CX_OMF": "true"
},
"b2b": {
"CX_B2B": "true"
},
"CX_B2B": "true",
"CX_S4OM": "true",
"CX_REQUESTED_DELIVERY_DATE": "true",
"CX_MY_ACCOUNT_V2": "false",
"CX_CDC": "true",
"CX_PDF_INVOICES": "true",
"CX_OPPS": "true",
"CX_CDP": "true",
"CX_ESTIMATED_DELIVERY_DATE": "true",
"CX_S4_SERVICE": "true"
},
"s4om": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_B2B": "true",
Expand All @@ -63,34 +80,34 @@
"CX_PDF_INVOICES": "true"
},
"omf": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s9-public.model-t.myhybris.cloud",
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_OMF": "true"
},
"requested-delivery-date": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_REQUESTED_DELIVERY_DATE": "true"
},
"estimated-delivery-date": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s5-public.model-t.myhybris.cloud",
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_ESTIMATED_DELIVERY_DATE": "true"
},
"pdf-invoices": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s5-public.model-t.myhybris.cloud",
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_PDF_INVOICES": "true"
},
"my-account-v2": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s5-public.model-t.myhybris.cloud",
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_PDF_INVOICES": "true",
"CX_MY_ACCOUNT_V2": "true"
},
"cdp": {
"CX_CDP": "true",
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s5-public.model-t.myhybris.cloud",
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_PDF_INVOICES": "true",
"CX_MY_ACCOUNT_V2": "true"
},
"opps": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s5-public.model-t.myhybris.cloud",
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_OPPS": "true"
},
"s4-service": {
Expand Down
2 changes: 1 addition & 1 deletion feature-libs/checkout/base/root/config/default-checkout-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ export const defaultCheckoutConfig: CheckoutConfig = {
],
express: false,
defaultDeliveryMode: [DeliveryModePreferences.FREE],
guest: false,
guest: true,
},
};
4 changes: 3 additions & 1 deletion projects/core/src/auth/user-auth/services/auth-config.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ export class AuthConfigService {
* Utility to make access to authentication config easier.
*/
private get config(): AuthConfig['authentication'] {
return this.authConfig?.authentication ?? {};
let x = this.authConfig?.authentication ?? {};
console.log(x); //temporarily adding log for checking CXSPA-10782
return x;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion projects/core/src/features-config/feature-toggles/config/feature-toggles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
a11yPdpGridArrangement: true,
a11yHamburgerMenuTrapFocus: true,
useExtendedMediaComponentConfiguration: true,
showRealTimeStockInPDP: true,
showRealTimeStockInPDP: false,
a11yScrollToTopPositioning: true,
a11yWideScreenImprovements: false,
a11yOptimizedMenuSpacing: false,
Expand Down
12 changes: 11 additions & 1 deletion projects/storefrontapp/src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ import {
translationsJa,
translationsZh,
} from '@spartacus/assets';
import {
import {
CmsConfig,
I18nConfig,
OccConfig,
RoutingConfig,
Expand Down Expand Up @@ -107,6 +108,15 @@ if (!environment.production) {
// without a key, for development or demo purposes.
googleMaps: { apiKey: GOOGLE_MAPS_DEVELOPMENT_KEY_CONFIG },
}),
provideConfig(<CmsConfig>{
cmsComponents: {
ProductAddToCartComponent: {
data: {
inventoryDisplay: true,
},
},
},
}),
],
bootstrap: [StorefrontComponent],
})
Expand Down
14 changes: 12 additions & 2 deletions projects/storefrontapp/src/app/spartacus/features/cdc/cdc-feature.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,22 @@ import {
cdc: [
{
baseSite: 'electronics-spa',
javascriptUrl: 'JS_SDK_URL_PLACEHOLDER',
javascriptUrl: 'https://cdns.eu1.gigya.com/JS/gigya.js?apikey=3_k_wG-sllOhu2rjDEWHjG9-ncnnGAMHfkIcUKzl94weJU1Y18hITRgnTDp1LP8QdC',
sessionExpiration: 3600,
},
{
baseSite: 'apparel-uk-spa',
javascriptUrl: 'https://cdns.eu1.gigya.com/JS/gigya.js?apikey=3_k_wG-sllOhu2rjDEWHjG9-ncnnGAMHfkIcUKzl94weJU1Y18hITRgnTDp1LP8QdC',
sessionExpiration: 3600,
},
{
baseSite: 'automobile-spa',
javascriptUrl: 'https://cdns.eu1.gigya.com/JS/gigya.js?apikey=3_k_wG-sllOhu2rjDEWHjG9-ncnnGAMHfkIcUKzl94weJU1Y18hITRgnTDp1LP8QdC',
sessionExpiration: 3600,
},
{
baseSite: 'powertools-spa',
javascriptUrl: 'JS_SDK_URL_PLACEHOLDER',
javascriptUrl: 'https://cdns.eu1.gigya.com/JS/gigya.js?apikey=3__pAj9UsaNXJAaDi-d8xvhzNBvGXDYx0GlTg1R9YQWVgTIQbdBZzR98_y-nFZWUNl',
sessionExpiration: 3600,
},
],
Expand Down
2 changes: 2 additions & 0 deletions projects/storefrontapp/src/app/spartacus/spartacus-b2c-configuration.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ const defaultBaseSite = [
'apparel-uk',
'apparel-uk-spa',
'apparel-uk-standalone',
'automobile-spa',
'automobile'
];
const baseSite = environment.epdVisualization
? ['electronics-epdvisualization-spa'].concat(defaultBaseSite)
Expand Down
2 changes: 1 addition & 1 deletion projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ if (environment.cpq) {
a11yPdpGridArrangement: true,
a11yHamburgerMenuTrapFocus: true,
useExtendedMediaComponentConfiguration: true,
showRealTimeStockInPDP: true,
showRealTimeStockInPDP: false,
a11yScrollToTopPositioning: true,
a11yWideScreenImprovements: true,
a11yWrapReviewOrderInSection: true,
Expand Down
Loading