@lingk/sync 2.0.6 → 2.0.8

package/build/main.js

@@ -6601,6 +6601,33 @@ module.exports =
 	
 	    var _this = _possibleConstructorReturn(this, (BVA.__proto__ || Object.getPrototypeOf(BVA)).call(this));
 	
+	    _this.finishOauth = function (e) {
+	      if (e.data && e.data.lingkOauthMessage && e.data.lingkOauthMessage === "complete") {
+	        // get credentials
+	        _this.props.getEnvCreds();
+	      }
+	    };
+	
+	    _this.startOauth = function () {
+	      var creds = _this.props.creds;
+	
+	      var data = {
+	        clientId: creds.clientId,
+	        clientSecret: creds.clientSecret,
+	        rootUrl: creds.rootUrl,
+	        bvaToken: creds.bvaToken
+	      };
+	
+	      _this.props.getOauthCreds(data).then(function (d) {
+	        var width = 600;
+	        var height = 600;
+	        var left = window.screenX + (window.outerWidth - width) / 2;
+	        var top = window.screenY + (window.outerHeight - height) / 2.5;
+	        var popup = window.open(d.url, "Oauth", "width=" + width + ",height=" + height + ",top=" + top + ",left=" + left);
+	        popup.focus();
+	      });
+	    };
+	
 	    _this.state = {
 	      showPass: false
 	    };
@@ -6617,6 +6644,12 @@ module.exports =
 	      if (!creds["authenticationType"]) {
 	        onChange({ target: { name: "authenticationType", value: "key" } });
 	      }
+	      window.addEventListener("message", this.finishOauth);
+	    }
+	  }, {
+	    key: "componentWillUnmount",
+	    value: function componentWillUnmount() {
+	      window.removeEventListener("message", this.finishOauth);
 	    }
 	  }, {
 	    key: "render",
@@ -6634,7 +6667,6 @@ module.exports =
 	          EnvCheckIcons = _props2.EnvCheckIcons,
 	          onChangeCustomKey = _props2.onChangeCustomKey;
 	
-	
 	      var CodeMirror = codemirror && codemirror.Controlled;
 	      var Button = inputs.Button;
 	      var Input = inputs.Input;
@@ -6651,10 +6683,16 @@ module.exports =
 	        }
 	        return true;
 	      });
-	      var passwordIsOptional = credentials.includes("privateKey");
-	
-	      var credsDisabledCheck = credentials.some(function (c) {
-	        return !Object.keys(creds).includes(c.split(" ").join(""));
+	      var credentialsRemoveToken = credentials.filter(function (c) {
+	        if (c == "refreshToken" || c == "accessToken" || c == "scope") {
+	          return false;
+	        } else {
+	          return true;
+	        }
+	      });
+	      var credsDisabledCheck = credentialsRemoveToken && credentialsRemoveToken.some(function (c) {
+	        var formCreds = creds;
+	        return !Object.keys(formCreds).includes(c.split(" ").join(""));
 	      });
 	
 	      return _react2.default.createElement(
@@ -6671,7 +6709,7 @@ module.exports =
 	              { className: "pass-ssh-toggle" },
 	              _react2.default.createElement(Toggle, {
 	                value: creds["authenticationType"],
-	                options: ["key", "OAuth"],
+	                options: ["OAuth", "key"],
 	                handleToggle: function handleToggle(v) {
 	                  return onChange({
 	                    target: { name: "authenticationType", value: v }
@@ -6693,13 +6731,13 @@ module.exports =
 	                  unCamelize(credType)
 	                ),
 	                _react2.default.createElement("br", null),
-	                credType === "refreshToken" || credType === "accessToken" ? _react2.default.createElement(
+	                credType === "refreshToken" || credType === "accessToken" || credType === "scope" ? _react2.default.createElement(
 	                  "div",
 	                  null,
 	                  _react2.default.createElement(Input, {
 	                    name: credType,
 	                    value: creds.bvaToken && creds.bvaToken[credType] || "",
-	                    disabled: credType == "accessToken" ? true : false,
+	                    disabled: credType == "accessToken" || credType == "refreshToken" && creds.authenticationType == "oauth" ? true : false,
 	                    onChange: function onChange(e) {
 	                      return onChangeCustomKey(e, credType, bvaToken);
 	                    }
@@ -6723,9 +6761,10 @@ module.exports =
 	                  marginTop: -1,
 	                  position: "absolute",
 	                  top: 120,
-	                  left: 450
+	                  left: 850
 	                },
-	                disabled: true
+	                disabled: credsDisabledCheck,
+	                onClick: this.startOauth
 	              },
 	              _react2.default.createElement(
 	                "span",
@@ -7942,7 +7981,7 @@ module.exports =
 	      } else if (config.type === "BrightSpaceValenceApi") {
 	        this.setState({
 	          actualCreds: Object.assign({}, creds, {
-	            authenticationType: "key"
+	            authenticationType: "oauth"
 	          })
 	        });
 	      } else {
@@ -7971,7 +8010,7 @@ module.exports =
 	        if (actualCreds.credentialType) {
 	          newProps.creds.authenticationType = actualCreds.authenticationType;
 	        } else {
-	          newProps.creds.authenticationType = "key";
+	          newProps.creds.authenticationType = "oauth";
 	        }
 	      }
 	      if (JSON.stringify(this.state.actualCreds) !== JSON.stringify(newProps.creds)) {
@@ -8012,7 +8051,8 @@ module.exports =
 	          deleteFlatFile = _props2.deleteFlatFile,
 	          gencerts = _props2.gencerts,
 	          downloadcerts = _props2.downloadcerts,
-	          onAPIAccessChange = _props2.onAPIAccessChange;
+	          onAPIAccessChange = _props2.onAPIAccessChange,
+	          getOauthCreds = _props2.getOauthCreds;
 	
 	      var Button = inputs.Button;
 	      var Spinner = inputs.Spinner;
@@ -8112,7 +8152,9 @@ module.exports =
 	          envCheckResult: envCheckResult,
 	          checking: checking,
 	          EnvCheckIcons: EnvCheckIcons,
-	          onChangeCustomKey: this.onChangeCustomKey
+	          onChangeCustomKey: this.onChangeCustomKey,
+	          getOauthCreds: getOauthCreds,
+	          getEnvCreds: this.props.getEnvCreds
 	        }) : isGoogle ? _react2.default.createElement(_google2.default, {
 	          config: config,
 	          creds: creds,