@gbl-uzh/platform 0.4.0 → 0.4.2

package/dist/index.js

@@ -123,17 +123,13 @@ async function loginAsTeam({ token }, ctx) {
       role: "PLAYER" /* PLAYER */,
       token: matchingPlayer.token
     });
-    (0, import_nookies.setCookie)(
-      ctx,
-      process.env.NODE_ENV === "production" ? "__Secure-next-auth.session-token" : "next-auth.session-token",
-      jwt,
-      {
-        path: "/",
-        maxAge: 60 * 60 * 24 * 7,
-        httpOnly: process.env.NODE_ENV === "production",
-        secure: process.env.NODE_ENV === "production"
-      }
-    );
+    const cookieName = process.env.NODE_ENV === "production" ? "__Secure-next-auth.session-token" : "next-auth.session-token";
+    (0, import_nookies.setCookie)(ctx, cookieName, jwt, {
+      path: "/",
+      maxAge: 60 * 60 * 24 * 7,
+      httpOnly: process.env.NODE_ENV === "production",
+      secure: process.env.NODE_ENV === "production"
+    });
   } catch (err) {
     console.error(err);
     return null;
@@ -433,7 +429,6 @@ async function createGame({ name, playerCount }, ctx, { roleAssigner }) {
 }
 async function addGamePeriod({ gameId, facts }, ctx, { schema, reducers }) {
   const validatedFacts = schema.validateSync(facts);
-  console.log(gameId);
   const game = await ctx.prisma.game.findUnique({
     where: {
       id: gameId
@@ -457,7 +452,6 @@ async function addGamePeriod({ gameId, facts }, ctx, { schema, reducers }) {
   });
   if (!game)
     return null;
-  console.log(game);
   const index = game.periods[0]?.index + 1 || 0;
   const { result: initializedFacts } = reducers.Period.apply(validatedFacts, {
     type: reducers.Period.ActionTypes.PERIOD_INITIALIZE,
@@ -468,6 +462,11 @@ async function addGamePeriod({ gameId, facts }, ctx, { schema, reducers }) {
       periodIx: index
     }
   });
+  console.log(
+    game.periods[0]?.facts,
+    game.periods[0]?.segments[0]?.facts,
+    initializedFacts
+  );
   return ctx.prisma.period.upsert({
     where: {
       gameId_index: {
@@ -1722,7 +1721,8 @@ async function getPlayerResult(args, ctx) {
       }
     },
     include: {
-      period: true
+      period: true,
+      segment: true
     }
   });
   const playerResult = await ctx.prisma.playerResult.findUnique({

package/dist/lib/apollo.js

@@ -43,28 +43,23 @@ var import_react = require("react");
 // src/lib/SSELink.ts
 var import_core = require("@apollo/client/core");
 var import_graphql = require("graphql");
+var import_graphql_sse = require("graphql-sse");
 var SSELink = class extends import_core.ApolloLink {
+  client;
   constructor(options) {
     super();
-    this.options = options;
+    this.client = (0, import_graphql_sse.createClient)(options);
   }
   request(operation) {
-    const url = new URL(this.options.url);
-    url.searchParams.append("query", (0, import_graphql.print)(operation.query));
-    url.searchParams.append("variables", JSON.stringify(operation.variables));
     return new import_core.Observable((sink) => {
-      const eventsource = new EventSource(url.toString(), this.options);
-      eventsource.onmessage = function(event) {
-        const data = JSON.parse(event.data);
-        sink.next(data);
-        if (eventsource.readyState === 2) {
-          sink.complete();
+      return this.client.subscribe(
+        { ...operation, query: (0, import_graphql.print)(operation.query) },
+        {
+          next: sink.next.bind(sink),
+          complete: sink.complete.bind(sink),
+          error: sink.error.bind(sink)
         }
-      };
-      eventsource.onerror = function(error) {
-        sink.error(error);
-      };
-      return () => eventsource.close();
+      );
     });
   }
 };
@@ -81,7 +76,8 @@ function createIsomorphLink() {
   });
   if (isBrowser) {
     const sseLink = new SSELink_default({
-      url: process.env.NEXT_PUBLIC_API_URL
+      url: process.env.NEXT_PUBLIC_API_URL,
+      credentials: "same-origin"
     });
     httpLink = (0, import_client.split)(
       ({ query }) => {

package/dist/nexus.js

@@ -425,17 +425,13 @@ async function loginAsTeam({ token }, ctx) {
       role: "PLAYER" /* PLAYER */,
       token: matchingPlayer.token
     });
-    (0, import_nookies.setCookie)(
-      ctx,
-      process.env.NODE_ENV === "production" ? "__Secure-next-auth.session-token" : "next-auth.session-token",
-      jwt,
-      {
-        path: "/",
-        maxAge: 60 * 60 * 24 * 7,
-        httpOnly: process.env.NODE_ENV === "production",
-        secure: process.env.NODE_ENV === "production"
-      }
-    );
+    const cookieName = process.env.NODE_ENV === "production" ? "__Secure-next-auth.session-token" : "next-auth.session-token";
+    (0, import_nookies.setCookie)(ctx, cookieName, jwt, {
+      path: "/",
+      maxAge: 60 * 60 * 24 * 7,
+      httpOnly: process.env.NODE_ENV === "production",
+      secure: process.env.NODE_ENV === "production"
+    });
   } catch (err) {
     console.error(err);
     return null;
@@ -723,7 +719,6 @@ async function createGame({ name, playerCount }, ctx, { roleAssigner }) {
 }
 async function addGamePeriod({ gameId, facts }, ctx, { schema, reducers }) {
   const validatedFacts = schema.validateSync(facts);
-  console.log(gameId);
   const game = await ctx.prisma.game.findUnique({
     where: {
       id: gameId
@@ -747,7 +742,6 @@ async function addGamePeriod({ gameId, facts }, ctx, { schema, reducers }) {
   });
   if (!game)
     return null;
-  console.log(game);
   const index = game.periods[0]?.index + 1 || 0;
   const { result: initializedFacts } = reducers.Period.apply(validatedFacts, {
     type: reducers.Period.ActionTypes.PERIOD_INITIALIZE,
@@ -758,6 +752,11 @@ async function addGamePeriod({ gameId, facts }, ctx, { schema, reducers }) {
       periodIx: index
     }
   });
+  console.log(
+    game.periods[0]?.facts,
+    game.periods[0]?.segments[0]?.facts,
+    initializedFacts
+  );
   return ctx.prisma.period.upsert({
     where: {
       gameId_index: {
@@ -1998,7 +1997,8 @@ async function getPlayerResult(args, ctx) {
       }
     },
     include: {
-      period: true
+      period: true,
+      segment: true
     }
   });
   const playerResult = await ctx.prisma.playerResult.findUnique({
@@ -2452,9 +2452,11 @@ function generateBaseQueries() {
           );
         }
       });
-      t.nonNull.field("self", {
+      t.field("self", {
         type: Player,
         async resolve(_, args, ctx) {
+          if (!ctx.user)
+            return null;
           return getPlayerData({ playerId: ctx.user.sub }, ctx);
         }
       });
@@ -2507,7 +2509,10 @@ function generateBaseSubscriptions() {
       t.list.nonNull.field("eventsUser", {
         type: Event,
         async subscribe(_, args, ctx) {
-          return pubSub.subscribe("user:events", String(ctx.user.sub));
+          if (ctx.user) {
+            return pubSub.subscribe("user:events", String(ctx.user.sub));
+          }
+          return pubSub.subscribe("user:events", "anonymous");
         },
         async resolve(payload) {
           return payload;

package/dist/ops/QPastResults.graphql

@@ -16,6 +16,7 @@ query PastResults {
 
       name
       avatar
+      location
       color
 
       facts
@@ -36,5 +37,10 @@ query PastResults {
       index
       facts
     }
+    segment {
+      id
+      index
+      facts
+    }
   }
 }

package/dist/schema.prisma

@@ -6,7 +6,7 @@ datasource db {
 
 generator client {
   provider        = "prisma-client-js"
-  previewFeatures = ["fullTextSearch", "fullTextIndex", "postgresqlExtensions", "fieldReference", "orderByNulls", "extendedWhereUnique"]
+  previewFeatures = ["fullTextSearch", "fullTextIndex", "postgresqlExtensions", "fieldReference", "extendedWhereUnique"]
 }
 
 model Account {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gbl-uzh/platform",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "license": "LGPL-3.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,21 +29,23 @@
     "npm-run-all": "4.1.5",
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
-    "tsup": "6.7.0",
-    "typescript": "5.0.4"
+    "tsup": "7.1.0",
+    "typescript": "5.1.3"
   },
   "peerDependencies": {
     "@apollo/client": "^3.7.0",
-    "@prisma/client": "^4.11.0",
+    "@prisma/client": "^4.16.1",
     "@uzh-bf/design-system": "^1.0.0",
     "graphql": "^16.6.0",
     "graphql-scalars": "^1.19.0",
-    "graphql-yoga": "^3.0.0",
+    "graphql-sse": "^2.0.0",
+    "graphql-yoga": "^4.0.0",
     "jsonwebtoken": "^9.0.0",
     "next": "^13.0.0",
+    "next-auth": "^4.0.0",
     "nexus": "^1.3.0",
     "nookies": "^2.5.2",
-    "prisma": "^4.11.0",
+    "prisma": "^4.16.1",
     "ramda": "^0.29.0",
     "react": "^18.0.0",
     "yup": "^1.0.0"