Merge branch 'master' into master

client/actions/checks.js

@@ -3,6 +3,8 @@ import { PENDING, SUCCESS, ERROR } from '../actions/status'
 
 export const PUT_CHECK = Symbol('put check')
 export const DELETE_CHECK = Symbol('delete check')
+export const REFRESH_TOKEN = Symbol('refresh token')
+
 
 function putCheck(status, payload = null) {
   return {
@@ -50,3 +52,35 @@ export function toggleCheck(check) {
     return disableCheck(check)
   }
 }
+
+function refreshToken(status, payload = null) {
+  return {
+    type: REFRESH_TOKEN,
+    status,
+    payload
+  }
+}
+
+function updateTokenForChecks(repo, reloadReposFn){
+  return (dispatch) => {
+    dispatch(refreshToken(PENDING, {}))
+    CheckService.refreshTokens(repo.id)
+                .then((successMsg) => {
+                  dispatch(refreshToken(SUCCESS, successMsg))
+                  dispatch(reloadReposFn(true))
+                })
+                .catch(err => dispatch(refreshToken(ERROR, err)))
+  }
+}
+
+/**
+ * Refresh access token with new user logged in (1% case)
+ * @param {*} repo - repository data
+ */
+export function requestRefreshToken(repo, reloadReposFn) {
+  if(repo) {
+    return updateTokenForChecks(repo, reloadReposFn)
+  } else {
+    return {}
+  }
+} 

client/components/RefreshTokenButton.jsx

@@ -0,0 +1,9 @@
+import React from 'react';
+import { Button } from 'react-bootstrap';
+
+export default function RefreshTokenButton() {
+  return <Button>
+    <span className={classes('fa', 'fa-fw', 'fa-refresh')}></span>
+      Refresh OAuth Token
+  </Button>
+};

client/components/RepositoryBrowser.jsx

@@ -30,7 +30,6 @@ export default class RepositoryBrowser extends Component {
         <Button
           style={{marginLeft: 15}}
           disabled={isFetching}
-          lg
           onClick={this.onFetchAll.bind(this)}>
           <i className={classes('fa', 'fa-refresh', {'fa-spin': isFetching})}/>&nbsp;Sync with Github
         </Button>

client/components/RepositoryCheck.jsx

@@ -45,10 +45,11 @@ export default class RepositoryCheck extends Component {
       marginLeft: 15
     }
     const {check, onToggle} = this.props
+    // ToDo: Change this to show "updated_by" value 
     const checkMeta = check.isEnabled ?
       (!!check.created_by ?
         <span>was enabled by <a href={`${this.props.githubUrl}/${check.created_by}`}>@{check.created_by}</a> <Time
-          value={check.createdAt} relative/></span> :
+          value={check.updatedAt} relative/></span> :
           <span>is enabled</span>) :
       <span>is disabled</span>
     const header = (

client/components/RepositoryConfigValidation.jsx

@@ -80,7 +80,7 @@ class Result extends React.Component {
   }
 }
 
-export default function RepositoryConfigValidation({validation, onValidate}) {
+export default function RepositoryConfigValidation({validation, onValidate, onRefreshToken, isRefreshing}) {
   const placeholder = <div style={{marginTop: '1em'}} />
   let result = placeholder
   if (validationFinished(validation.status)) {
@@ -90,7 +90,7 @@ export default function RepositoryConfigValidation({validation, onValidate}) {
   } else if (validation.error) {
     result = <Alert style={{marginTop: '1em'}} bsStyle='danger'>{validation.error.status} {validation.error.title}</Alert>
   }
-  return <div>
+  return (<div>
     <Button onClick={onValidate}>
       <span className={classes('fa', 'fa-fw', {
         'fa-spin': validation.status === Status.PENDING,
@@ -99,8 +99,16 @@ export default function RepositoryConfigValidation({validation, onValidate}) {
       })}/>
         Validate Zappr configuration
     </Button>
+    <Button onClick={onRefreshToken} className="button-refreshToken"> 
+      <span className={classes('fa', 'fa-fw', {
+        'fa-spin ': isRefreshing,
+        'fa-refresh': isRefreshing, 
+        'fa-info-circle': !isRefreshing
+      })} />
+      Refresh OAuth Token
+    </Button>
     {result}
-  </div>
+  </div>);
 }
 
 RepositoryConfigValidation.propTypes = {
@@ -109,5 +117,7 @@ RepositoryConfigValidation.propTypes = {
     message: PropTypes.string,
     config: PropTypes.object
   }).isRequired,
-  onValidate: PropTypes.func.isRequired
+  onValidate: PropTypes.func.isRequired,
+  onRefreshToken: PropTypes.func.isRequired,
+  isRefreshing: PropTypes.bool.isRequired,
 }

client/containers/RepositoryDetail.jsx

@@ -5,26 +5,31 @@ import DocumentTitle from 'react-document-title'
 
 import RepositoryCheck from './../components/RepositoryCheck.jsx'
 import ConfigValidation from './../components/RepositoryConfigValidation.jsx'
-import { toggleCheck } from '../actions/checks'
+import { toggleCheck, requestRefreshToken } from '../actions/checks'
+import { requestReposIfNeeded } from '../actions/repos';
 import { requestConfigValidation } from '../actions/validate'
 
 import { checkId } from '../model/schema'
 import { CHECK_TYPES, CHECK_NAMES } from '../../server/checks'
 
 function mapStateToProps(state) {
   return {
-    githubUrl: state.env.GITHUB_UI_URL
+    githubUrl: state.env.GITHUB_UI_URL,
+    isRefreshing: state.isRefreshingToken
   }
 }
 
 class RepositoryDetail extends Component {
+
   static propTypes = {
     repository: PropTypes.object.isRequired,
     checks: PropTypes.object.isRequired,
     validations: PropTypes.object.isRequired,
     githubUrl: PropTypes.string,
     toggleCheck: PropTypes.func.isRequired,
-    requestConfigValidation: PropTypes.func.isRequired
+    requestConfigValidation: PropTypes.func.isRequired,
+    requestRefreshToken: PropTypes.func.isRequired,
+    requestReposIfNeeded: PropTypes.func.isRequired,
   };
 
   onToggleCheck(check, isChecked) {
@@ -35,10 +40,15 @@ class RepositoryDetail extends Component {
     this.props.requestConfigValidation(repo)
   }
 
+  shouldRefreshToken(repo) {
+    this.props.requestRefreshToken(repo, this.props.requestReposIfNeeded)
+  }
+
   render() {
     if (!this.props.repository.full_name) return null
 
     const {repository, checks, validations} = this.props
+    const { isRefreshingToken } = checks;
     const header = (<h2>{repository.full_name}</h2>)
 
     return (
@@ -60,7 +70,11 @@ class RepositoryDetail extends Component {
           <Col md={12}>
             <ConfigValidation
               validation={validations[repository.full_name]}
-              onValidate={this.onValidateConfig.bind(this, repository)}/>
+              onValidate={this.onValidateConfig.bind(this, repository)}
+              isRefreshing={isRefreshingToken}
+              onRefreshToken={this.shouldRefreshToken.bind(this, repository)}
+              />
+              <span>Test</span>
           </Col>
           <Col md={12}>
             {CHECK_TYPES
@@ -85,4 +99,4 @@ class RepositoryDetail extends Component {
   }
 }
 
-export default connect(mapStateToProps, {toggleCheck, requestConfigValidation})(RepositoryDetail)
+export default connect(mapStateToProps, {toggleCheck, requestRefreshToken, requestConfigValidation, requestReposIfNeeded})(RepositoryDetail)

client/css/main.css

@@ -57,3 +57,7 @@ label.btn-primary.toggle-on:active {
       }
   }
 }
+
+.button-refreshToken {
+  float: right;
+}

client/reducers/repos/checks.js

@@ -1,5 +1,5 @@
 import { PENDING, SUCCESS, ERROR } from '../../actions/status'
-import { PUT_CHECK, DELETE_CHECK } from '../../actions/checks'
+import { PUT_CHECK, DELETE_CHECK, REFRESH_TOKEN } from '../../actions/checks'
 import { GET_REPOS } from '../../actions/repos'
 import { mapValues } from '../../../common/util'
 
@@ -68,7 +68,7 @@ function check(state = {
   }
 }
 
-export default function checks(state = {}, action) {
+export default function checks(state = { isRefreshingToken: false, error: false}, action) {
   switch (action.type) {
     case GET_REPOS:
       switch (action.status) {
@@ -79,6 +79,25 @@ export default function checks(state = {}, action) {
         default:
           return state
       }
+    case REFRESH_TOKEN:
+      switch(action.status) {
+        case PENDING:
+          return {...state, isRefreshingToken: true}
+        case SUCCESS:
+          return {
+            ...state,
+            isRefreshingToken: false,
+            error: false
+          }
+        case ERROR: 
+          return {
+            ...state,
+            isRefreshingToken: false,
+            error: action.payload
+          }
+        default: 
+          return state
+      }
     case PUT_CHECK:
     case DELETE_CHECK:
       return {

client/service/CheckService.js

@@ -70,4 +70,25 @@ export default class CheckService extends Service {
       }
     })
   }
+
+  static refreshTokens(repoId) {
+    return fetch(Service.url(`/api/repos/${repoId}/refreshTokens`), {
+      method: 'POST',
+      headers: {
+        'Accept': 'application/json',
+        'Content-Type': 'application/json'
+      },
+      credentials: 'same-origin'
+    }).then(response => {
+      return new Promise((resolve, reject) => {
+        return response.json().then(json => {
+          if(response.ok) {
+            resolve(json)
+          } else {
+            reject(json)
+          }
+        })
+      });
+    })
+  }
 }

migrations/007-add-prmergecommit-enum-value.js

@@ -0,0 +1,7 @@
+module.exports.up = function up(queryInterface) {
+  return queryInterface.sequelize.query(`ALTER TYPE zappr_data.enum_checks_type ADD VALUE IF NOT EXISTS 'pullrequestmergecommit';`)
+}
+module.exports.down = function down() {
+  // there is no good downgrade
+  return Promise.resolve()
+}

migrations/008-add-prmilestone-enum-value.js

@@ -0,0 +1,7 @@
+module.exports.up = function up(queryInterface) {
+  return queryInterface.sequelize.query(`ALTER TYPE zappr_data.enum_checks_type ADD VALUE IF NOT EXISTS 'pullrequestmilestone';`)
+}
+module.exports.down = function down() {
+  // there is no good downgrade
+  return Promise.resolve()
+}