@lingk/sync 1.0.70 → 1.0.71

package/build/main.js

@@ -2391,6 +2391,8 @@ module.exports =
 	  value: true
 	});
 	
+	var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+	
 	var _react = __webpack_require__(1);
 	
 	var _react2 = _interopRequireDefault(_react);
@@ -2399,6 +2401,12 @@ module.exports =
 	
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 	
+	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+	
+	function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+	
+	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+	
 	// SKIP ON SERVER-SIDE RENDERING
 	var codemirror = null;
 	if (typeof window !== 'undefined' && typeof window.navigator !== 'undefined') {
@@ -2412,96 +2420,125 @@ module.exports =
 	  });
 	}
 	
-	var Google = function Google(props) {
-	  var config = props.config,
-	      creds = props.creds,
-	      onChange = props.onChange,
-	      credsDisabledCheck = props.credsDisabledCheck,
-	      inputs = props.inputs,
-	      onCheck = props.onCheck;
+	var Google = function (_Component) {
+	  _inherits(Google, _Component);
 	
-	  var Input = inputs.Input;
-	  var Button = inputs.Button;
-	  var Select = inputs.Select;
-	  var CodeMirror = codemirror && codemirror.Controlled;
+	  function Google() {
+	    _classCallCheck(this, Google);
 	
-	  var CloudSQLTypes = [{ name: 'Postgres', satisfiesSearch: true }, { name: 'MySQL', satisfiesSearch: true }];
+	    var _this = _possibleConstructorReturn(this, (Google.__proto__ || Object.getPrototypeOf(Google)).call(this));
 	
-	  var onlyJson = config.credentials && config.credentials.length === 1 && config.credentials[0] === 'json';
+	    _this.state = {
+	      showPass: false
+	    };
+	    return _this;
+	  }
 	
-	  return _react2.default.createElement(
-	    'div',
-	    null,
-	    config.credentials && _react2.default.createElement(
-	      'div',
-	      { style: { marginLeft: 1 } },
-	      _react2.default.createElement(
-	        'label',
-	        { htmlFor: 'creds' },
-	        config.label || config.type,
-	        ' Credentials'
-	      ),
-	      _react2.default.createElement('br', null),
-	      _react2.default.createElement(
+	  _createClass(Google, [{
+	    key: 'render',
+	    value: function render() {
+	      var _this2 = this;
+	
+	      var _props = this.props,
+	          config = _props.config,
+	          creds = _props.creds,
+	          onChange = _props.onChange,
+	          credsDisabledCheck = _props.credsDisabledCheck,
+	          inputs = _props.inputs,
+	          onCheck = _props.onCheck;
+	
+	      var Input = inputs.Input;
+	      var Button = inputs.Button;
+	      var Select = inputs.Select;
+	      var CodeMirror = codemirror && codemirror.Controlled;
+	
+	      var CloudSQLTypes = [{ name: 'Postgres', satisfiesSearch: true, type: 'Postgres', title: 'Postgres' }, { name: 'MySQL', satisfiesSearch: true, type: 'MySQL', title: 'MySQL' }];
+	
+	      var onlyJson = config.credentials && config.credentials.length === 1 && config.credentials[0] === 'json';
+	
+	      return _react2.default.createElement(
 	        'div',
-	        { style: { display: 'inline-block', marginLeft: 16, width: '100%' } },
-	        config.credentials.map(function (credType, index) {
-	          return _react2.default.createElement(
+	        null,
+	        config.credentials && _react2.default.createElement(
+	          'div',
+	          { style: { marginLeft: 1 } },
+	          _react2.default.createElement(
+	            'label',
+	            { htmlFor: 'creds' },
+	            config.label || config.type,
+	            ' Credentials'
+	          ),
+	          _react2.default.createElement('br', null),
+	          _react2.default.createElement(
 	            'div',
-	            { key: index, style: { marginTop: 8, width: '100%' } },
-	            _react2.default.createElement(
-	              'label',
-	              { htmlFor: credType, className: 'labelz', style: { fontWeight: 'normal' } },
-	              credType !== 'json' ? unCamelize(credType) : 'API key (paste json or drag-and-drop file)'
-	            ),
-	            _react2.default.createElement('br', null),
-	            credType !== 'json' ? _react2.default.createElement(
-	              'div',
-	              { style: { display: 'inline-block', width: credType !== 'databaseType' ? 300 : 164 } },
-	              credType !== 'databaseType' ? _react2.default.createElement(Input, { name: credType,
-	                value: creds[credType] || '', onChange: onChange }) : _react2.default.createElement(Select, { vals: CloudSQLTypes, fieldPropLabel: 'name',
-	                label: creds[credType] || 'Database Types',
-	                onSelect: function onSelect(v) {
-	                  return onChange({ target: { name: credType, value: v } });
-	                },
-	                size: 'small', style: { width: 160, height: 31, textAlign: 'left' }
-	              })
-	            ) : _react2.default.createElement(CodeMirror, { value: creds[credType],
-	              className: 'env-creds-json-codemirror',
-	              options: {
-	                lineNumbers: true,
-	                theme: 'default',
-	                mode: 'javascript',
-	                dragDrop: true
-	              },
-	              onBeforeChange: function onBeforeChange(e, d, v) {
-	                return onChange({ target: { name: credType, value: v } });
-	              }
-	            }),
-	            index === 0 && _react2.default.createElement(
-	              Button,
-	              { type: 'brand',
-	                onClick: function onClick() {
-	                  return onCheck(creds);
-	                },
-	                style: { marginLeft: onlyJson ? 0 : 8, marginTop: onlyJson ? 8 : 0,
-	                  marginBottom: 2, height: 30, lineHeight: '10px'
-	                },
-	                disabled: credsDisabledCheck },
-	              _react2.default.createElement(
-	                'span',
-	                { style: { display: 'inline-block', verticalAlign: 'top', marginTop: 3 } },
-	                'Test Connection'
-	              ),
-	              '\xA0\xA0',
-	              _react2.default.createElement(Loop, null)
-	            )
-	          );
-	        })
-	      )
-	    )
-	  );
-	};
+	            { style: { display: 'inline-block', marginLeft: 16, width: '100%' } },
+	            config.credentials.map(function (credType, index) {
+	              return _react2.default.createElement(
+	                'div',
+	                { key: index, style: { marginTop: 8, width: '100%' } },
+	                _react2.default.createElement(
+	                  'label',
+	                  { htmlFor: credType, className: 'labelz', style: { fontWeight: 'normal' } },
+	                  credType !== 'json' ? unCamelize(credType) : 'API key (paste json or drag-and-drop file)'
+	                ),
+	                _react2.default.createElement('br', null),
+	                credType !== 'json' ? _react2.default.createElement(
+	                  'div',
+	                  { style: { display: 'inline-block', width: credType !== 'databaseType' ? 300 : 164 } },
+	                  credType !== 'databaseType' ? _react2.default.createElement(Input, { name: credType,
+	                    datatype: credType === 'password' && !_this2.state.showPass ? 'password' : null,
+	                    value: creds[credType] || '', onChange: onChange }) : _react2.default.createElement(Select, { vals: CloudSQLTypes, fieldPropLabel: 'name',
+	                    label: creds[credType] || 'Database Types',
+	                    onSelect: function onSelect(v) {
+	                      return onChange({ target: { name: credType, value: v } });
+	                    },
+	                    size: 'small', style: { width: 160, height: 31, textAlign: 'left' }
+	                  })
+	                ) : _react2.default.createElement(CodeMirror, { value: creds[credType],
+	                  className: 'env-creds-json-codemirror',
+	                  options: {
+	                    lineNumbers: true,
+	                    theme: 'default',
+	                    mode: 'javascript',
+	                    dragDrop: true
+	                  },
+	                  onBeforeChange: function onBeforeChange(e, d, v) {
+	                    return onChange({ target: { name: credType, value: v } });
+	                  }
+	                }),
+	                credType === 'password' && _react2.default.createElement(Key, { showPass: _this2.state.showPass,
+	                  onClick: function onClick() {
+	                    return _this2.setState({ showPass: !_this2.state.showPass });
+	                  }
+	                }),
+	                index === 0 && _react2.default.createElement(
+	                  Button,
+	                  { type: 'brand',
+	                    onClick: function onClick() {
+	                      return onCheck(creds);
+	                    },
+	                    style: { marginLeft: onlyJson ? 0 : 8, marginTop: onlyJson ? 8 : 0,
+	                      marginBottom: 2, height: 30, lineHeight: '10px'
+	                    },
+	                    disabled: credsDisabledCheck },
+	                  _react2.default.createElement(
+	                    'span',
+	                    { style: { display: 'inline-block', verticalAlign: 'top', marginTop: 3 } },
+	                    'Test Connection'
+	                  ),
+	                  '\xA0\xA0',
+	                  _react2.default.createElement(Loop, null)
+	                )
+	              );
+	            })
+	          )
+	        )
+	      );
+	    }
+	  }]);
+	
+	  return Google;
+	}(_react.Component);
 	
 	var Loop = function Loop() {
 	  return _react2.default.createElement(
@@ -2513,6 +2550,19 @@ module.exports =
 	  );
 	};
 	
+	var Key = function Key(_ref) {
+	  var onClick = _ref.onClick,
+	      showPass = _ref.showPass;
+	
+	  return _react2.default.createElement(
+	    'svg',
+	    { onClick: onClick, style: showPass ? { fill: '#3a91dcb3' } : {},
+	      height: '24', width: '24', className: 'pass-key-svg', viewBox: '0 0 24 24' },
+	    _react2.default.createElement('path', { d: 'M0 0h24v24H0z', fill: 'none' }),
+	    _react2.default.createElement('path', { d: 'M12.65 10C11.83 7.67 9.61 6 7 6c-3.31 0-6 2.69-6 6s2.69 6 6 6c2.61 0 4.83-1.67 5.65-4H17v4h4v-4h2v-4H12.65zM7 14c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z' })
+	  );
+	};
+	
 	exports.default = Google;
 
 /***/ },
@@ -17278,12 +17328,11 @@ module.exports =
 	      if (fileSchemaGuid) {
 	        schemaGuid = fileSchemaGuid; // for SFTP guid is in wiz config
 	      }
-	      var resFromCheckConnection = null;
-	      if (r && r.schema) {
-	        // currently only for SFTP check connection
-	        resFromCheckConnection = r.schema; // skip callGetProviderMetadata network call
-	      }
-	      return dispatch(callGetProviderMetadata(tenantId, appId, metadataEndpoint, metadataApi, mode, providerType, endpoint, isOauth, environment.name, schemaGuid, resFromCheckConnection, creds, extraQuery));
+	      // let resFromCheckConnection = null
+	      // if(r && r.schema){ // currently only for SFTP check connection
+	      //   resFromCheckConnection = r.schema // skip callGetProviderMetadata network call
+	      // }
+	      return dispatch(callGetProviderMetadata(tenantId, appId, providerConfig, mode, providerType, endpoint, isOauth, environment.name, schemaGuid, creds, extraQuery));
 	    }).then(function (m) {
 	      metadata = m;
 	      var isIntro = endpoint === '_blank';
@@ -17448,11 +17497,15 @@ module.exports =
 	  };
 	}
 	
-	function callGetProviderMetadata(tenantId, appId, urlSuffix, apiUrl, mode, providerType, endpoint, isOauth, envName, schemaGuid, resFromCheckConnection, creds, extraQuery) {
+	function callGetProviderMetadata(tenantId, appId, providerConfig, mode, providerType, endpoint, isOauth, envName, schemaGuid, creds, extraQuery) {
 	  // urlSuffix for getMetadata. If checkConnection returns meta, skip this one
-	  if (!urlSuffix || resFromCheckConnection) {
+	  var metadataEndpoint = providerConfig.metadataEndpoint,
+	      metadataApi = providerConfig.metadataApi,
+	      credentialType = providerConfig.credentialType;
+	
+	  if (!metadataEndpoint) {
 	    return function () {
-	      return Promise.resolve(resFromCheckConnection);
+	      return Promise.resolve(null);
 	    };
 	  }
 	  return function (dispatch, getState, api) {
@@ -17460,25 +17513,36 @@ module.exports =
 	        config = _getState4.config;
 	
 	    var isAdapter = false;
-	    if (urlSuffix === 'adaptermetadata') {
-	      urlSuffix = 'adaptermetadata?url=' + endpoint;
+	    if (metadataEndpoint === 'adaptermetadata') {
+	      metadataEndpoint = 'adaptermetadata?url=' + endpoint;
 	      isAdapter = true;
 	    }
-	    if (urlSuffix === 'fileschema') {
-	      urlSuffix = 'fileschema?schemaGuid=' + schemaGuid;
+	    if (metadataEndpoint === 'fileschema') {
+	      metadataEndpoint = 'fileschema?schemaGuid=' + schemaGuid;
 	    }
-	    if (urlSuffix === 'schema/swagger/moodle' && creds.swaggerUrl) {
-	      urlSuffix = 'schema/swagger/moodle?swaggerUrl=' + creds.swaggerUrl;
+	    if (metadataEndpoint === 'schema/swagger/moodle' && creds.swaggerUrl) {
+	      metadataEndpoint = 'schema/swagger/moodle?swaggerUrl=' + creds.swaggerUrl;
 	    }
-	    if (isOauth || isAdapter || providerType === 'Ethos') {
-	      // USE ONLY ENVS!!!
-	      return api.get(tenantId + '/' + appId + '/environments/' + envName + '/' + urlSuffix + (extraQuery || ''), {
-	        endpoint: config[apiUrl]
+	    if (metadataApi === 'TEST_CONN_API_URL') {
+	      return api.post(tenantId + '/' + appId + '/' + metadataEndpoint, {
+	        endpoint: config[metadataApi],
+	        data: {
+	          credentialType: credentialType,
+	          credentialsJson: creds,
+	          providerLabel: providerType
+	        }
 	      });
 	    } else {
-	      return api.get(tenantId + '/' + appId + '/' + urlSuffix + (extraQuery || ''), {
-	        endpoint: config[apiUrl]
-	      });
+	      if (isOauth || isAdapter || providerType === 'Ethos') {
+	        // USE ONLY ENVS!!!
+	        return api.get(tenantId + '/' + appId + '/environments/' + envName + '/' + metadataEndpoint + (extraQuery || ''), {
+	          endpoint: config[metadataApi]
+	        });
+	      } else {
+	        return api.get(tenantId + '/' + appId + '/' + metadataEndpoint + (extraQuery || ''), {
+	          endpoint: config[metadataApi]
+	        });
+	      }
 	    }
 	  };
 	}