From 4115a7c59b84134b17d57fd7632e993a2c5ac1a4 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 16 Jun 2015 15:25:21 +0200 Subject: [PATCH] Don't check scopes for Travis Become --- app/utils/auth.coffee | 9 +++++++-- waiter/lib/travis/web/set_token.rb | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/utils/auth.coffee b/app/utils/auth.coffee index 6a894333..11d22f46 100644 --- a/app/utils/auth.coffee +++ b/app/utils/auth.coffee @@ -52,11 +52,16 @@ Auth = Ember.Object.extend null validateUser: (user) -> - fieldsToValidate = ['id', 'login', 'token', 'correct_scopes'] + fieldsToValidate = ['id', 'login', 'token'] + isTravisBecome = sessionStorage.getItem('travis.become') + + unless isTravisBecome + fieldsToValidate.push 'correct_scopes' + if config.pro fieldsToValidate.push 'channels' - fieldsToValidate.every( (field) => @validateHas(field, user) ) && user.correct_scopes + fieldsToValidate.every( (field) => @validateHas(field, user) ) && (isTravisBecome || user.correct_scopes) validateHas: (field, user) -> if user[field] diff --git a/waiter/lib/travis/web/set_token.rb b/waiter/lib/travis/web/set_token.rb index af73cbdc..82907ae8 100644 --- a/waiter/lib/travis/web/set_token.rb +++ b/waiter/lib/travis/web/set_token.rb @@ -33,5 +33,6 @@ __END__ var storage = %s; storage.setItem('travis.token', %p); storage.setItem('travis.user', %p); +storage.setItem('travis.become', true); window.location = %p;