From a791e9f475b72c8df777599ba67de54f0798657e Mon Sep 17 00:00:00 2001
From: Malo Skrylevo <majioa@yandex.ru>
Date: Thu, 21 Dec 2017 00:15:35 +0300
Subject: [PATCH] Added decode from a non-url-compatible strings returned from
 OAuth authentication procedure.

Added condition to allow skipping code presence validation on success
result.
---
 README.md           | 10 ++++++++--
 dist/GitHubLogin.js |  2 +-
 src/GitHubLogin.js  |  3 ++-
 src/PopupWindow.js  |  2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 8beb317..894acda 100644
--- a/README.md
+++ b/README.md
@@ -55,6 +55,12 @@ CSS class for the login button.
 
 Text content for the login button.
 
+#### `requireCode`
+
+`{boolean}`
+
+Allow skiping 'code' key presence validation on success result, to skip pass 'false' value.
+
 #### `onRequest`
 
 `{function}`
@@ -63,13 +69,13 @@ Callback for every request.
 
 #### `onSuccess`
 
-`{function}`
+`{function}` _required_
 
 Callback for successful login. An object will be passed as an argument to the callback, e.g. `{ "code": "..." }`.
 
 #### `onFailure`
 
-`{function}`
+`{function}` _required_
 
 Callback for errors raised during login.
 
diff --git a/dist/GitHubLogin.js b/dist/GitHubLogin.js
index 13bdaac..6a995ee 100644
--- a/dist/GitHubLogin.js
+++ b/dist/GitHubLogin.js
@@ -1,2 +1,2 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("react")):"function"==typeof define&&define.amd?define(["react"],t):"object"==typeof exports?exports.GitHubLogin=t(require("react")):e.GitHubLogin=t(e.react)}(this,function(e){return function(e){function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var n={};return t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=1)}([function(e,t,n){"use strict";function r(e){return e.replace(/^\??\//,"").split("&").reduce(function(e,t){var n=t.split("="),r=i(n,2),o=r[0],u=r[1];return e[o]=u,e},{})}function o(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"&",n=Object.keys(e);return n.reduce(function(r,o,i){var u=""+r+o+"="+e[o];return i<n.length-1&&(u+=t),u},"")}Object.defineProperty(t,"__esModule",{value:!0});var i=function(){function e(e,t){var n=[],r=!0,o=!1,i=void 0;try{for(var u,c=e[Symbol.iterator]();!(r=(u=c.next()).done)&&(n.push(u.value),!t||n.length!==t);r=!0);}catch(e){o=!0,i=e}finally{try{!r&&c.return&&c.return()}finally{if(o)throw i}}return n}return function(t,n){if(Array.isArray(t))return t;if(Symbol.iterator in Object(t))return e(t,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}();t.toParams=r,t.toQuery=o},function(e,t,n){e.exports=n(2)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(3),o=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=o.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function u(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var c=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(4),s=r(a),l=n(5),f=r(l),p=n(10),d=r(p),h=n(0),y=function(e){function t(){var e,n,r,u;o(this,t);for(var c=arguments.length,a=Array(c),s=0;s<c;s++)a[s]=arguments[s];return n=r=i(this,(e=t.__proto__||Object.getPrototypeOf(t)).call.apply(e,[this].concat(a))),r.onBtnClick=function(){var e=r.props,t=e.clientId,n=e.scope,o=e.redirectUri,i=(0,h.toQuery)({client_id:t,scope:n,redirect_uri:o}),u=r.popup=d.default.open("github-oauth-authorize","https://github.com/login/oauth/authorize?"+i,{height:1e3,width:600});r.onRequest(),u.then(function(e){return r.onSuccess(e)},function(e){return r.onFailure(e)})},r.onRequest=function(){r.props.onRequest()},r.onSuccess=function(e){if(!e.code)return r.onFailure(new Error("'code' not found"));r.props.onSuccess(e)},r.onFailure=function(e){r.props.onFailure(e)},u=n,i(r,u)}return u(t,e),c(t,[{key:"render",value:function(){var e=this.props,t=e.className,n=e.buttonText,r=e.children,o={onClick:this.onBtnClick};return t&&(o.className=t),s.default.createElement("button",o,r||n)}}]),t}(a.Component);y.propTypes={buttonText:f.default.string,children:f.default.node,className:f.default.string,clientId:f.default.string.isRequired,onRequest:f.default.func,onSuccess:f.default.func,onFailure:f.default.func,redirectUri:f.default.string.isRequired,scope:f.default.string},y.defaultProps={buttonText:"Sign in with GitHub",scope:"user:email",onRequest:function(){},onSuccess:function(){},onFailure:function(){}},t.default=y},function(t,n){t.exports=e},function(e,t,n){e.exports=n(6)()},function(e,t,n){"use strict";var r=n(7),o=n(8),i=n(9);e.exports=function(){function e(e,t,n,r,u,c){c!==i&&o(!1,"Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types")}function t(){return e}e.isRequired=e;var n={array:e,bool:e,func:e,number:e,object:e,string:e,symbol:e,any:e,arrayOf:t,element:e,instanceOf:t,node:e,objectOf:t,oneOf:t,oneOfType:t,shape:t};return n.checkPropTypes=r,n.PropTypes=n,n}},function(e,t,n){"use strict";function r(e){return function(){return e}}var o=function(){};o.thatReturns=r,o.thatReturnsFalse=r(!1),o.thatReturnsTrue=r(!0),o.thatReturnsNull=r(null),o.thatReturnsThis=function(){return this},o.thatReturnsArgument=function(e){return e},e.exports=o},function(e,t,n){"use strict";function r(e,t,n,r,i,u,c,a){if(o(t),!e){var s;if(void 0===t)s=new Error("Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings.");else{var l=[n,r,i,u,c,a],f=0;s=new Error(t.replace(/%s/g,function(){return l[f++]})),s.name="Invariant Violation"}throw s.framesToPop=1,s}}var o=function(e){};e.exports=r},function(e,t,n){"use strict";e.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(t,"__esModule",{value:!0});var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=n(0),u=function(){function e(t,n){var o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};r(this,e),this.id=t,this.url=n,this.options=o}return o(e,[{key:"open",value:function(){var e=this.url,t=this.id,n=this.options;this.window=window.open(e,t,(0,i.toQuery)(n,","))}},{key:"close",value:function(){this.cancel(),this.window.close()}},{key:"poll",value:function(){var e=this;this.promise=new Promise(function(t,n){e._iid=window.setInterval(function(){try{var r=e.window;if(!r||!1!==r.closed)return e.close(),void n(new Error("The popup was closed"));if(r.location.href===e.url||"blank"===r.location.pathname)return;var o=(0,i.toParams)(r.location.search.replace(/^\?/,""));t(o),e.close()}catch(e){}},500)})}},{key:"cancel",value:function(){this._iid&&(window.clearInterval(this._iid),this._iid=null)}},{key:"then",value:function(){var e;return(e=this.promise).then.apply(e,arguments)}},{key:"catch",value:function(){var e;return(e=this.promise).then.apply(e,arguments)}}],[{key:"open",value:function(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];var r=new(Function.prototype.bind.apply(this,[null].concat(t)));return r.open(),r.poll(),r}}]),e}();t.default=u}])});
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("react")):"function"==typeof define&&define.amd?define(["react"],t):"object"==typeof exports?exports.GitHubLogin=t(require("react")):e.GitHubLogin=t(e.react)}(this,function(e){return function(e){function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var n={};return t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=1)}([function(e,t,n){"use strict";function r(e){return e.replace(/^\??\//,"").split("&").reduce(function(e,t){var n=t.split("="),r=i(n,2),o=r[0],u=r[1];return e[o]=u,e},{})}function o(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"&",n=Object.keys(e);return n.reduce(function(r,o,i){var u=""+r+o+"="+e[o];return i<n.length-1&&(u+=t),u},"")}Object.defineProperty(t,"__esModule",{value:!0});var i=function(){function e(e,t){var n=[],r=!0,o=!1,i=void 0;try{for(var u,c=e[Symbol.iterator]();!(r=(u=c.next()).done)&&(n.push(u.value),!t||n.length!==t);r=!0);}catch(e){o=!0,i=e}finally{try{!r&&c.return&&c.return()}finally{if(o)throw i}}return n}return function(t,n){if(Array.isArray(t))return t;if(Symbol.iterator in Object(t))return e(t,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}();t.toParams=r,t.toQuery=o},function(e,t,n){e.exports=n(2)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(3),o=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=o.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function u(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var c=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(4),s=r(a),l=n(5),f=r(l),p=n(10),d=r(p),h=n(0),y=function(e){function t(){var e,n,r,u;o(this,t);for(var c=arguments.length,a=Array(c),s=0;s<c;s++)a[s]=arguments[s];return n=r=i(this,(e=t.__proto__||Object.getPrototypeOf(t)).call.apply(e,[this].concat(a))),r.onBtnClick=function(){var e=r.props,t=e.clientId,n=e.scope,o=e.redirectUri,i=(0,h.toQuery)({client_id:t,scope:n,redirect_uri:o}),u=r.popup=d.default.open("github-oauth-authorize","https://github.com/login/oauth/authorize?"+i,{height:1e3,width:600});r.onRequest(),u.then(function(e){return r.onSuccess(e)},function(e){return r.onFailure(e)})},r.onRequest=function(){r.props.onRequest()},r.onSuccess=function(e){if(r.props.requireCode&&!e.code)return r.onFailure(new Error("'code' not found"));r.props.onSuccess(e)},r.onFailure=function(e){r.props.onFailure(e)},u=n,i(r,u)}return u(t,e),c(t,[{key:"render",value:function(){var e=this.props,t=e.className,n=e.buttonText,r=e.children,o={onClick:this.onBtnClick};return t&&(o.className=t),s.default.createElement("button",o,r||n)}}]),t}(a.Component);y.propTypes={buttonText:f.default.string,children:f.default.node,className:f.default.string,clientId:f.default.string.isRequired,onRequest:f.default.func,onSuccess:f.default.func,onFailure:f.default.func,redirectUri:f.default.string.isRequired,scope:f.default.string},y.defaultProps={buttonText:"Sign in with GitHub",scope:"user:email",requireCode:!0,onRequest:function(){},onSuccess:function(){},onFailure:function(){}},t.default=y},function(t,n){t.exports=e},function(e,t,n){e.exports=n(6)()},function(e,t,n){"use strict";var r=n(7),o=n(8),i=n(9);e.exports=function(){function e(e,t,n,r,u,c){c!==i&&o(!1,"Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types")}function t(){return e}e.isRequired=e;var n={array:e,bool:e,func:e,number:e,object:e,string:e,symbol:e,any:e,arrayOf:t,element:e,instanceOf:t,node:e,objectOf:t,oneOf:t,oneOfType:t,shape:t};return n.checkPropTypes=r,n.PropTypes=n,n}},function(e,t,n){"use strict";function r(e){return function(){return e}}var o=function(){};o.thatReturns=r,o.thatReturnsFalse=r(!1),o.thatReturnsTrue=r(!0),o.thatReturnsNull=r(null),o.thatReturnsThis=function(){return this},o.thatReturnsArgument=function(e){return e},e.exports=o},function(e,t,n){"use strict";function r(e,t,n,r,i,u,c,a){if(o(t),!e){var s;if(void 0===t)s=new Error("Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings.");else{var l=[n,r,i,u,c,a],f=0;s=new Error(t.replace(/%s/g,function(){return l[f++]})),s.name="Invariant Violation"}throw s.framesToPop=1,s}}var o=function(e){};e.exports=r},function(e,t,n){"use strict";e.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(t,"__esModule",{value:!0});var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=n(0),u=function(){function e(t,n){var o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};r(this,e),this.id=t,this.url=n,this.options=o}return o(e,[{key:"open",value:function(){var e=this.url,t=this.id,n=this.options;this.window=window.open(e,t,(0,i.toQuery)(n,","))}},{key:"close",value:function(){this.cancel(),this.window.close()}},{key:"poll",value:function(){var e=this;this.promise=new Promise(function(t,n){e._iid=window.setInterval(function(){try{var r=e.window;if(!r||!1!==r.closed)return e.close(),void n(new Error("The popup was closed"));if(r.location.href===e.url||"blank"===r.location.pathname)return;var o=(0,i.toParams)(decodeURIComponent(r.location.search.replace(/^\?/,"")));t(o),e.close()}catch(e){}},500)})}},{key:"cancel",value:function(){this._iid&&(window.clearInterval(this._iid),this._iid=null)}},{key:"then",value:function(){var e;return(e=this.promise).then.apply(e,arguments)}},{key:"catch",value:function(){var e;return(e=this.promise).then.apply(e,arguments)}}],[{key:"open",value:function(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];var r=new(Function.prototype.bind.apply(this,[null].concat(t)));return r.open(),r.poll(),r}}]),e}();t.default=u}])});
 //# sourceMappingURL=GitHubLogin.js.map
\ No newline at end of file
diff --git a/src/GitHubLogin.js b/src/GitHubLogin.js
index 3862c23..79edc70 100644
--- a/src/GitHubLogin.js
+++ b/src/GitHubLogin.js
@@ -20,6 +20,7 @@ class GitHubLogin extends Component {
   static defaultProps = {
     buttonText: 'Sign in with GitHub',
     scope: 'user:email',
+    requireCode: true,
     onRequest: () => {},
     onSuccess: () => {},
     onFailure: () => {},
@@ -50,7 +51,7 @@ class GitHubLogin extends Component {
   }
 
   onSuccess = (data) => {
-    if (!data.code) {
+    if (this.props.requireCode && !data.code) {
       return this.onFailure(new Error('\'code\' not found'));
     }
 
diff --git a/src/PopupWindow.js b/src/PopupWindow.js
index 621f72b..53645b3 100644
--- a/src/PopupWindow.js
+++ b/src/PopupWindow.js
@@ -36,7 +36,7 @@ class PopupWindow {
             return;
           }
 
-          const params = toParams(popup.location.search.replace(/^\?/, ''));
+          const params = toParams(decodeURIComponent(popup.location.search.replace(/^\?/, '')));
 
           resolve(params);