From 47d89515357c44c00f65fa5136833d4f56424a20 Mon Sep 17 00:00:00 2001 From: Lisa P Date: Tue, 25 Aug 2015 16:08:34 -0400 Subject: [PATCH 1/3] try to authenticate request if logged in/ on pro --- app/routes/dashboard/repositories.coffee | 1 - app/routes/owner.coffee | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/routes/dashboard/repositories.coffee b/app/routes/dashboard/repositories.coffee index aafd4778..1cc081e3 100644 --- a/app/routes/dashboard/repositories.coffee +++ b/app/routes/dashboard/repositories.coffee @@ -7,7 +7,6 @@ Route = TravisRoute.extend filter: { replace: true } model: -> apiEndpoint = config.apiEndpoint - console.log(@auth) $.ajax(apiEndpoint + '/v3/repos?repository.active=true', { # $.ajax(apiEndpoint + '/v3/#{params.owner}?include=user.repositories,organization.repositories,build.commit', { headers: { diff --git a/app/routes/owner.coffee b/app/routes/owner.coffee index 615afb0c..c2cfacd9 100644 --- a/app/routes/owner.coffee +++ b/app/routes/owner.coffee @@ -4,11 +4,19 @@ `import config from 'travis/config/environment'` Route = TravisRoute.extend + deactivate: -> @controllerFor('loading').set('layoutName', null) model: (params) -> - $.get(config.apiEndpoint + "/v3/owner/#{params.owner}") + if @get('auth.signedIn') + $.get(config.apiEndpoint + "/v3/owner/#{params.owner}", { + headers: { + Authorization: "token #{@auth.token()}" + } + }) + else + $.get(config.apiEndpoint + "/v3/owner/#{params.owner}") beforeModel: -> @controllerFor('loading').set('layoutName', 'simple') From d6fa74c8f6cf0e403447bbb7552bcea11614f6fc Mon Sep 17 00:00:00 2001 From: Lisa P Date: Wed, 26 Aug 2015 11:11:12 -0400 Subject: [PATCH 2/3] authenticate owner request for realz --- app/routes/owner.coffee | 13 +++++-------- app/routes/owner/repositories.coffee | 7 ++++++- app/templates/components/owner-repo-tile.hbs | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/routes/owner.coffee b/app/routes/owner.coffee index c2cfacd9..ac963728 100644 --- a/app/routes/owner.coffee +++ b/app/routes/owner.coffee @@ -9,14 +9,11 @@ Route = TravisRoute.extend @controllerFor('loading').set('layoutName', null) model: (params) -> - if @get('auth.signedIn') - $.get(config.apiEndpoint + "/v3/owner/#{params.owner}", { - headers: { - Authorization: "token #{@auth.token()}" - } - }) - else - $.get(config.apiEndpoint + "/v3/owner/#{params.owner}") + $.ajax(config.apiEndpoint + "/v3/owner/#{params.owner}", { + headers: { + Authorization: "token #{@auth.token()}" + } + }) beforeModel: -> @controllerFor('loading').set('layoutName', 'simple') diff --git a/app/routes/owner/repositories.coffee b/app/routes/owner/repositories.coffee index 11fca69b..0e31bdb0 100644 --- a/app/routes/owner/repositories.coffee +++ b/app/routes/owner/repositories.coffee @@ -10,6 +10,11 @@ Route = TravisRoute.extend "#{model.name}" model: (params, transition) -> - $.get(config.apiEndpoint + "/v3/owner/#{transition.params.owner.owner}?include=user.repositories,organization.repositories,build.commit,repository.active") + $.ajax(config.apiEndpoint + "/v3/owner/#{transition.params.owner.owner}?include=user.repositories,organization.repositories,build.commit,repository.active", { + headers: { + Authorization: "token #{@auth.token()}" + }, + type: "GET" + }) `export default Route` diff --git a/app/templates/components/owner-repo-tile.hbs b/app/templates/components/owner-repo-tile.hbs index a9cb5749..5b79dc44 100644 --- a/app/templates/components/owner-repo-tile.hbs +++ b/app/templates/components/owner-repo-tile.hbs @@ -1,6 +1,6 @@ -{{#if repo.private }} +{{!-- {{#if repo.private }}
-{{/if}} +{{/if}} --}}
{{#if isAnimating}} From 978b35b6ca646b5c0732fcc4dde41bb00e41832b Mon Sep 17 00:00:00 2001 From: Lisa P Date: Wed, 26 Aug 2015 11:33:19 -0400 Subject: [PATCH 3/3] check if user is signed in --- app/routes/owner.coffee | 9 ++++----- app/routes/owner/repositories.coffee | 10 ++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/routes/owner.coffee b/app/routes/owner.coffee index ac963728..2ae81837 100644 --- a/app/routes/owner.coffee +++ b/app/routes/owner.coffee @@ -9,11 +9,10 @@ Route = TravisRoute.extend @controllerFor('loading').set('layoutName', null) model: (params) -> - $.ajax(config.apiEndpoint + "/v3/owner/#{params.owner}", { - headers: { - Authorization: "token #{@auth.token()}" - } - }) + options = {} + if @get('auth.signedIn') + options.headers = { Authorization: "token #{@auth.token()}" } + $.ajax(config.apiEndpoint + "/v3/owner/#{params.owner}", options) beforeModel: -> @controllerFor('loading').set('layoutName', 'simple') diff --git a/app/routes/owner/repositories.coffee b/app/routes/owner/repositories.coffee index 0e31bdb0..404c2574 100644 --- a/app/routes/owner/repositories.coffee +++ b/app/routes/owner/repositories.coffee @@ -10,11 +10,9 @@ Route = TravisRoute.extend "#{model.name}" model: (params, transition) -> - $.ajax(config.apiEndpoint + "/v3/owner/#{transition.params.owner.owner}?include=user.repositories,organization.repositories,build.commit,repository.active", { - headers: { - Authorization: "token #{@auth.token()}" - }, - type: "GET" - }) + options = {} + if @get('auth.signedIn') + options.headers = { Authorization: "token #{@auth.token()}" } + $.ajax(config.apiEndpoint + "/v3/owner/#{transition.params.owner.owner}?include=user.repositories,organization.repositories,build.commit,repository.active", options) `export default Route`