Skip to content

Commit 8befc06

Browse files
committed
Sync with giraffeql-boilerplate f93cbcc
1 parent 9b9dd6f commit 8befc06

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

frontend/components/common/releaseHistory.vue

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,17 @@ export default {
4747
async loadData() {
4848
this.loading.loadData = true
4949
try {
50-
this.releases = await executeGiraffeql(this, {
51-
getRepositoryReleases: {
52-
__args: {
53-
first: 5,
50+
this.releases = await executeGiraffeql(
51+
this,
52+
{
53+
getRepositoryReleases: {
54+
__args: {
55+
first: 5,
56+
},
5457
},
5558
},
56-
})
59+
true
60+
)
5761
} catch (err) {
5862
// do nothing
5963
}

frontend/layouts/default.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,9 @@ export default {
257257
258258
logout() {
259259
try {
260-
this.$router.push('/')
261-
262260
firebase.auth().signOut()
261+
262+
this.$router.push('/')
263263
} catch (err) {
264264
handleError(this, err)
265265
}

frontend/services/giraffeql.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ const prodResource = axios.create({
99

1010
export async function executeGiraffeql<Key extends keyof Root>(
1111
_that,
12-
query: GetQuery<Key>
12+
query: GetQuery<Key>,
13+
omitIdToken = false
1314
): Promise<GetResponse<Key>> {
1415
// fetches the idToken
1516
const currentUser = firebase.auth().currentUser
16-
const idToken = currentUser ? await currentUser.getIdToken() : null
17+
const idToken =
18+
currentUser && !omitIdToken ? await currentUser.getIdToken() : null
1719

1820
// if logged in and no idToken, logout user
1921
/*

0 commit comments

Comments
 (0)