IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-04-06 01:25:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4091 from Ocelot-Social-Community/4090-cookie-name-in-config

Browse Source 
Name of Cookie Is Set in metadata.js
This commit is contained in:
Mogge 2020-12-22 17:27:04 +01:00 committed by GitHub
commit c2a475f670
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webapp/constants/metadata.js
View File

@ -4,4 +4,5 @@ export default {
APPLICATION_DESCRIPTION: 'ocelot.social Community Network', APPLICATION_DESCRIPTION: 'ocelot.social Community Network',
ORGANIZATION_NAME: 'ocelot.social Community', ORGANIZATION_NAME: 'ocelot.social Community',
ORGANIZATION_JURISDICTION: 'City of Angels', ORGANIZATION_JURISDICTION: 'City of Angels',
COOKIE_NAME: 'ocelot-social-token',
} }

3
webapp/nuxt.config.js
View File

@ -1,6 +1,7 @@
import path from 'path' import path from 'path'
import dotenv from 'dotenv' import dotenv from 'dotenv'
import manifest from './constants/manifest.js' import manifest from './constants/manifest.js'
import metadata from './constants/metadata.js'
dotenv.config() // we want to synchronize @nuxt-dotenv and nuxt-env dotenv.config() // we want to synchronize @nuxt-dotenv and nuxt-env
@ -214,7 +215,7 @@ export default {
// Give apollo module options // Give apollo module options
apollo: { apollo: {
tokenName: 'ocelot-social-token', // optional, default: apollo-token tokenName: metadata.COOKIE_NAME, // optional, default: apollo-token
cookieAttributes: { cookieAttributes: {
expires: 1, // optional, default: 7 (days) expires: 1, // optional, default: 7 (days)
}, },

3
webapp/plugins/apollo-config.js
View File

@ -1,5 +1,6 @@
import { InMemoryCache, IntrospectionFragmentMatcher } from 'apollo-cache-inmemory' import { InMemoryCache, IntrospectionFragmentMatcher } from 'apollo-cache-inmemory'
import introspectionQueryResultData from './apollo-config/fragmentTypes.json' import introspectionQueryResultData from './apollo-config/fragmentTypes.json'
import metadata from '~/constants/metadata'
const fragmentMatcher = new IntrospectionFragmentMatcher({ const fragmentMatcher = new IntrospectionFragmentMatcher({
introspectionQueryResultData, introspectionQueryResultData,
@ -16,7 +17,7 @@ export default ({ req, nuxtState }) => {
credentials: 'same-origin', credentials: 'same-origin',
}, },
credentials: true, credentials: true,
tokenName: 'ocelot-social-token', tokenName: metadata.COOKIE_NAME,
persisting: false, persisting: false,
websocketsOnly: false, websocketsOnly: false,
cache: new InMemoryCache({ fragmentMatcher }), cache: new InMemoryCache({ fragmentMatcher }),

3
webapp/store/auth.js
View File

@ -2,6 +2,7 @@ import gql from 'graphql-tag'
import { VERSION } from '~/constants/terms-and-conditions-version.js' import { VERSION } from '~/constants/terms-and-conditions-version.js'
import { currentUserQuery } from '~/graphql/User' import { currentUserQuery } from '~/graphql/User'
import Cookie from 'universal-cookie' import Cookie from 'universal-cookie'
import metadata from '~/constants/metadata'
const cookies = new Cookie() const cookies = new Cookie()
@ -102,7 +103,7 @@ export const actions = {
await this.app.$apolloHelpers.onLogin(login) await this.app.$apolloHelpers.onLogin(login)
commit('SET_TOKEN', login) commit('SET_TOKEN', login)
await dispatch('fetchCurrentUser') await dispatch('fetchCurrentUser')
if (cookies.get('ocelot-social-token') === undefined) { if (cookies.get(metadata.COOKIE_NAME) === undefined) {
throw new Error('no-cookie') throw new Error('no-cookie')
} }
} catch (err) { } catch (err) {