fix: korjaa graphql-kutsut yllapidon osoitteeseen (#37)

finnishtransportagency · Nov 2, 2021 · a9cf34a · a9cf34a
1 parent 229227c
commit a9cf34a
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 190 deletions.
diff --git a/backend/src/service/userService.ts b/backend/src/service/userService.ts
@@ -42,6 +42,7 @@ const identifyUser = async (event: AppSyncResolverEvent<any>) => {
       return;
     }
   }
+  vaylaUser = undefined;
   log.info("Anonymous user");
 };
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/services/api/commonApi.ts b/src/services/api/commonApi.ts
@@ -17,28 +17,34 @@ const defaultOptions: DefaultOptions = {
 };
 
 export class API extends AbstractApi {
-  private client: ApolloClient<any>;
+  private publicClient: ApolloClient<any>;
+  private authenticatedClient: ApolloClient<any>;
 
-  constructor(link: ApolloLink) {
+  constructor(publicLink: ApolloLink, authenticatedLink: ApolloLink) {
     super();
-    this.client = new ApolloClient({
-      link,
+    this.publicClient = new ApolloClient({
+      link: publicLink,
+      cache: new InMemoryCache(),
+      defaultOptions,
+    });
+    this.authenticatedClient = new ApolloClient({
+      link: authenticatedLink,
       cache: new InMemoryCache(),
       defaultOptions,
     });
   }
 
-  async callGraphQL(operation: OperationConfig, variables: any) {
+  async callGraphQL(client: ApolloClient<any>, operation: OperationConfig, variables: any) {
     switch (operation.operationType) {
       case OperationType.Query:
-        const queryResponse: ApolloQueryResult<any> = await this.client.query({
+        const queryResponse: ApolloQueryResult<any> = await client.query({
           query: gql(operation.graphql),
           variables,
           fetchPolicy: "network-only",
         });
         return queryResponse.data?.[operation.name];
       case OperationType.Mutation:
-        const fetchResponse: FetchResult<any> = await this.client.mutate({
+        const fetchResponse: FetchResult<any> = await client.mutate({
           mutation: gql(operation.graphql),
           variables,
         });
@@ -48,10 +54,10 @@ export class API extends AbstractApi {
   }
 
   async callAPI(operation: OperationConfig, variables?: any): Promise<any> {
-    return await this.callGraphQL(operation, variables);
+    return await this.callGraphQL(this.publicClient, operation, variables);
   }
 
   async callYllapitoAPI(operation: OperationConfig, variables?: any): Promise<any> {
-    return await this.callGraphQL(operation, variables);
+    return await this.callGraphQL(this.authenticatedClient, operation, variables);
   }
 }
diff --git a/src/services/api/developerApi.ts b/src/services/api/developerApi.ts
@@ -30,4 +30,4 @@ const link = ApolloLink.from([
   }),
 ]);
 
-export const api = new API(link);
+export const api = new API(link, link);
diff --git a/src/services/api/permanentApi.ts b/src/services/api/permanentApi.ts
@@ -4,15 +4,26 @@ import { createAuthLink } from "aws-appsync-auth-link";
 import { createHttpLink } from "apollo-link-http";
 import { API } from "@services/api/commonApi";
 
-const link = ApolloLink.from([
+const publicLink = ApolloLink.from([
   createAuthLink({
-    url: awsExports.aws_appsync_graphqlEndpoint,
+    url: "/graphql",
     region: awsExports.aws_appsync_region,
     auth: { type: "API_KEY", apiKey: awsExports.aws_appsync_apiKey || "" },
   }),
   createHttpLink({
-    uri: awsExports.aws_appsync_graphqlEndpoint,
+    uri: "/graphql",
   }),
 ]);
 
-export const api = new API(link);
+const authenticatedLink = ApolloLink.from([
+  createAuthLink({
+    url: "/yllapito/graphql",
+    region: awsExports.aws_appsync_region,
+    auth: { type: "API_KEY", apiKey: awsExports.aws_appsync_apiKey || "" },
+  }),
+  createHttpLink({
+    uri: "/yllapito/graphql",
+  }),
+]);
+
+export const api = new API(publicLink, authenticatedLink);