From 67f66c2962eb4ed0cb88ed28b90bf3426d2c26bf Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Wed, 24 Mar 2021 15:47:17 -0600
Subject: [PATCH] Fix auth environment type; GitLab audience optional

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 plugins/auth-backend/config.d.ts               | 18 +++++++++---------
 .../src/providers/gitlab/provider.ts           |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/auth-backend/config.d.ts b/plugins/auth-backend/config.d.ts
index 9850e05235..64de6cdd50 100644
--- a/plugins/auth-backend/config.d.ts
+++ b/plugins/auth-backend/config.d.ts
@@ -36,13 +36,13 @@ export interface Config {
      */
     providers?: {
       google?: {
-        development: { [key: string]: string };
+        [authEnv: string]: { [key: string]: string };
       };
       github?: {
-        development: { [key: string]: string };
+        [authEnv: string]: { [key: string]: string };
       };
       gitlab?: {
-        development: { [key: string]: string };
+        [authEnv: string]: { [key: string]: string };
       };
       saml?: {
         entryPoint: string;
@@ -55,10 +55,10 @@ export interface Config {
         digestAlgorithm?: string;
       };
       okta?: {
-        development: { [key: string]: string };
+        [authEnv: string]: { [key: string]: string };
       };
       oauth2?: {
-        development: {
+        [authEnv: string]: {
           clientId: string;
           clientSecret: string;
           authorizationUrl: string;
@@ -67,16 +67,16 @@ export interface Config {
         };
       };
       oidc?: {
-        development: { [key: string]: string };
+        [authEnv: string]: { [key: string]: string };
       };
       auth0?: {
-        development: { [key: string]: string };
+        [authEnv: string]: { [key: string]: string };
       };
       microsoft?: {
-        development: { [key: string]: string };
+        [authEnv: string]: { [key: string]: string };
       };
       onelogin?: {
-        development: { [key: string]: string };
+        [authEnv: string]: { [key: string]: string };
       };
       awsalb?: {
         issuer?: string;
diff --git a/plugins/auth-backend/src/providers/gitlab/provider.ts b/plugins/auth-backend/src/providers/gitlab/provider.ts
index 630cad0554..b8de398af5 100644
--- a/plugins/auth-backend/src/providers/gitlab/provider.ts
+++ b/plugins/auth-backend/src/providers/gitlab/provider.ts
@@ -122,7 +122,7 @@ export const createGitlabProvider = (
     OAuthEnvironmentHandler.mapConfig(config, envConfig => {
       const clientId = envConfig.getString('clientId');
       const clientSecret = envConfig.getString('clientSecret');
-      const audience = envConfig.getString('audience');
+      const audience = envConfig.getOptionalString('audience');
       const baseUrl = audience || 'https://gitlab.com';
       const callbackUrl = `${globalConfig.baseUrl}/${providerId}/handler/frame`;