@schibsted/account-sdk-browser 4.8.6-beta → 4.8.7-beta

package/identity.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/index.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/monetization.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schibsted/account-sdk-browser",
-  "version": "4.8.6-beta",
+  "version": "4.8.7-beta",
   "description": "Schibsted account SDK for browsers",
   "main": "index.js",
   "type": "module",
@@ -9,12 +9,10 @@
     "clean": "rimraf .cache coverage dist docs",
     "docs": "rimraf docs && jsdoc -c ./jsdoc.conf.json --verbose",
     "lint": "eslint .",
-    "pretest": "npm run lint",
+    "lint:fix": "eslint . --fix",
     "test": "jest",
-    "precover": "npm run lint",
     "cover": "jest --coverage",
-    "postcover": "codecov",
-    "preversion": "npm test",
+    "preversion": "npm run lint && npm test",
     "version": "node ./scripts/genversion.js && git add src/version.js",
     "postversion": "git push && git push --tags"
   },
@@ -27,7 +25,6 @@
     "@babel/core": "^7.11.4",
     "@babel/preset-env": "^7.23.2",
     "babel-loader": "^8.1.0",
-    "codecov": "^3.6.5",
     "core-js": "^3.6.5",
     "docdash": "git+https://github.com/torarvid/docdash.git#v0.5.0",
     "eslint": "^6.8.0",

package/payment.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/src/RESTClient.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/src/SDKError.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/src/cache.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/src/config.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/src/es5/global.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/src/es5/identity.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/src/es5/index.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/src/es5/monetization.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/src/es5/payment.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/src/identity.d.ts

@@ -13,15 +13,17 @@ export class Identity extends TinyEmitter {
      * @param {function} [options.log] - A function that receives debug log information. If not set,
      * no logging will be done
      * @param {object} [options.window] - window object
+     * @param {function} [options.callbackBeforeRedirect] - callback triggered before session refresh redirect happen
      * @throws {SDKError} - If any of options are invalid
      */
-    constructor({ clientId, redirectUri, sessionDomain, env, log, window }: {
+    constructor({ clientId, redirectUri, sessionDomain, env, log, window, callbackBeforeRedirect }: {
         clientId: string;
         sessionDomain: string;
         redirectUri: string;
         env?: string;
         log?: Function;
         window?: any;
+        callbackBeforeRedirect?: Function;
     });
     _sessionInitiatedSent: boolean;
     window: any;
@@ -30,6 +32,7 @@ export class Identity extends TinyEmitter {
     redirectUri: string;
     env: string;
     log: Function;
+    callbackBeforeRedirect: Function;
     _sessionDomain: string;
     _enableSessionCaching: boolean;
     _session: {};
@@ -236,6 +239,8 @@ export class Identity extends TinyEmitter {
      *
      * @description This function calls {@link Identity#hasSession} internally and thus has the side
      * effect that it might perform an auto-login on the user
+     * @param {string} externalParty
+     * @param {string|null} optionalSuffix
      * @throws {SDKError} If the `pairId` is missing in user session.
      * @throws {SDKError} If the `externalParty` is not defined
      * @return {Promise<string>} The merchant- and 3rd-party-specific `externalId`

package/src/identity.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 
@@ -160,9 +160,18 @@ export class Identity extends EventEmitter {
      * @param {function} [options.log] - A function that receives debug log information. If not set,
      * no logging will be done
      * @param {object} [options.window] - window object
+     * @param {function} [options.callbackBeforeRedirect] - callback triggered before session refresh redirect happen
      * @throws {SDKError} - If any of options are invalid
      */
-    constructor({ clientId, redirectUri, sessionDomain, env = 'PRE', log, window = globalWindow() }) {
+    constructor({
+        clientId,
+        redirectUri,
+        sessionDomain,
+        env = 'PRE',
+        log,
+        window = globalWindow(),
+        callbackBeforeRedirect = ()=>{}
+    }) {
         super();
         assert(isNonEmptyString(clientId), 'clientId parameter is required');
         assert(isObject(window), 'The reference to window is missing');
@@ -177,6 +186,7 @@ export class Identity extends EventEmitter {
         this.redirectUri = redirectUri;
         this.env = env;
         this.log = log;
+        this.callbackBeforeRedirect = callbackBeforeRedirect;
         this._sessionDomain = sessionDomain;
 
         // Internal hack: set to false to always refresh from hassession
@@ -365,7 +375,8 @@ export class Identity extends EventEmitter {
             expiresIn = options;
         }
         else if (typeof options == 'object') {
-            ({ expiresIn = expiresIn, domain = domain } = options);
+            expiresIn = options.expiresIn || expiresIn;
+            domain = options.domain || domain;
         }
 
         assert(Number.isInteger(expiresIn), `'expiresIn' must be an integer`);
@@ -428,10 +439,12 @@ export class Identity extends EventEmitter {
      * @returns {void}
      */
     _clearVarnishCookie() {
+        const baseDomain =  this._session && typeof this._session.baseDomain === 'string'
+            ? this._session.baseDomain
+            : document.domain;
+
         let domain = this.varnishCookieDomain ||
-            ((this._session && typeof this._session.baseDomain === 'string')
-                ? this._session.baseDomain
-                : document.domain) ||
+            baseDomain ||
             '';
 
         document.cookie = `SP_ID=nothing; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=.${domain}`;
@@ -480,6 +493,7 @@ export class Identity extends EventEmitter {
         if (this._hasSessionInProgress) {
             return this._hasSessionInProgress;
         }
+
         const _postProcess = (sessionData) => {
             if (sessionData.error) {
                 throw new SDKError('HasSession failed', sessionData.error);
@@ -489,18 +503,14 @@ export class Identity extends EventEmitter {
             this._session = sessionData;
             return sessionData;
         };
+
         const _checkRedirectionNeed = (sessionData={})=>{
             const sessionDataKeys = Object.keys(sessionData);
 
-            const isRedirectNeeded = sessionDataKeys.length === 1 &&
+            return sessionDataKeys.length === 1 &&
                 sessionDataKeys[0] === 'redirectURL';
-
-            if(isRedirectNeeded && !isUrl(sessionData.redirectURL)){
-                throw new SDKError('Session refresh url is not valid');
-            }
-
-            return isRedirectNeeded;
         }
+
         const _getSession = async () => {
             if (this._enableSessionCaching) {
                 // Try to resolve from cache (it has a TTL)
@@ -511,7 +521,7 @@ export class Identity extends EventEmitter {
             }
             let sessionData = null;
             try {
-                sessionData = await this._sessionService.get('/session');
+                sessionData = await this._sessionService.get('/v2/session');
             } catch (err) {
                 if (err && err.code === 400 && this._enableSessionCaching) {
                     const expiresIn = 1000 * (err.expiresIn || 300);
@@ -523,7 +533,10 @@ export class Identity extends EventEmitter {
             if(sessionData){
                 // for expiring session and safari browser do full page redirect to gain new session
                 if(_checkRedirectionNeed(sessionData)){
-                    window.location.replace(sessionData.redirectURL);
+                    await this.callbackBeforeRedirect();
+
+                    this.window.location.href = this._sessionService.makeUrl(sessionData.redirectURL, {redirect_uri: this.window.location.origin});
+
                     return;
                 }
 

package/src/monetization.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/src/object.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 
@@ -28,21 +28,21 @@ import SDKError from './SDKError.js';
  *         keys for undefined values are removed.
  */
 export function cloneDefined(...sources) {
-    const dest = {};
+    const result = {};
     if (!(sources && sources.length)) {
         throw new SDKError('No objects to clone');
     }
-    sources.forEach(src => {
-        assert(isObject(src));
-        if (isNonEmptyObj(src)) {
-            Object.entries(src).forEach(([key, val]) => {
-                if (val !== undefined ) { // eslint-disable-line no-undefined
-                    dest[key] = isObject(val) ? cloneDeep(val) : val;
+    sources.forEach(source => {
+        assert(isObject(source));
+        if (isNonEmptyObj(source)) {
+            Object.entries(source).forEach(([key, value]) => {
+                if (typeof value !== 'undefined' ) {
+                    result[key] = isObject(value) ? cloneDeep(value) : value;
                 }
             });
         }
     });
-    return dest;
+    return result;
 }
 
 /**

package/src/payment.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/src/popup.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/src/spidTalk.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/src/url.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/src/validate.js

@@ -1,4 +1,4 @@
-/* Copyright 2018 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
+/* Copyright 2024 Schibsted Products & Technology AS. Licensed under the terms of the MIT license.
  * See LICENSE.md in the project root.
  */
 

package/src/version.js

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