Merge pull request #30 from pazdera/xd-auth-issue

vikdoro · web-flow · commit 7a1eaa1df870 · 2017-03-22T13:17:50.000Z
bugfix: Make sure the initSession callback isn't called 2x
diff --git a/dist/kano-world-sdk.js b/dist/kano-world-sdk.js
@@ -134,7 +134,7 @@ module.exports = function (config) {
 
             // The current website is either KW or running inside Electron, we read directly the locaStorage
             if (isKW || isElectron) {
-                p = onToken(token || localStorage.getItem('KW_TOKEN'));
+                return onToken(token || localStorage.getItem('KW_TOKEN'));
             }
             // Otherwise, contact KW to get the toekn throught the iframe
             xdAuth.getCrossToken(function (err, tk) {
diff --git a/lib/core/auth.js b/lib/core/auth.js
@@ -72,7 +72,7 @@ module.exports = function (config) {
 
             // The current website is either KW or running inside Electron, we read directly the locaStorage
             if (isKW || isElectron) {
-                p = onToken(token || localStorage.getItem('KW_TOKEN'));
+                return onToken(token || localStorage.getItem('KW_TOKEN'));
             }
             // Otherwise, contact KW to get the toekn throught the iframe
             xdAuth.getCrossToken(function (err, tk) {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kano-world-sdk",
-  "version": "3.0.15",
+  "version": "3.0.16",
   "description": "Kano World SDK",
   "main": "lib/index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ module.exports = function (config) {`
`134`	`134`
`135`	`135`	`// The current website is either KW or running inside Electron, we read directly the locaStorage`
`136`	`136`	`if (isKW \|\| isElectron) {`
`137`		`- p = onToken(token \|\| localStorage.getItem('KW_TOKEN'));`
	`137`	`+ return onToken(token \|\| localStorage.getItem('KW_TOKEN'));`
`138`	`138`	`}`
`139`	`139`	`// Otherwise, contact KW to get the toekn throught the iframe`
`140`	`140`	`xdAuth.getCrossToken(function (err, tk) {`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ module.exports = function (config) {`
`72`	`72`
`73`	`73`	`// The current website is either KW or running inside Electron, we read directly the locaStorage`
`74`	`74`	`if (isKW \|\| isElectron) {`
`75`		`- p = onToken(token \|\| localStorage.getItem('KW_TOKEN'));`
	`75`	`+ return onToken(token \|\| localStorage.getItem('KW_TOKEN'));`
`76`	`76`	`}`
`77`	`77`	`// Otherwise, contact KW to get the toekn throught the iframe`
`78`	`78`	`xdAuth.getCrossToken(function (err, tk) {`