Merge branch 'staging' into dependabot/npm_and_yarn/handlebars-4.5.3

altair-graphql · Dec 28, 2019 · 42de7ba · 42de7ba
2 parents 91dfcd3 + 83364f6
commit 42de7ba
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 11 deletions.
diff --git a/src/app/effects/query.ts b/src/app/effects/query.ts
@@ -38,6 +38,7 @@ import { debug } from '../utils/logger';
 import { generateCurl } from 'app/utils/curl';
 
 interface EffectResponseData {
+  state: fromRoot.State;
   data: fromRoot.PerWindowState;
   windowId: string;
   action: any;
@@ -53,7 +54,7 @@ export class QueryEffects {
       .pipe(
         ofType(queryActions.SEND_QUERY_REQUEST, queryActions.CANCEL_QUERY_REQUEST),
         withLatestFrom(this.store, (action: queryActions.Action, state: fromRoot.State) => {
-            return { data: state.windows[action.windowId], windowId: action.windowId, action };
+            return { state, data: state.windows[action.windowId], windowId: action.windowId, action };
         }),
         switchMap(response => {
 
@@ -179,6 +180,7 @@ export class QueryEffects {
                     method: response.data.query.httpVerb,
                     selectedOperation,
                     files: response.data.variables.files,
+                    withCredentials: response.state.settings['request.withCredentials'],
                   })
                   .pipe(
                     map(res => {
@@ -302,7 +304,7 @@ export class QueryEffects {
       .pipe(
         ofType(queryActions.SEND_INTROSPECTION_QUERY_REQUEST),
         withLatestFrom(this.store, (action: queryActions.Action, state: fromRoot.State) => {
-          return { data: state.windows[action.windowId], windowId: action.windowId, action };
+          return { state, data: state.windows[action.windowId], windowId: action.windowId, action };
         }),
         switchMap(response => {
           return this.getPrerequestTransformedData$(response);
@@ -332,7 +334,8 @@ export class QueryEffects {
           return this.gqlService
             .getIntrospectionRequest(url, {
               method: response.data.query.httpVerb,
-              headers
+              headers,
+              withCredentials: response.state.settings['request.withCredentials'],
             })
             .pipe(
               catchError((err: any) => {
@@ -430,7 +433,7 @@ export class QueryEffects {
       .pipe(
         ofType(queryActions.START_SUBSCRIPTION),
         withLatestFrom(this.store, (action: queryActions.Action, state: fromRoot.State) => {
-          return { data: state.windows[action.windowId], windowId: action.windowId, action };
+          return { state, data: state.windows[action.windowId], windowId: action.windowId, action };
         }),
         switchMap(response => {
           return this.getPrerequestTransformedData$(response);

diff --git a/src/app/reducers/index.ts b/src/app/reducers/index.ts
@@ -85,9 +85,10 @@ export const keySerializer = (key: string) => `${getAltairInstanceStorageNamespa
 
 export function localStorageSyncReducer(_reducer: ActionReducer<any>): ActionReducer<any> {
   return localStorageSync({
-    keys: ['windows', 'windowsMeta', 'settings', 'environments'],
+    keys: [ 'windows', 'windowsMeta', 'settings', 'environments' ],
     rehydrate: true,
     storage: performantLocalStorage,
+    restoreDates: false,
     // syncCondition: (state) => console.log(state),
     storageKeySerializer: keySerializer
   })(_reducer);

diff --git a/src/app/reducers/settings/settings.ts b/src/app/reducers/settings/settings.ts
@@ -58,6 +58,11 @@ export interface State {
    * Specifies a list of enabled plugins (requires enableExperimental to be true)
    */
   'plugin.list'?: string[];
+
+  /**
+   * Specifies if requests should be sent with credentials (with cookies) or not
+   */
+  'request.withCredentials'?: boolean;
 }
 
 export const getInitialState = (): State => {

diff --git a/src/app/services/gql/gql.service.ts b/src/app/services/gql/gql.service.ts
@@ -54,6 +54,7 @@ import { SelectedOperation } from 'app/reducers/query/query';
 interface SendRequestOptions {
   query: string;
   method: string;
+  withCredentials?: boolean;
   variables?: string;
   headers?: fromHeaders.Header[];
   files?: fromVariables.FileVariable[];
@@ -100,7 +101,14 @@ export class GqlService {
    * @param query
    * @param vars
    */
-  _send(query: string, vars?: string, selectedOperation?: SelectedOperation, files?: fromVariables.FileVariable[]) {
+  _send({
+    query,
+    variables,
+    selectedOperation,
+    files,
+    withCredentials,
+  }: Omit<SendRequestOptions, 'method'>,
+  ) {
     const data = { query, variables: {}, operationName: (null as SelectedOperation) };
     let body: FormData | string | undefined;
     let params: HttpParams | undefined;
@@ -111,9 +119,9 @@ export class GqlService {
     }
 
     // If there is a variables option, add it to the data
-    if (vars) {
+    if (variables) {
       try {
-        data.variables = JSON.parse(vars);
+        data.variables = JSON.parse(variables);
       } catch (err) {
         // Notify the user about badly written variables.
         debug.error(err);
@@ -153,6 +161,7 @@ export class GqlService {
       params,
       headers,
       observe: 'response',
+      withCredentials,
     })
     .pipe(
       catchError((err: HttpErrorResponse) => {
@@ -185,8 +194,14 @@ export class GqlService {
    * @param query
    * @param vars
    */
-  send(query: string, vars?: string, selectedOperation?: string, files?: fromVariables.FileVariable[]) {
-    return this._send(query, vars, selectedOperation, files).pipe(map(res => res.body));
+  send(query: string, vars?: string, selectedOperation?: string, files?: fromVariables.FileVariable[], withCredentials?: boolean) {
+    return this._send({
+      query,
+      variables: vars,
+      selectedOperation,
+      files,
+      withCredentials,
+    }).pipe(map(res => res.body));
   }
 
   sendRequest(url: string, opts: SendRequestOptions) {
@@ -197,7 +212,13 @@ export class GqlService {
       // Skip json default headers for files
       .setHeaders(opts.headers, { skipDefaults: this.isGETRequest(opts.method) || !!(files && files.length) });
 
-    return this._send(opts.query, opts.variables, opts.selectedOperation, files);
+    return this._send({
+      query: opts.query,
+      variables: opts.variables,
+      selectedOperation: opts.selectedOperation,
+      files: opts.files,
+      withCredentials: opts.withCredentials,
+    });
   }
 
   isGETRequest(method = this.method) {
@@ -251,6 +272,7 @@ export class GqlService {
       query: getIntrospectionQuery(),
       headers: opts.headers,
       method: opts.method,
+      withCredentials: opts.withCredentials,
       variables: '{}',
     };
     return this.sendRequest(url, requestOpts).pipe(