From 64274810d7275c6d4cd0cb6baf7ea01180b2c362 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Mon, 11 May 2015 12:08:59 -0700 Subject: [PATCH] Fix programmer error in login flow --- scripts/deploy | 4 +++- src/coffee/controllers/login_page_controller.coffee | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/deploy b/scripts/deploy index 6b2aa4a16..fc13a62f1 100755 --- a/scripts/deploy +++ b/scripts/deploy @@ -24,8 +24,10 @@ fi if [[ "$TARGET" == "staging" ]]; then TARGET_DIR="s3://new.$SITE/" + BUILD_CMD="build" elif [[ "$TARGET" == "production" ]]; then TARGET_DIR="s3://$SITE/" + BUILD_CMD="dist" fi S3CMD_CFG="$HOME/.s3cfg" @@ -35,7 +37,7 @@ if [[ ! -e "$S3CMD_CFG" ]]; then cat $AWS_CONFIG_FILE | grep "aws_secret_access_key" | sed "s/aws_secret_access_key/secret_key/" >> "$S3CMD_CFG" fi -if grunt clean dist; then +if grunt clean $BUILD_CMD; then echo "Preparing to upload to S3..." s3cmd sync -r --add-header="cache-control:max-age=1800" $SOURCE_DIR $TARGET_DIR echo "S3 Upload Complete" diff --git a/src/coffee/controllers/login_page_controller.coffee b/src/coffee/controllers/login_page_controller.coffee index 1e3fdb9b6..0bfaaa71a 100644 --- a/src/coffee/controllers/login_page_controller.coffee +++ b/src/coffee/controllers/login_page_controller.coffee @@ -73,12 +73,12 @@ module.exports = class LoginPageController extends PageController if (not @user?) and (@params?.state is @loginSecurityToken) @client.completeGitHubLogin code:@params.code - .then (response)-> + .then (response)=> attributes = response.json.data.user if attributes? router.user = new User attributes router.resumeAfterLogin() - .catch (error)-> + .catch (error)=> logger.error "Failed to get access token: #{error}" @_accessTokenLookupFailed = true @refresh()