Skip to content

Commit c3676f0

Browse files
committedDec 3, 2019
fix: Removing gql from web-demo
1 parent 8db9286 commit c3676f0

File tree

2 files changed

+2
-28
lines changed

2 files changed

+2
-28
lines changed
 

‎examples/expressjs/src/setup.ts

+1-25
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import * as DIDComm from 'daf-did-comm'
1313
import { SodiumFsEncryptionKeyManager } from 'daf-sodium-fs'
1414

1515
import { NodeSqlite3 } from 'daf-node-sqlite3'
16-
import { DataStore, Gql as DataGql } from 'daf-data-store'
16+
import { DataStore } from 'daf-data-store'
1717
import ws from 'ws'
1818

1919
import Debug from 'debug'
@@ -89,27 +89,3 @@ export const core = new Daf.Core({
8989

9090
const db = new NodeSqlite3(dataStoreFilename)
9191
export const dataStore = new DataStore(db)
92-
93-
const { ApolloServer } = require('apollo-server-express')
94-
import merge from 'lodash.merge'
95-
96-
export const apolloServer = new ApolloServer({
97-
typeDefs: [
98-
Daf.Gql.baseTypeDefs,
99-
Daf.Gql.Core.typeDefs,
100-
Daf.Gql.IdentityManager.typeDefs,
101-
DataGql.typeDefs,
102-
DIDComm.Gql.typeDefs,
103-
W3c.Gql.typeDefs,
104-
],
105-
resolvers: merge(
106-
Daf.Gql.Core.resolvers,
107-
Daf.Gql.IdentityManager.resolvers,
108-
DataGql.resolvers,
109-
DIDComm.Gql.resolvers,
110-
W3c.Gql.resolvers,
111-
),
112-
context: () => ({ dataStore, core }),
113-
introspection: true,
114-
graphqlPath: '/graphql',
115-
})

‎examples/expressjs/src/web-server.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import exphbs from 'express-handlebars'
1111
import sharedsession from 'express-socket.io-session'
1212

1313
const bodyParser = require('body-parser')
14-
import { core, dataStore, apolloServer } from './setup'
14+
import { core, dataStore } from './setup'
1515
import { webDidDocFromEthrDid } from './web-did-doc'
1616

1717
import Debug from 'debug'
@@ -138,8 +138,6 @@ async function main() {
138138
res.send('OK')
139139
})
140140

141-
apolloServer.applyMiddleware({ app })
142-
143141
await dataStore.initialize()
144142
const server = http.createServer(app)
145143
const io = socketio(server)

0 commit comments

Comments
 (0)
Please sign in to comment.