Adding all the basic logic for refreshing token

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, refreshingToken = true, refreshToken}) {
   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,10 +99,15 @@ export default function RepositoryConfigValidation({validation, onValidate}) {
       })}/>
         Validate Zappr configuration
     </Button>
+    <Button onClick={refreshToken}>
+    <span className={classes('fa', 'fa-fw', 'fa-refresh')}></span>
+      Refresh OAuth Token
+    </Button>
     {result}
-  </div>
+  </div>);
 }
 
+
 RepositoryConfigValidation.propTypes = {
   validation: PropTypes.shape({
     status: PropTypes.symbol,

client/containers/RepositoryDetail.jsx

@@ -35,9 +35,13 @@ class RepositoryDetail extends Component {
     this.props.requestConfigValidation(repo)
   }
 
+  shouldRefreshToken() {
+    console.log("refresh Token");
+    // this.props.requestNewToken();
+  }
+
   render() {
     if (!this.props.repository.full_name) return null
-
     const {repository, checks, validations} = this.props
     const header = (<h2>{repository.full_name}</h2>)
 
@@ -60,7 +64,8 @@ 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)}
+              refreshToken={this.shouldRefreshToken()}/>
           </Col>
           <Col md={12}>
             {CHECK_TYPES

client/service/RepoService.js

@@ -32,4 +32,26 @@ export default class RepoService 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',
+      body: {}
+    }).then(response => {
+      return new Promise((resolve, reject) => {
+        return response.json().then(json => {
+          if(response.ok) {
+            resolve(json)
+          } else {
+            reject(json)
+          }
+        })
+      });
+    })
+  }
 }

config/config.yaml

@@ -7,8 +7,8 @@ SESSION_SECRET: secret
 
 # Override Github client id and secret with your
 # own values as defined in your Github account.
-GITHUB_CLIENT_ID: clientId
-GITHUB_CLIENT_SECRET: clientSecret
+GITHUB_CLIENT_ID: 72b6d96339bf1c5d5257
+GITHUB_CLIENT_SECRET: b754189140f9c0e17a9c44e9feaf1d0764ed9a06
 GITHUB_HOOK_SECRET: captainHook
 GITHUB_ACCESS_LEVELS:
   minimal:
@@ -26,7 +26,7 @@ GITHUB_API_URL: https://api.github.com
 
 # Address of the web application host
 # that ZAPPR is going to run on.
-HOST_ADDR: http://localhost:8080
+#HOST_ADDR: http://localhost:8080
 APP_PORT: 3000
 METRICS_PORT: 3003
 METRICS_ENABLED: true

docker-compose.yaml

@@ -26,5 +26,5 @@ services:
       - DB_HOST=database
       - NODE_ENV=development
       - HOST_ADDR=http://$DM_IP:3000
-      - GITHUB_CLIENT_ID
-      - GITHUB_CLIENT_SECRET
+      - GITHUB_CLIENT_ID=72b6d96339bf1c5d5257
+      - GITHUB_CLIENT_SECRET=b754189140f9c0e17a9c44e9feaf1d0764ed9a06

server/handler/CheckHandler.js

@@ -50,10 +50,15 @@ export class CheckHandler {
     }
   }
 
-  onRefreshTokens(repoIds, token) {
-    // noop for now
-    // implement this when we fucked up
-    return Promise.resolve()
+  async onRefreshTokens(repoIds, token, user) {
+    debug(`refreshing token for all checks for repo ${repoId} w/ token ${token ? token.substr(0, 4) : 'NONE'} by user ${user} `)
+    return await Check.update({ token: token },
+      {
+        where: {
+          repositoryId: repoId,
+        },
+        returning: true
+      });
   }
 
   /**
@@ -71,7 +76,7 @@ export class CheckHandler {
           repositoryId: repoId,
           type
         }
-      })
+      });
     } catch (e) {
       throw new CheckHandlerError(DATABASE_ERROR, {type, repository: repoId})
     }

server/handler/UserHandler.js

@@ -12,6 +12,7 @@ export class UserHandler {
   onChangeLevel(userId, access_level) {
     return User.update({access_level}, {where: {id: userId}})
   }
+
 }
 
 export default new UserHandler()

server/routes/api.js

@@ -86,6 +86,18 @@ export function repo(router) {
       ctx.throw(404, e)
     }
   })
+  .post('/api/repos/:id/refreshTokens', requireAuth, async(ctx) => { 
+    try{
+      const user = ctx.req.user;
+      const token = user.accessToken
+      const id = parseInt(ctx.params.id)
+      const updatedTokens = await checkHandler.onRefreshTokens(id, token, user);
+      ctx.body = updatedTokens;
+      ctx.response.status = 204;
+    } catch(e) {
+      ctx.throw(404, e)
+    }
+  })
   .get('/api/repos/:id/zapprfile', requireAuth, async(ctx) => {
     const user = ctx.req.user
     const id = parseInt(ctx.params.id, 10)