diff --git a/config.toml b/config.toml index 2a1a3c51..0936c523 100644 --- a/config.toml +++ b/config.toml @@ -1,14 +1,14 @@ [serverConfig] ServerPort = ":8000" #leave format as is it expects a string with colon - ServerAddr = "192.168.1.8" #Put in the IP address you want to bind to + ServerAddr = "192.168.1.100" #Put in the IP address you want to bind to LogLevel = "Info" # Options = Debug, Info, Warn, Error, Fatal, Panic LogOutput = "stdout" #Options = file, stdout #file will print it to logs/server.log SeedRatioStop = 1.50 #automatically stops the torrent after it reaches this seeding ratio #Relative or absolute path accepted, the server will convert any relative path to an absolute path. - DefaultMoveFolder = 'Z:\downloads' #default path that a finished torrent is symlinked to after completion. Torrents added via RSS will default here + DefaultMoveFolder = 'downloads' #default path that a finished torrent is symlinked to after completion. Torrents added via RSS will default here TorrentWatchFolder = 'torrentUpload' #folder path that is watched for .torrent files and adds them automatically every 5 minutes #Limits your upload and download speed globally, all are averages and not burst protected (usually burst on start). @@ -25,24 +25,24 @@ [notifications] - PushBulletToken = "o.8sUHemPkTCaty3u7KnyvEBN19EkeT63g" #add your pushbullet api token here to notify of torrent completion to pushbullet + PushBulletToken = "" #add your pushbullet api token here to notify of torrent completion to pushbullet [reverseProxy] #This is for setting up goTorrent behind a reverse Proxy (with SSL, reverse proxy with no SSL will require editing the WSS connection to a WS connection manually) - ProxyEnabled = true #bool, either false or true + ProxyEnabled = false #bool, either false or true #URL is CASE SENSITIVE - BaseURL = "derajnet.duckdns.org/gopher/" # MUST be in the format (if you have a subdomain, and must have trailing slash) "yoursubdomain.domain.org/subroute/" + BaseURL = "domain.com/subroute/" # MUST be in the format (if you have a subdomain, and must have trailing slash) "yoursubdomain.domain.org/subroute/" [EncryptionPolicy] DisableEncryption = false ForceEncryption = false - PreferNoEncryption = false + PreferNoEncryption = true [torrentClientConfig] DownloadDir = 'downloading' #the full OR relative path where the torrent server stores in-progress torrents - Seed = false #boolean #seed after download + Seed = true #boolean #seed after download # Never send chunks to peers. NoUpload = false #boolean diff --git a/config.toml.bk b/config.toml.bk index 0936c523..081ec73e 100644 --- a/config.toml.bk +++ b/config.toml.bk @@ -1,14 +1,14 @@ [serverConfig] ServerPort = ":8000" #leave format as is it expects a string with colon - ServerAddr = "192.168.1.100" #Put in the IP address you want to bind to + ServerAddr = "192.168.1.8" #Put in the IP address you want to bind to LogLevel = "Info" # Options = Debug, Info, Warn, Error, Fatal, Panic LogOutput = "stdout" #Options = file, stdout #file will print it to logs/server.log SeedRatioStop = 1.50 #automatically stops the torrent after it reaches this seeding ratio #Relative or absolute path accepted, the server will convert any relative path to an absolute path. - DefaultMoveFolder = 'downloads' #default path that a finished torrent is symlinked to after completion. Torrents added via RSS will default here + DefaultMoveFolder = 'Z:\downloads' #default path that a finished torrent is symlinked to after completion. Torrents added via RSS will default here TorrentWatchFolder = 'torrentUpload' #folder path that is watched for .torrent files and adds them automatically every 5 minutes #Limits your upload and download speed globally, all are averages and not burst protected (usually burst on start). @@ -25,24 +25,24 @@ [notifications] - PushBulletToken = "" #add your pushbullet api token here to notify of torrent completion to pushbullet + PushBulletToken = "o.8sUHemPkTCaty3u7KnyvEBN19EkeT63g" #add your pushbullet api token here to notify of torrent completion to pushbullet [reverseProxy] #This is for setting up goTorrent behind a reverse Proxy (with SSL, reverse proxy with no SSL will require editing the WSS connection to a WS connection manually) ProxyEnabled = false #bool, either false or true #URL is CASE SENSITIVE - BaseURL = "domain.com/subroute/" # MUST be in the format (if you have a subdomain, and must have trailing slash) "yoursubdomain.domain.org/subroute/" + BaseURL = "derajnet.duckdns.org/gopher/" # MUST be in the format (if you have a subdomain, and must have trailing slash) "yoursubdomain.domain.org/subroute/" [EncryptionPolicy] DisableEncryption = false ForceEncryption = false - PreferNoEncryption = true + PreferNoEncryption = false [torrentClientConfig] DownloadDir = 'downloading' #the full OR relative path where the torrent server stores in-progress torrents - Seed = true #boolean #seed after download + Seed = false #boolean #seed after download # Never send chunks to peers. NoUpload = false #boolean diff --git a/goTorrentWebUI/src/BackendComm/backendWebsocket.js b/goTorrentWebUI/src/BackendComm/backendWebsocket.js index 30c8cb36..9377d77c 100644 --- a/goTorrentWebUI/src/BackendComm/backendWebsocket.js +++ b/goTorrentWebUI/src/BackendComm/backendWebsocket.js @@ -21,6 +21,7 @@ let serverMessage = []; let serverPushMessage = []; let webSocketState = false; let settingsFile = []; +let tokenReturn = ""; var torrentListRequest = { MessageType: "torrentListRequest" @@ -29,7 +30,7 @@ var torrentListRequest = { -//websocket is started in kickwebsocket.js and is picked up here so "ws" is already defined 22 +//websocket is started in kickwebsocket.js and is picked up here so "ws" is already defined ws.onmessage = function (evt) { //When we recieve a message from the websocket var serverMessage = JSON.parse(evt.data) console.log("message", serverMessage.MessageType) @@ -134,6 +135,10 @@ ws.onmessage = function (evt) { //When we recieve a message from the websocket settingsFile = []; console.log("Settings File Returned", serverMessage) settingsFile = serverMessage.Config + + case "TokenReturn": + tokenReturn = serverMessage.TokenReturn + console.log("Token Returned", serverMessage) } } @@ -222,9 +227,14 @@ class BackendSocket extends React.Component { console.log("PROPSSERVER", this.props.serverPushMessage, "SERVERPUSH", serverPushMessage) this.props.newServerMessage(serverPushMessage) } - if (this.props.settingsModalOpen) { //TODO don't really need to updaate every tick currently until we can edit config + if (this.props.settingsModalOpen) { //TODO don't really need to update every tick currently until we can edit config this.props.newSettingsFile(settingsFile) } + + if (tokenReturn != ""){ //If we get a return token + console.log("Dispatching token return", tokenReturn) + this.props.newTokenReturn(tokenReturn) + } ws.send(JSON.stringify(torrentListRequest))//talking to the server to get the torrent list if (ws.readyState === ws.CLOSED){ //if our websocket gets closed inform the user @@ -264,6 +274,9 @@ class BackendSocket extends React.Component { if (nextProps.selectionHashes.length === 1){ //if we have a selection pass it on for the tabs to verify this.selectionHandler(nextProps.selectionHashes, nextProps.selectedTab) } + if (nextProps.tokenReturn != this.props.tokenReturn){ //clearing out the token if we switch from the API tab + tokenReturn = nextProps.tokenReturn + } } @@ -287,6 +300,7 @@ const mapStateToProps = state => { RSSTorrentList: state.RSSTorrentList, serverPushMessage: state.serverPushMessage, settingsModalOpen: state.settingsModalOpen, + tokenReturn: state.tokenReturn, }; } @@ -301,9 +315,8 @@ const mapDispatchToProps = dispatch => { RSSTorrentList: (RSSTorrentList) => dispatch({type: actionTypes.RSS_TORRENT_LIST, RSSTorrentList}), newServerMessage: (serverPushMessage) => dispatch({type: actionTypes.SERVER_MESSAGE, serverPushMessage}), webSocketStateUpdate: (webSocketState) => dispatch({type: actionTypes.WEBSOCKET_STATE, webSocketState}), - newSettingsFile: (settingsFile) => dispatch({type: actionTypes.NEW_SETTINGS_FILE, settingsFile}) - //changeSelection: (selection) => dispatch({type: actionTypes.CHANGE_SELECTION, selection}),//forcing an update to the buttons - + newSettingsFile: (settingsFile) => dispatch({type: actionTypes.NEW_SETTINGS_FILE, settingsFile}), + newTokenReturn: (tokenReturn) => dispatch({type: actionTypes.TOKEN_RETURN, tokenReturn}), } } diff --git a/goTorrentWebUI/src/TopMenu/Modals/SettingsModal/SettingsModalContentTabs/apiSettingsTab.js b/goTorrentWebUI/src/TopMenu/Modals/SettingsModal/SettingsModalContentTabs/apiSettingsTab.js index ef1dfc7d..9d421945 100644 --- a/goTorrentWebUI/src/TopMenu/Modals/SettingsModal/SettingsModalContentTabs/apiSettingsTab.js +++ b/goTorrentWebUI/src/TopMenu/Modals/SettingsModal/SettingsModalContentTabs/apiSettingsTab.js @@ -3,14 +3,18 @@ import ReactDOM from 'react-dom'; import { withStyles } from 'material-ui/styles'; import Paper from 'material-ui/Paper'; import Grid from 'material-ui/Grid'; +import Button from 'material-ui/Button'; +import TextField from 'material-ui/TextField'; import {connect} from 'react-redux'; +import * as actionTypes from '../../../../store/actions'; const styles = theme => ({ root: { flexGrow: 1, marginTop: 0, + padding: 10, }, paper: { padding: 16, @@ -23,19 +27,48 @@ const styles = theme => ({ }); -class APISettingsTab extends React.PureComponent { +class APISettingsTab extends React.Component { + state = { + clientName: "", + }; - requestNewKey = (keyName) => { + generateKey = (event) => { + let newAuthTokenRequest = { + MessageType: "newAuthToken", + Payload: {"ClientName": this.state.clientName} + } + console.log("Sending New Auth Request: ", newAuthTokenRequest); + ws.send(JSON.stringify(newAuthTokenRequest)); + this.setState({clientName: ""}) + } + setClientName = (event) => { + this.setState({clientName: event.target.value}) } + componentWillUnmount = () => { + this.props.newTokenReturn("") + } render() { const { classes } = this.props; return ( -
- Not yet implemented! +
+ + + {this.props.tokenReturn} + + + + + + + + +
); } @@ -44,9 +77,15 @@ class APISettingsTab extends React.PureComponent { const mapStateToProps = state => { return { - settingsFile: state.settingsFile, + tokenReturn: state.tokenReturn, }; } -export default withStyles(styles)(connect(mapStateToProps)(APISettingsTab)) + const mapDispatchToProps = dispatch => { + return { + newTokenReturn: (tokenReturn) => dispatch({type: actionTypes.TOKEN_RETURN, tokenReturn}), + } +} + +export default withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(APISettingsTab)) diff --git a/goTorrentWebUI/src/store/actions.js b/goTorrentWebUI/src/store/actions.js index 521e4ebe..f745ba5c 100644 --- a/goTorrentWebUI/src/store/actions.js +++ b/goTorrentWebUI/src/store/actions.js @@ -14,4 +14,5 @@ export const SETTINGS_MODAL_OPEN_STATE = 'SETTINGS_MODAL_OPEN_STATE'; export const NEW_SETTINGS_FILE = 'NEW_SETTINGS_FILE'; export const RSS_TORRENT_LIST = 'RSS_TORRENT_LIST'; export const SERVER_MESSAGE = 'SERVER_MESSAGE'; -export const WEBSOCKET_STATE = 'WEBSOCKET_STATE'; \ No newline at end of file +export const WEBSOCKET_STATE = 'WEBSOCKET_STATE'; +export const TOKEN_RETURN = 'TOKEN_RETURN'; \ No newline at end of file diff --git a/goTorrentWebUI/src/store/reducer.js b/goTorrentWebUI/src/store/reducer.js index 28ced864..aec84387 100644 --- a/goTorrentWebUI/src/store/reducer.js +++ b/goTorrentWebUI/src/store/reducer.js @@ -129,6 +129,13 @@ const reducer = (state = initialState, action) => { ...state, serverPushMessage: action.serverPushMessage } + + case actionTypes.TOKEN_RETURN: + console.log("New token return", action.tokenReturn) + return { + ... state, + tokenReturn: action.tokenReturn + } case actionTypes.SET_BUTTON_STATE: if (action.buttonState.length === 0) { //if selection is empty buttons will be default and selectionHashes will be blanked out and pushed to redux diff --git a/main.go b/main.go index 984347ab..c4cc9b2c 100644 --- a/main.go +++ b/main.go @@ -265,7 +265,7 @@ func main() { Logger.WithFields(logrus.Fields{"clientName": payloadData["ClientName"].(string)}).Info("New Auth Token creation request") fmt.Println("Signing Key", signingKey) token := Settings.GenerateToken(claims, signingKey) - tokenReturn := Settings.TokenReturn{TokenReturn: token} + tokenReturn := Settings.TokenReturn{MessageType: "TokenReturn", TokenReturn: token} tokensDB := Storage.FetchJWTTokens(db) tokensDB.TokenNames = append(tokens.TokenNames, Storage.SingleToken{payloadData["ClientName"].(string)}) db.Update(&tokensDB) //adding the new token client name to the database diff --git a/public/static/js/bundle.js b/public/static/js/bundle.js index 48b5c8c6..c391c32a 100644 --- a/public/static/js/bundle.js +++ b/public/static/js/bundle.js @@ -1395,6 +1395,35 @@ var _temp = function () { /* 22 */ /***/ (function(module, exports, __webpack_require__) { +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +var SORTLIST = exports.SORTLIST = 'SORTLIST'; +var CHANGE_SELECTION = exports.CHANGE_SELECTION = 'CHANGE_SELECTION'; +var CHANGE_FILTER = exports.CHANGE_FILTER = 'CHANGE_FILTER'; +var TORRENT_LIST = exports.TORRENT_LIST = 'TORRENT_LIST'; +var SET_BUTTON_STATE = exports.SET_BUTTON_STATE = 'BUTTON_STATE'; +var SELECTION_HASHES = exports.SELECTION_HASHES = 'SELECTION_HASHES'; +var SELECTED_TAB = exports.SELECTED_TAB = 'SELECTED_TAB'; +var PEER_LIST = exports.PEER_LIST = 'PEER_LIST'; +var FILE_LIST = exports.FILE_LIST = 'FILE_LIST'; +var CHANGE_FILE_SELECTION = exports.CHANGE_FILE_SELECTION = 'CHANGE_FILE_SELECTION'; +var NEW_RSS_FEED_STORE = exports.NEW_RSS_FEED_STORE = 'NEW_RSS_FEED_STORE'; +var RSS_MODAL_OPEN_STATE = exports.RSS_MODAL_OPEN_STATE = 'RSS_MODAL_OPEN_STATE'; +var SETTINGS_MODAL_OPEN_STATE = exports.SETTINGS_MODAL_OPEN_STATE = 'SETTINGS_MODAL_OPEN_STATE'; +var NEW_SETTINGS_FILE = exports.NEW_SETTINGS_FILE = 'NEW_SETTINGS_FILE'; +var RSS_TORRENT_LIST = exports.RSS_TORRENT_LIST = 'RSS_TORRENT_LIST'; +var SERVER_MESSAGE = exports.SERVER_MESSAGE = 'SERVER_MESSAGE'; +var WEBSOCKET_STATE = exports.WEBSOCKET_STATE = 'WEBSOCKET_STATE'; +var TOKEN_RETURN = exports.TOKEN_RETURN = 'TOKEN_RETURN'; + +/***/ }), +/* 23 */ +/***/ (function(module, exports, __webpack_require__) { + "use strict"; /* WEBPACK VAR INJECTION */(function(process) { @@ -1489,7 +1518,7 @@ function createChainedFunction() { /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1))) /***/ }), -/* 23 */ +/* 24 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -1511,7 +1540,7 @@ Object.defineProperty(exports, 'default', { function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } /***/ }), -/* 24 */ +/* 25 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -1552,34 +1581,6 @@ var pure = function pure(BaseComponent) { exports.default = pure; /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1))) -/***/ }), -/* 25 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); -var SORTLIST = exports.SORTLIST = 'SORTLIST'; -var CHANGE_SELECTION = exports.CHANGE_SELECTION = 'CHANGE_SELECTION'; -var CHANGE_FILTER = exports.CHANGE_FILTER = 'CHANGE_FILTER'; -var TORRENT_LIST = exports.TORRENT_LIST = 'TORRENT_LIST'; -var SET_BUTTON_STATE = exports.SET_BUTTON_STATE = 'BUTTON_STATE'; -var SELECTION_HASHES = exports.SELECTION_HASHES = 'SELECTION_HASHES'; -var SELECTED_TAB = exports.SELECTED_TAB = 'SELECTED_TAB'; -var PEER_LIST = exports.PEER_LIST = 'PEER_LIST'; -var FILE_LIST = exports.FILE_LIST = 'FILE_LIST'; -var CHANGE_FILE_SELECTION = exports.CHANGE_FILE_SELECTION = 'CHANGE_FILE_SELECTION'; -var NEW_RSS_FEED_STORE = exports.NEW_RSS_FEED_STORE = 'NEW_RSS_FEED_STORE'; -var RSS_MODAL_OPEN_STATE = exports.RSS_MODAL_OPEN_STATE = 'RSS_MODAL_OPEN_STATE'; -var SETTINGS_MODAL_OPEN_STATE = exports.SETTINGS_MODAL_OPEN_STATE = 'SETTINGS_MODAL_OPEN_STATE'; -var NEW_SETTINGS_FILE = exports.NEW_SETTINGS_FILE = 'NEW_SETTINGS_FILE'; -var RSS_TORRENT_LIST = exports.RSS_TORRENT_LIST = 'RSS_TORRENT_LIST'; -var SERVER_MESSAGE = exports.SERVER_MESSAGE = 'SERVER_MESSAGE'; -var WEBSOCKET_STATE = exports.WEBSOCKET_STATE = 'WEBSOCKET_STATE'; - /***/ }), /* 26 */ /***/ (function(module, exports, __webpack_require__) { @@ -1591,12 +1592,12 @@ Object.defineProperty(exports, "__esModule", { value: true }); -var _IconButton = __webpack_require__(524); +var _Button = __webpack_require__(540); Object.defineProperty(exports, 'default', { enumerable: true, get: function get() { - return _interopRequireDefault(_IconButton).default; + return _interopRequireDefault(_Button).default; } }); @@ -1613,12 +1614,12 @@ Object.defineProperty(exports, "__esModule", { value: true }); -var _Button = __webpack_require__(540); +var _IconButton = __webpack_require__(524); Object.defineProperty(exports, 'default', { enumerable: true, get: function get() { - return _interopRequireDefault(_Button).default; + return _interopRequireDefault(_IconButton).default; } }); @@ -1703,6 +1704,28 @@ module.exports = $export; /* 30 */ /***/ (function(module, exports, __webpack_require__) { +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _TextField = __webpack_require__(541); + +Object.defineProperty(exports, 'default', { + enumerable: true, + get: function get() { + return _interopRequireDefault(_TextField).default; + } +}); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +/***/ }), +/* 31 */ +/***/ (function(module, exports, __webpack_require__) { + var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*! Copyright (c) 2016 Jed Watson. Licensed under the MIT License (MIT), see @@ -1754,28 +1777,6 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*! }()); -/***/ }), -/* 31 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _TextField = __webpack_require__(541); - -Object.defineProperty(exports, 'default', { - enumerable: true, - get: function get() { - return _interopRequireDefault(_TextField).default; - } -}); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - /***/ }), /* 32 */ /***/ (function(module, exports, __webpack_require__) { @@ -2581,7 +2582,7 @@ var _Const = __webpack_require__(21); var _Const2 = _interopRequireDefault(_Const); -var _classnames = __webpack_require__(30); +var _classnames = __webpack_require__(31); var _classnames2 = _interopRequireDefault(_classnames); @@ -6047,7 +6048,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -12619,7 +12620,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -12662,7 +12663,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -12723,7 +12724,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_material_ui_Popover___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3_material_ui_Popover__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_material_ui_List__ = __webpack_require__(51); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_material_ui_List___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_material_ui_List__); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5_material_ui_IconButton__ = __webpack_require__(26); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5_material_ui_IconButton__ = __webpack_require__(27); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_5_material_ui_IconButton___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_5_material_ui_IconButton__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_6_material_ui_Tooltip__ = __webpack_require__(278); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_6_material_ui_Tooltip___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_6_material_ui_Tooltip__); @@ -12733,7 +12734,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_8_material_ui_Checkbox___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_8_material_ui_Checkbox__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_9_classnames__ = __webpack_require__(651); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_9_classnames___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_9_classnames__); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10_material_ui_Paper__ = __webpack_require__(23); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10_material_ui_Paper__ = __webpack_require__(24); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_10_material_ui_Paper___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_10_material_ui_Paper__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_11_material_ui_Typography__ = __webpack_require__(44); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_11_material_ui_Typography___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_11_material_ui_Typography__); @@ -12745,7 +12746,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_14_material_ui_Menu___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_14_material_ui_Menu__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_15_material_ui_Select__ = __webpack_require__(166); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_15_material_ui_Select___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_15_material_ui_Select__); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16_material_ui_Button__ = __webpack_require__(27); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16_material_ui_Button__ = __webpack_require__(26); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_16_material_ui_Button___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_16_material_ui_Button__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_17_material_ui_icons_ChevronLeft__ = __webpack_require__(653); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_17_material_ui_icons_ChevronLeft___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_17_material_ui_icons_ChevronLeft__); @@ -37875,7 +37876,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -38334,7 +38335,7 @@ var _withStyles = __webpack_require__(5); var _withStyles2 = _interopRequireDefault(_withStyles); -var _IconButton = __webpack_require__(26); +var _IconButton = __webpack_require__(27); var _IconButton2 = _interopRequireDefault(_IconButton); @@ -46961,7 +46962,7 @@ var _withStyles2 = _interopRequireDefault(_withStyles); var _Input = __webpack_require__(146); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); var _reactHelpers = __webpack_require__(50); @@ -49084,7 +49085,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -53064,7 +53065,7 @@ var _withStyles = __webpack_require__(5); var _withStyles2 = _interopRequireDefault(_withStyles); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); var _colorManipulator = __webpack_require__(48); @@ -53521,7 +53522,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -54029,7 +54030,7 @@ var _propTypes = __webpack_require__(14); var _propTypes2 = _interopRequireDefault(_propTypes); -var _classnames = __webpack_require__(30); +var _classnames = __webpack_require__(31); var _classnames2 = _interopRequireDefault(_classnames); @@ -56500,7 +56501,7 @@ var _withStyles = __webpack_require__(5); var _withStyles2 = _interopRequireDefault(_withStyles); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); @@ -79909,7 +79910,7 @@ Object.defineProperty(exports, "__esModule", { var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); @@ -80030,6 +80031,12 @@ var reducer = function reducer() { serverPushMessage: action.serverPushMessage }); + case actionTypes.TOKEN_RETURN: + console.log("New token return", action.tokenReturn); + return _extends({}, state, { + tokenReturn: action.tokenReturn + }); + case actionTypes.SET_BUTTON_STATE: if (action.buttonState.length === 0) { //if selection is empty buttons will be default and selectionHashes will be blanked out and pushed to redux @@ -80118,7 +80125,7 @@ var _Icon = __webpack_require__(36); var _Icon2 = _interopRequireDefault(_Icon); -var _IconButton = __webpack_require__(26); +var _IconButton = __webpack_require__(27); var _IconButton2 = _interopRequireDefault(_IconButton); @@ -80184,7 +80191,7 @@ var _backendWebsocket2 = _interopRequireDefault(_backendWebsocket); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); @@ -86138,7 +86145,7 @@ var _withStyles = __webpack_require__(5); var _withStyles2 = _interopRequireDefault(_withStyles); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -86266,7 +86273,7 @@ var _ButtonBase = __webpack_require__(42); var _ButtonBase2 = _interopRequireDefault(_ButtonBase); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); var _reactHelpers = __webpack_require__(50); @@ -88072,7 +88079,7 @@ var _withStyles = __webpack_require__(5); var _withStyles2 = _interopRequireDefault(_withStyles); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -88218,11 +88225,11 @@ var _reactDom = __webpack_require__(8); var _reactDom2 = _interopRequireDefault(_reactDom); -var _Button = __webpack_require__(27); +var _Button = __webpack_require__(26); var _Button2 = _interopRequireDefault(_Button); -var _TextField = __webpack_require__(31); +var _TextField = __webpack_require__(30); var _TextField2 = _interopRequireDefault(_TextField); @@ -88248,7 +88255,7 @@ var _Icon = __webpack_require__(36); var _Icon2 = _interopRequireDefault(_Icon); -var _IconButton = __webpack_require__(26); +var _IconButton = __webpack_require__(27); var _IconButton2 = _interopRequireDefault(_IconButton); @@ -88432,7 +88439,7 @@ var _ButtonBase = __webpack_require__(42); var _ButtonBase2 = _interopRequireDefault(_ButtonBase); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); var _reactHelpers = __webpack_require__(50); @@ -89817,7 +89824,7 @@ var _withStyles = __webpack_require__(5); var _withStyles2 = _interopRequireDefault(_withStyles); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -91213,7 +91220,7 @@ var _Grow = __webpack_require__(265); var _Grow2 = _interopRequireDefault(_Grow); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); @@ -91792,7 +91799,7 @@ var _addEventListener = __webpack_require__(566); var _addEventListener2 = _interopRequireDefault(_addEventListener); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); var _withStyles = __webpack_require__(5); @@ -93765,7 +93772,7 @@ var _withStyles = __webpack_require__(5); var _withStyles2 = _interopRequireDefault(_withStyles); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -93900,7 +93907,7 @@ var _withStyles = __webpack_require__(5); var _withStyles2 = _interopRequireDefault(_withStyles); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); var _Modal = __webpack_require__(75); @@ -93912,7 +93919,7 @@ var _Fade2 = _interopRequireDefault(_Fade); var _transitions = __webpack_require__(49); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); @@ -94174,7 +94181,7 @@ var _withStyles = __webpack_require__(5); var _withStyles2 = _interopRequireDefault(_withStyles); -__webpack_require__(27); +__webpack_require__(26); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -96420,11 +96427,11 @@ var _reactDom = __webpack_require__(8); var _reactDom2 = _interopRequireDefault(_reactDom); -var _Button = __webpack_require__(27); +var _Button = __webpack_require__(26); var _Button2 = _interopRequireDefault(_Button); -var _TextField = __webpack_require__(31); +var _TextField = __webpack_require__(30); var _TextField2 = _interopRequireDefault(_TextField); @@ -96446,7 +96453,7 @@ var _AddBox = __webpack_require__(272); var _AddBox2 = _interopRequireDefault(_AddBox); -var _IconButton = __webpack_require__(26); +var _IconButton = __webpack_require__(27); var _IconButton2 = _interopRequireDefault(_IconButton); @@ -97355,11 +97362,11 @@ var _reactDom = __webpack_require__(8); var _reactDom2 = _interopRequireDefault(_reactDom); -var _Button = __webpack_require__(27); +var _Button = __webpack_require__(26); var _Button2 = _interopRequireDefault(_Button); -var _TextField = __webpack_require__(31); +var _TextField = __webpack_require__(30); var _TextField2 = _interopRequireDefault(_TextField); @@ -97385,7 +97392,7 @@ var _Icon = __webpack_require__(36); var _Icon2 = _interopRequireDefault(_Icon); -var _IconButton = __webpack_require__(26); +var _IconButton = __webpack_require__(27); var _IconButton2 = _interopRequireDefault(_IconButton); @@ -97399,7 +97406,7 @@ var _RSSModalLayout2 = _interopRequireDefault(_RSSModalLayout); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); @@ -97545,11 +97552,11 @@ var _lodash2 = _interopRequireDefault(_lodash); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); -var _TextField = __webpack_require__(31); +var _TextField = __webpack_require__(30); var _TextField2 = _interopRequireDefault(_TextField); @@ -97583,11 +97590,11 @@ var _RSSTorrentList = __webpack_require__(621); var _RSSTorrentList2 = _interopRequireDefault(_RSSTorrentList); -var _IconButton = __webpack_require__(26); +var _IconButton = __webpack_require__(27); var _IconButton2 = _interopRequireDefault(_IconButton); -var _Button = __webpack_require__(27); +var _Button = __webpack_require__(26); var _Button2 = _interopRequireDefault(_Button); @@ -97795,11 +97802,11 @@ var _reactDom = __webpack_require__(8); var _reactDom2 = _interopRequireDefault(_reactDom); -var _Button = __webpack_require__(27); +var _Button = __webpack_require__(26); var _Button2 = _interopRequireDefault(_Button); -var _TextField = __webpack_require__(31); +var _TextField = __webpack_require__(30); var _TextField2 = _interopRequireDefault(_TextField); @@ -97829,7 +97836,7 @@ var _Icon = __webpack_require__(36); var _Icon2 = _interopRequireDefault(_Icon); -var _IconButton = __webpack_require__(26); +var _IconButton = __webpack_require__(27); var _IconButton2 = _interopRequireDefault(_IconButton); @@ -97847,7 +97854,7 @@ var _Delete2 = _interopRequireDefault(_Delete); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); @@ -98015,11 +98022,11 @@ var _reactDom = __webpack_require__(8); var _reactDom2 = _interopRequireDefault(_reactDom); -var _Button = __webpack_require__(27); +var _Button = __webpack_require__(26); var _Button2 = _interopRequireDefault(_Button); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); @@ -98029,7 +98036,7 @@ var _dxReactGridMaterialUi = __webpack_require__(101); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); @@ -101603,7 +101610,7 @@ var _classnames2 = _interopRequireDefault(_classnames); var _reactPopper = __webpack_require__(640); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); var _RefHolder = __webpack_require__(260); @@ -105036,7 +105043,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -105547,7 +105554,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -105590,7 +105597,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -106529,7 +106536,7 @@ var _withStyles = __webpack_require__(5); var _withStyles2 = _interopRequireDefault(_withStyles); -var _IconButton = __webpack_require__(26); +var _IconButton = __webpack_require__(27); var _IconButton2 = _interopRequireDefault(_IconButton); @@ -107369,7 +107376,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -107412,7 +107419,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -107461,11 +107468,11 @@ var _reactDom = __webpack_require__(8); var _reactDom2 = _interopRequireDefault(_reactDom); -var _Button = __webpack_require__(27); +var _Button = __webpack_require__(26); var _Button2 = _interopRequireDefault(_Button); -var _TextField = __webpack_require__(31); +var _TextField = __webpack_require__(30); var _TextField2 = _interopRequireDefault(_TextField); @@ -107487,7 +107494,7 @@ var _AddBox = __webpack_require__(272); var _AddBox2 = _interopRequireDefault(_AddBox); -var _IconButton = __webpack_require__(26); +var _IconButton = __webpack_require__(27); var _IconButton2 = _interopRequireDefault(_IconButton); @@ -107497,7 +107504,7 @@ var _Delete2 = _interopRequireDefault(_Delete); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); @@ -107680,11 +107687,11 @@ var _reactDom = __webpack_require__(8); var _reactDom2 = _interopRequireDefault(_reactDom); -var _Button = __webpack_require__(27); +var _Button = __webpack_require__(26); var _Button2 = _interopRequireDefault(_Button); -var _TextField = __webpack_require__(31); +var _TextField = __webpack_require__(30); var _TextField2 = _interopRequireDefault(_TextField); @@ -107710,13 +107717,13 @@ var _Icon = __webpack_require__(36); var _Icon2 = _interopRequireDefault(_Icon); -var _IconButton = __webpack_require__(26); +var _IconButton = __webpack_require__(27); var _IconButton2 = _interopRequireDefault(_IconButton); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); @@ -107872,7 +107879,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -107921,7 +107928,7 @@ var _propTypes = __webpack_require__(20); var _propTypes2 = _interopRequireDefault(_propTypes); -var _TextField = __webpack_require__(31); +var _TextField = __webpack_require__(30); var _TextField2 = _interopRequireDefault(_TextField); @@ -107929,7 +107936,7 @@ var _styles = __webpack_require__(19); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); @@ -108043,11 +108050,11 @@ var _reactDom = __webpack_require__(8); var _reactDom2 = _interopRequireDefault(_reactDom); -var _Button = __webpack_require__(27); +var _Button = __webpack_require__(26); var _Button2 = _interopRequireDefault(_Button); -var _TextField = __webpack_require__(31); +var _TextField = __webpack_require__(30); var _TextField2 = _interopRequireDefault(_TextField); @@ -108069,7 +108076,7 @@ var _Icon = __webpack_require__(36); var _Icon2 = _interopRequireDefault(_Icon); -var _IconButton = __webpack_require__(26); +var _IconButton = __webpack_require__(27); var _IconButton2 = _interopRequireDefault(_IconButton); @@ -108083,7 +108090,7 @@ var _settingsModalLayout2 = _interopRequireDefault(_settingsModalLayout); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); @@ -108206,7 +108213,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -108275,11 +108282,11 @@ var _lodash2 = _interopRequireDefault(_lodash); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); -var _TextField = __webpack_require__(31); +var _TextField = __webpack_require__(30); var _TextField2 = _interopRequireDefault(_TextField); @@ -108301,11 +108308,11 @@ var _settingsModalContent = __webpack_require__(677); var _settingsModalContent2 = _interopRequireDefault(_settingsModalContent); -var _IconButton = __webpack_require__(26); +var _IconButton = __webpack_require__(27); var _IconButton2 = _interopRequireDefault(_IconButton); -var _Button = __webpack_require__(27); +var _Button = __webpack_require__(26); var _Button2 = _interopRequireDefault(_Button); @@ -108477,11 +108484,11 @@ var _reactDom = __webpack_require__(8); var _reactDom2 = _interopRequireDefault(_reactDom); -var _Button = __webpack_require__(27); +var _Button = __webpack_require__(26); var _Button2 = _interopRequireDefault(_Button); -var _TextField = __webpack_require__(31); +var _TextField = __webpack_require__(30); var _TextField2 = _interopRequireDefault(_TextField); @@ -108511,7 +108518,7 @@ var _Icon = __webpack_require__(36); var _Icon2 = _interopRequireDefault(_Icon); -var _IconButton = __webpack_require__(26); +var _IconButton = __webpack_require__(27); var _IconButton2 = _interopRequireDefault(_IconButton); @@ -108529,7 +108536,7 @@ var _Delete2 = _interopRequireDefault(_Delete); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); @@ -108676,11 +108683,11 @@ var _reactDom = __webpack_require__(8); var _reactDom2 = _interopRequireDefault(_reactDom); -var _Button = __webpack_require__(27); +var _Button = __webpack_require__(26); var _Button2 = _interopRequireDefault(_Button); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); @@ -109507,7 +109514,7 @@ var _warning2 = _interopRequireDefault(_warning); var _createBreakpoints = __webpack_require__(68); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); var _withStyles = __webpack_require__(5); @@ -109675,7 +109682,7 @@ var _reactDom2 = _interopRequireDefault(_reactDom); var _styles = __webpack_require__(19); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); @@ -109849,7 +109856,7 @@ var _reactDom2 = _interopRequireDefault(_reactDom); var _styles = __webpack_require__(19); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); @@ -110072,7 +110079,7 @@ var _reactDom2 = _interopRequireDefault(_reactDom); var _styles = __webpack_require__(19); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); @@ -110222,7 +110229,7 @@ var _reactDom2 = _interopRequireDefault(_reactDom); var _styles = __webpack_require__(19); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); @@ -110230,8 +110237,22 @@ var _Grid = __webpack_require__(57); var _Grid2 = _interopRequireDefault(_Grid); +var _Button = __webpack_require__(26); + +var _Button2 = _interopRequireDefault(_Button); + +var _TextField = __webpack_require__(30); + +var _TextField2 = _interopRequireDefault(_TextField); + var _reactRedux = __webpack_require__(18); +var _actions = __webpack_require__(22); + +var actionTypes = _interopRequireWildcard(_actions); + +function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } + 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"); } } @@ -110244,7 +110265,8 @@ var styles = function styles(theme) { return { root: { flexGrow: 1, - marginTop: 0 + marginTop: 0, + padding: 10 }, paper: { padding: 16, @@ -110257,8 +110279,8 @@ var styles = function styles(theme) { }; }; -var APISettingsTab = function (_React$PureComponent) { - _inherits(APISettingsTab, _React$PureComponent); +var APISettingsTab = function (_React$Component) { + _inherits(APISettingsTab, _React$Component); function APISettingsTab() { var _ref; @@ -110271,7 +110293,21 @@ var APISettingsTab = function (_React$PureComponent) { args[_key] = arguments[_key]; } - return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_ref = APISettingsTab.__proto__ || Object.getPrototypeOf(APISettingsTab)).call.apply(_ref, [this].concat(args))), _this), _this.requestNewKey = function (keyName) {}, _temp), _possibleConstructorReturn(_this, _ret); + return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_ref = APISettingsTab.__proto__ || Object.getPrototypeOf(APISettingsTab)).call.apply(_ref, [this].concat(args))), _this), _this.state = { + clientName: "" + }, _this.generateKey = function (event) { + var newAuthTokenRequest = { + MessageType: "newAuthToken", + Payload: { "ClientName": _this.state.clientName } + }; + console.log("Sending New Auth Request: ", newAuthTokenRequest); + ws.send(JSON.stringify(newAuthTokenRequest)); + _this.setState({ clientName: "" }); + }, _this.setClientName = function (event) { + _this.setState({ clientName: event.target.value }); + }, _this.componentWillUnmount = function () { + _this.props.newTokenReturn(""); + }, _temp), _possibleConstructorReturn(_this, _ret); } _createClass(APISettingsTab, [{ @@ -110282,21 +110318,50 @@ var APISettingsTab = function (_React$PureComponent) { return _react2.default.createElement( 'div', { className: classes.root }, - 'Not yet implemented!' + _react2.default.createElement(_TextField2.default, { style: { width: '50%', paddingRight: '10px' }, id: 'clientName', type: 'text', label: 'Client Name', placeholder: 'Client Name associated with the key', onChange: this.setClientName }), + _react2.default.createElement( + _Button2.default, + { variant: 'raised', color: 'primary', onClick: this.generateKey }, + 'Generate Key' + ), + _react2.default.createElement( + _Paper2.default, + { style: { padding: '10px' } }, + ' ', + _react2.default.createElement( + 'span', + { className: classes.floatLeft }, + this.props.tokenReturn, + ' ' + ) + ), + _react2.default.createElement( + _Grid2.default, + { container: true, spacing: 16 }, + _react2.default.createElement(_Grid2.default, { item: true, xs: 12, sm: 4 }) + ) ); } }]); return APISettingsTab; -}(_react2.default.PureComponent); +}(_react2.default.Component); var mapStateToProps = function mapStateToProps(state) { return { - settingsFile: state.settingsFile + tokenReturn: state.tokenReturn }; }; -exports.default = (0, _styles.withStyles)(styles)((0, _reactRedux.connect)(mapStateToProps)(APISettingsTab)); +var mapDispatchToProps = function mapDispatchToProps(dispatch) { + return { + newTokenReturn: function newTokenReturn(tokenReturn) { + return dispatch({ type: actionTypes.TOKEN_RETURN, tokenReturn: tokenReturn }); + } + }; +}; + +exports.default = (0, _styles.withStyles)(styles)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(APISettingsTab)); /***/ }), /* 688 */ @@ -110313,7 +110378,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -110356,7 +110421,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -110399,7 +110464,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -110458,7 +110523,7 @@ var _InfoOutline2 = _interopRequireDefault(_InfoOutline); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); @@ -110488,11 +110553,12 @@ var serverMessage = []; var serverPushMessage = []; var webSocketState = false; var settingsFile = []; +var tokenReturn = ""; var torrentListRequest = { MessageType: "torrentListRequest" - //websocket is started in kickwebsocket.js and is picked up here so "ws" is already defined 22 + //websocket is started in kickwebsocket.js and is picked up here so "ws" is already defined };ws.onmessage = function (evt) { //When we recieve a message from the websocket var serverMessage = JSON.parse(evt.data); @@ -110595,6 +110661,10 @@ var torrentListRequest = { settingsFile = []; console.log("Settings File Returned", serverMessage); settingsFile = serverMessage.Config; + + case "TokenReturn": + tokenReturn = serverMessage.TokenReturn; + console.log("Token Returned", serverMessage); } }; @@ -110699,10 +110769,16 @@ var BackendSocket = function (_React$Component) { this.props.newServerMessage(serverPushMessage); } if (this.props.settingsModalOpen) { - //TODO don't really need to updaate every tick currently until we can edit config + //TODO don't really need to update every tick currently until we can edit config this.props.newSettingsFile(settingsFile); } + if (tokenReturn != "") { + //If we get a return token + console.log("Dispatching token return", tokenReturn); + this.props.newTokenReturn(tokenReturn); + } + ws.send(JSON.stringify(torrentListRequest)); //talking to the server to get the torrent list if (ws.readyState === ws.CLOSED) { //if our websocket gets closed inform the user @@ -110742,6 +110818,10 @@ var BackendSocket = function (_React$Component) { //if we have a selection pass it on for the tabs to verify this.selectionHandler(nextProps.selectionHashes, nextProps.selectedTab); } + if (nextProps.tokenReturn != this.props.tokenReturn) { + //clearing out the token if we switch from the API tab + tokenReturn = nextProps.tokenReturn; + } } }, { key: 'render', @@ -110765,7 +110845,8 @@ var mapStateToProps = function mapStateToProps(state) { RSSModalOpen: state.RSSModalOpen, RSSTorrentList: state.RSSTorrentList, serverPushMessage: state.serverPushMessage, - settingsModalOpen: state.settingsModalOpen + settingsModalOpen: state.settingsModalOpen, + tokenReturn: state.tokenReturn }; }; @@ -110798,9 +110879,10 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch) { }, newSettingsFile: function newSettingsFile(settingsFile) { return dispatch({ type: actionTypes.NEW_SETTINGS_FILE, settingsFile: settingsFile }); + }, + newTokenReturn: function newTokenReturn(tokenReturn) { + return dispatch({ type: actionTypes.TOKEN_RETURN, tokenReturn: tokenReturn }); } - //changeSelection: (selection) => dispatch({type: actionTypes.CHANGE_SELECTION, selection}),//forcing an update to the buttons - }; }; @@ -110821,7 +110903,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -110894,7 +110976,7 @@ var _fileTab2 = _interopRequireDefault(_fileTab); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); @@ -111077,9 +111159,9 @@ var _withStyles = __webpack_require__(5); var _withStyles2 = _interopRequireDefault(_withStyles); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); @@ -112181,7 +112263,7 @@ var _withStyles = __webpack_require__(5); var _withStyles2 = _interopRequireDefault(_withStyles); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -112434,7 +112516,7 @@ var _ButtonBase = __webpack_require__(42); var _ButtonBase2 = _interopRequireDefault(_ButtonBase); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -112736,7 +112818,7 @@ var _reactDom2 = _interopRequireDefault(_reactDom); var _styles = __webpack_require__(19); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); @@ -112746,7 +112828,7 @@ var _Grid2 = _interopRequireDefault(_Grid); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); @@ -113065,7 +113147,7 @@ var _reactDom = __webpack_require__(8); var _reactDom2 = _interopRequireDefault(_reactDom); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); @@ -113077,7 +113159,7 @@ var _dxReactGridMaterialUi = __webpack_require__(101); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); @@ -113179,7 +113261,7 @@ var _propTypes = __webpack_require__(14); var _propTypes2 = _interopRequireDefault(_propTypes); -var _classnames = __webpack_require__(30); +var _classnames = __webpack_require__(31); var _classnames2 = _interopRequireDefault(_classnames); @@ -117543,7 +117625,7 @@ var _propTypes = __webpack_require__(14); var _propTypes2 = _interopRequireDefault(_propTypes); -var _classnames = __webpack_require__(30); +var _classnames = __webpack_require__(31); var _classnames2 = _interopRequireDefault(_classnames); @@ -117748,7 +117830,7 @@ var _propTypes = __webpack_require__(14); var _propTypes2 = _interopRequireDefault(_propTypes); -var _classnames = __webpack_require__(30); +var _classnames = __webpack_require__(31); var _classnames2 = _interopRequireDefault(_classnames); @@ -118046,7 +118128,7 @@ var _Const = __webpack_require__(21); var _Const2 = _interopRequireDefault(_Const); -var _classnames = __webpack_require__(30); +var _classnames = __webpack_require__(31); var _classnames2 = _interopRequireDefault(_classnames); @@ -118523,7 +118605,7 @@ var _propTypes = __webpack_require__(14); var _propTypes2 = _interopRequireDefault(_propTypes); -var _classnames = __webpack_require__(30); +var _classnames = __webpack_require__(31); var _classnames2 = _interopRequireDefault(_classnames); @@ -118702,7 +118784,7 @@ var _TableEditColumn = __webpack_require__(728); var _TableEditColumn2 = _interopRequireDefault(_TableEditColumn); -var _classnames = __webpack_require__(30); +var _classnames = __webpack_require__(31); var _classnames2 = _interopRequireDefault(_classnames); @@ -119480,7 +119562,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument 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 _classnames = __webpack_require__(30); +var _classnames = __webpack_require__(31); var _classnames2 = _interopRequireDefault(_classnames); @@ -120043,7 +120125,7 @@ var _Editor2 = _interopRequireDefault(_Editor); var _Notification = __webpack_require__(296); -var _classnames = __webpack_require__(30); +var _classnames = __webpack_require__(31); var _classnames2 = _interopRequireDefault(_classnames); @@ -120483,7 +120565,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _classnames = __webpack_require__(30); +var _classnames = __webpack_require__(31); var _classnames2 = _interopRequireDefault(_classnames); @@ -120571,7 +120653,7 @@ var _propTypes = __webpack_require__(14); var _propTypes2 = _interopRequireDefault(_propTypes); -var _classnames = __webpack_require__(30); +var _classnames = __webpack_require__(31); var _classnames2 = _interopRequireDefault(_classnames); @@ -121060,7 +121142,7 @@ var _propTypes = __webpack_require__(14); var _propTypes2 = _interopRequireDefault(_propTypes); -var _classnames = __webpack_require__(30); +var _classnames = __webpack_require__(31); var _classnames2 = _interopRequireDefault(_classnames); @@ -123035,7 +123117,7 @@ var _Const = __webpack_require__(21); var _Const2 = _interopRequireDefault(_Const); -var _classnames = __webpack_require__(30); +var _classnames = __webpack_require__(31); var _classnames2 = _interopRequireDefault(_classnames); @@ -124881,11 +124963,11 @@ var _reactDom = __webpack_require__(8); var _reactDom2 = _interopRequireDefault(_reactDom); -var _Button = __webpack_require__(27); +var _Button = __webpack_require__(26); var _Button2 = _interopRequireDefault(_Button); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); @@ -124897,7 +124979,7 @@ var _dxReactGridMaterialUi = __webpack_require__(101); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); @@ -125087,7 +125169,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__BottomNavigation___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3__BottomNavigation__); /* harmony reexport (default from non-hamory) */ __webpack_require__.d(__webpack_exports__, "BottomNavigation", function() { return __WEBPACK_IMPORTED_MODULE_3__BottomNavigation___default.a; }); /* harmony reexport (binding) */ if(__webpack_require__.o(__WEBPACK_IMPORTED_MODULE_3__BottomNavigation__, "BottomNavigationAction")) __webpack_require__.d(__webpack_exports__, "BottomNavigationAction", function() { return __WEBPACK_IMPORTED_MODULE_3__BottomNavigation__["BottomNavigationAction"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__Button__ = __webpack_require__(27); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__Button__ = __webpack_require__(26); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__Button___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4__Button__); /* harmony reexport (default from non-hamory) */ __webpack_require__.d(__webpack_exports__, "Button", function() { return __WEBPACK_IMPORTED_MODULE_4__Button___default.a; }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__ButtonBase__ = __webpack_require__(42); @@ -125142,7 +125224,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__Icon__ = __webpack_require__(36); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__Icon___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_16__Icon__); /* harmony reexport (default from non-hamory) */ __webpack_require__.d(__webpack_exports__, "Icon", function() { return __WEBPACK_IMPORTED_MODULE_16__Icon___default.a; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__IconButton__ = __webpack_require__(26); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__IconButton__ = __webpack_require__(27); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__IconButton___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_17__IconButton__); /* harmony reexport (default from non-hamory) */ __webpack_require__.d(__webpack_exports__, "IconButton", function() { return __WEBPACK_IMPORTED_MODULE_17__IconButton___default.a; }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_18__Input__ = __webpack_require__(74); @@ -125180,7 +125262,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); /* harmony reexport (default from non-hamory) */ __webpack_require__.d(__webpack_exports__, "Modal", function() { return __WEBPACK_IMPORTED_MODULE_24__Modal___default.a; }); /* harmony reexport (binding) */ if(__webpack_require__.o(__WEBPACK_IMPORTED_MODULE_24__Modal__, "Backdrop")) __webpack_require__.d(__webpack_exports__, "Backdrop", function() { return __WEBPACK_IMPORTED_MODULE_24__Modal__["Backdrop"]; }); /* harmony reexport (binding) */ if(__webpack_require__.o(__WEBPACK_IMPORTED_MODULE_24__Modal__, "ModalManager")) __webpack_require__.d(__webpack_exports__, "ModalManager", function() { return __WEBPACK_IMPORTED_MODULE_24__Modal__["ModalManager"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_25__Paper__ = __webpack_require__(23); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_25__Paper__ = __webpack_require__(24); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_25__Paper___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_25__Paper__); /* harmony reexport (default from non-hamory) */ __webpack_require__.d(__webpack_exports__, "Paper", function() { return __WEBPACK_IMPORTED_MODULE_25__Paper___default.a; }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_26__Popover__ = __webpack_require__(148); @@ -125248,7 +125330,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_40__Typography__ = __webpack_require__(44); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_40__Typography___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_40__Typography__); /* harmony reexport (default from non-hamory) */ __webpack_require__.d(__webpack_exports__, "Typography", function() { return __WEBPACK_IMPORTED_MODULE_40__Typography___default.a; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_41__TextField__ = __webpack_require__(31); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_41__TextField__ = __webpack_require__(30); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_41__TextField___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_41__TextField__); /* harmony reexport (default from non-hamory) */ __webpack_require__.d(__webpack_exports__, "TextField", function() { return __WEBPACK_IMPORTED_MODULE_41__TextField___default.a; }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_42__Toolbar__ = __webpack_require__(167); @@ -125410,7 +125492,7 @@ var _withStyles = __webpack_require__(5); var _withStyles2 = _interopRequireDefault(_withStyles); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -125981,7 +126063,7 @@ var _propTypes = __webpack_require__(2); var _propTypes2 = _interopRequireDefault(_propTypes); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); @@ -126680,11 +126762,11 @@ var _Slide = __webpack_require__(173); var _Slide2 = _interopRequireDefault(_Slide); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); var _transitions = __webpack_require__(49); @@ -127053,7 +127135,7 @@ var _Collapse = __webpack_require__(174); var _Collapse2 = _interopRequireDefault(_Collapse); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); @@ -127504,7 +127586,7 @@ var _ButtonBase = __webpack_require__(42); var _ButtonBase2 = _interopRequireDefault(_ButtonBase); -var _IconButton = __webpack_require__(26); +var _IconButton = __webpack_require__(27); var _IconButton2 = _interopRequireDefault(_IconButton); @@ -128368,11 +128450,11 @@ var _withStyles = __webpack_require__(5); var _withStyles2 = _interopRequireDefault(_withStyles); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); var _Progress = __webpack_require__(315); @@ -128544,7 +128626,7 @@ var _withStyles = __webpack_require__(5); var _withStyles2 = _interopRequireDefault(_withStyles); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -129333,7 +129415,7 @@ var _FormGroup = __webpack_require__(253); var _FormGroup2 = _interopRequireDefault(_FormGroup); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -129693,7 +129775,7 @@ var _ClickAwayListener = __webpack_require__(313); var _ClickAwayListener2 = _interopRequireDefault(_ClickAwayListener); -var _helpers = __webpack_require__(22); +var _helpers = __webpack_require__(23); var _Slide = __webpack_require__(173); @@ -130183,7 +130265,7 @@ var _withStyles = __webpack_require__(5); var _withStyles2 = _interopRequireDefault(_withStyles); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); @@ -132246,7 +132328,7 @@ var _Stop2 = _interopRequireDefault(_Stop); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); @@ -132443,7 +132525,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -132486,7 +132568,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -132529,7 +132611,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -132572,7 +132654,7 @@ var _react = __webpack_require__(0); var _react2 = _interopRequireDefault(_react); -var _pure = __webpack_require__(24); +var _pure = __webpack_require__(25); var _pure2 = _interopRequireDefault(_pure); @@ -132627,7 +132709,7 @@ var _reactBootstrapTableAllMin2 = _interopRequireDefault(_reactBootstrapTableAll var _reactBootstrapTable = __webpack_require__(290); -var _Paper = __webpack_require__(23); +var _Paper = __webpack_require__(24); var _Paper2 = _interopRequireDefault(_Paper); @@ -132639,7 +132721,7 @@ var _progressBarCell = __webpack_require__(312); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); @@ -132865,7 +132947,7 @@ var _react2 = _interopRequireDefault(_react); var _reactRedux = __webpack_require__(18); -var _actions = __webpack_require__(25); +var _actions = __webpack_require__(22); var actionTypes = _interopRequireWildcard(_actions); @@ -136749,11 +136831,11 @@ var _reactDom = __webpack_require__(8); var _reactDom2 = _interopRequireDefault(_reactDom); -var _Button = __webpack_require__(27); +var _Button = __webpack_require__(26); var _Button2 = _interopRequireDefault(_Button); -var _TextField = __webpack_require__(31); +var _TextField = __webpack_require__(30); var _TextField2 = _interopRequireDefault(_TextField); @@ -136783,7 +136865,7 @@ var _Icon = __webpack_require__(36); var _Icon2 = _interopRequireDefault(_Icon); -var _IconButton = __webpack_require__(26); +var _IconButton = __webpack_require__(27); var _IconButton2 = _interopRequireDefault(_IconButton); diff --git a/settings/authentication_helper.go b/settings/authentication_helper.go index ffaf35ac..41aa94c8 100644 --- a/settings/authentication_helper.go +++ b/settings/authentication_helper.go @@ -8,12 +8,15 @@ import ( "github.com/sirupsen/logrus" ) +//AuthRequest is a struct sent by a client with an authstring (JWT Token) to validate they have access to the server type AuthRequest struct { MessageType string `json:"MessageType"` AuthString string `json:"AuthString"` } +//TokenReturn is a struct sent by the server to a client with a new generated authstring type TokenReturn struct { + MessageType string `json:"MessageType"` TokenReturn string `json:"TokenReturn"` }