@schibsted/account-sdk-browser 5.1.1 → 5.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schibsted/account-sdk-browser",
-  "version": "5.1.1",
+  "version": "5.2.1",
   "description": "Schibsted account SDK for browsers",
   "main": "index.js",
   "type": "module",

package/src/RESTClient.js

@@ -76,7 +76,9 @@ export class RESTClient {
     constructor({ serverUrl = 'PRE', envDic, fetch = globalFetch(), log, defaultParams = {}}) {
         assert(isObject(defaultParams), `defaultParams should be a non-null object`);
 
-        this.url = new URL(urlMapper(serverUrl, envDic));
+        const mappedUrl = urlMapper(serverUrl, envDic);
+        const handledServerUrl = mappedUrl.endsWith('/') ? mappedUrl : `${mappedUrl}/`;
+        this.url = new URL(handledServerUrl);
 
         this.defaultParams = defaultParams;
 
@@ -157,7 +159,9 @@ export class RESTClient {
      * @return {string} - the resulting url string ready to pass to fetch
      */
     makeUrl(pathname = '', query = {}, useDefaultParams = true) {
-        const url = new URL(pathname, this.url);
+        const handledPathname = pathname.startsWith('/') ? pathname.slice(1) : pathname;
+
+        const url = new URL(handledPathname, this.url);
         url.search = RESTClient.search(query, useDefaultParams, this.defaultParams);
         return url.href;
     }

package/src/identity.d.ts

@@ -304,9 +304,10 @@ export class Identity extends TinyEmitter {
      * @param {string} [options.locale]
      * @param {boolean} [options.oneStepLogin=false]
      * @param {string} [options.prompt=select_account]
+     * @param {string} [options.xDomainId]
      * @return {Window|null} - Reference to popup window if created (or `null` otherwise)
      */
-    login({ state, acrValues, scope, redirectUri, preferPopup, loginHint, tag, teaser, maxAge, locale, oneStepLogin, prompt }: LoginOptions): Window | null;
+    login({ state, acrValues, scope, redirectUri, preferPopup, loginHint, tag, teaser, maxAge, locale, oneStepLogin, prompt, xDomainId }: LoginOptions): Window | null;
     /**
      * @async
      * @summary Retrieve the sp_id (Varnish ID)
@@ -439,6 +440,11 @@ export type LoginOptions = {
      * End-User for reauthentication or confirm account screen. Supported values: `select_account` or `login`
      */
     prompt?: string;
+    /**
+     * - Identifier for cross-domain tracking in Pulse
+     */
+    xDomainId?: string;
+
 };
 export type SimplifiedLoginWidgetLoginOptions = {
     /**
@@ -508,6 +514,10 @@ export type SimplifiedLoginWidgetLoginOptions = {
      * End-User for reauthentication or confirm account screen. Supported values: `select_account` or `login`
      */
     prompt?: string;
+    /**
+     * - Identifier for cross-domain tracking in Pulse
+     */
+    xDomainId?: string;
 };
 export type HasSessionSuccessResponse = {
     /**

package/src/identity.js

@@ -204,6 +204,8 @@ export class Identity extends EventEmitter {
         this._session = {};
 
         this._setSessionServiceUrl(sessionDomain);
+        this._usedSessionServiceGetSessionEndpoint = this._sessionService.url.pathname && this._sessionService.url.pathname.length <= 1 ? 'session' : 'v2/session';
+
         this._setSpidServerUrl(env);
         this._setBffServerUrl(env);
         this._setOauthServerUrl(env);
@@ -589,7 +591,7 @@ export class Identity extends EventEmitter {
             }
             let sessionData = null;
             try {
-                sessionData = await this._sessionService.get('v2/session', {tabId: this._getTabId()});
+                sessionData = await this._sessionService.get(this._usedSessionServiceGetSessionEndpoint, {tabId: this._getTabId()});
             } catch (err) {
                 if (err && err.code === 400 && this._enableSessionCaching) {
                     const expiresIn = 1000 * (err.expiresIn || 300);
@@ -852,6 +854,7 @@ export class Identity extends EventEmitter {
      * @param {string} [options.locale]
      * @param {boolean} [options.oneStepLogin=false]
      * @param {string} [options.prompt=select_account]
+     * @param {string} [options.xDomainId]
      * @return {Window|null} - Reference to popup window if created (or `null` otherwise)
      */
     login({
@@ -866,7 +869,8 @@ export class Identity extends EventEmitter {
         maxAge = '',
         locale = '',
         oneStepLogin = false,
-        prompt = 'select_account'
+        prompt = 'select_account',
+        xDomainId = ''
     }) {
         this._closePopup();
         this.sessionStorageCache.delete(HAS_SESSION_CACHE_KEY);
@@ -881,7 +885,8 @@ export class Identity extends EventEmitter {
             maxAge,
             locale,
             oneStepLogin,
-            prompt
+            prompt,
+            xDomainId
         });
 
         if (preferPopup) {
@@ -952,6 +957,7 @@ export class Identity extends EventEmitter {
         locale = '',
         oneStepLogin = false,
         prompt = 'select_account',
+        xDomainId = ''
     }) {
         if (typeof arguments[0] !== 'object') {
             // backward compatibility
@@ -984,7 +990,8 @@ export class Identity extends EventEmitter {
             max_age: maxAge,
             locale,
             one_step_login: oneStepLogin || '',
-            prompt: acrValues ? '' : prompt
+            prompt: acrValues ? '' : prompt,
+            x_domain_id: xDomainId
         });
     }
 

package/src/version.js

@@ -1,5 +1,5 @@
 // Automatically generated in 'npm version' by scripts/genversion.js
 
 'use strict'
-const version = '5.1.1';
+const version = '5.2.1';
 export default version;