From 20fc4735683b51bb81714757d018d31f6448b3d6 Mon Sep 17 00:00:00 2001
From: Philipp Hugenroth <philipph@spotify.com>
Date: Tue, 21 Feb 2023 13:22:57 +0100
Subject: [PATCH] Don't use environment variables

Signed-off-by: Philipp Hugenroth <philipph@spotify.com>
---
 .../cli/src/commands/admin/auth/config.ts     | 16 ------------
 packages/cli/src/commands/admin/auth/files.ts |  1 -
 .../src/commands/admin/auth/github/index.ts   | 19 +-------------
 .../src/commands/admin/auth/github/oauth.ts   | 26 ++++++-------------
 4 files changed, 9 insertions(+), 53 deletions(-)

diff --git a/packages/cli/src/commands/admin/auth/config.ts b/packages/cli/src/commands/admin/auth/config.ts
index 659c356360..54c103cdf8 100644
--- a/packages/cli/src/commands/admin/auth/config.ts
+++ b/packages/cli/src/commands/admin/auth/config.ts
@@ -59,22 +59,6 @@ export const updateConfigFile = async (
   );
 };
 
-export const updateEnvFile = async (
-  file: string,
-  clientId: string,
-  clientSecret: string,
-) => {
-  const content = `
-AUTH_GITHUB_CLIENT_ID=${clientId}
-AUTH_GITHUB_CLIENT_SECRET=${clientSecret}`;
-
-  if (fs.existsSync(file)) {
-    return await fs.appendFile(file, content, 'utf8');
-  }
-
-  return await fs.writeFile(file, content, 'utf8');
-};
-
 export const addUserEntity = async (file: string, username: string) => {
   const content = {
     apiVersion: 'backstage.io/v1alpha1',
diff --git a/packages/cli/src/commands/admin/auth/files.ts b/packages/cli/src/commands/admin/auth/files.ts
index 166538335f..f84c77fe60 100644
--- a/packages/cli/src/commands/admin/auth/files.ts
+++ b/packages/cli/src/commands/admin/auth/files.ts
@@ -20,7 +20,6 @@ import * as path from 'path';
 /* eslint-disable-next-line no-restricted-syntax */
 const { targetRoot, ownDir, resolveTargetRoot } = findPaths(__dirname);
 export const APP_CONFIG_FILE = path.join(targetRoot, 'app-config.local.yaml');
-export const ENV_CONFIG_FILE = path.join(targetRoot, '.env.local');
 export const USER_ENTITY_FILE = path.join(targetRoot, 'user-info.yaml');
 
 const APP_TSX_FILE = path.join(
diff --git a/packages/cli/src/commands/admin/auth/github/index.ts b/packages/cli/src/commands/admin/auth/github/index.ts
index fa22cacef8..cc2653bc05 100644
--- a/packages/cli/src/commands/admin/auth/github/index.ts
+++ b/packages/cli/src/commands/admin/auth/github/index.ts
@@ -14,23 +14,6 @@
  * limitations under the License.
  */
 
-import inquirer from 'inquirer';
 import { oauth } from './oauth';
 
-export const github = async () => {
-  const answers = await inquirer.prompt<{
-    useEnvForSecrets: boolean;
-    type: string;
-  }>([
-    {
-      type: 'confirm',
-      name: 'useEnvForSecrets',
-      message:
-        'Would you like to store sensitive configuration details such as secrets as environment variables? (recommended)',
-    },
-  ]);
-
-  const { useEnvForSecrets } = answers;
-
-  await oauth(useEnvForSecrets);
-};
+export const github = async () => await oauth();
diff --git a/packages/cli/src/commands/admin/auth/github/oauth.ts b/packages/cli/src/commands/admin/auth/github/oauth.ts
index fe05b6431a..00bfbef23d 100644
--- a/packages/cli/src/commands/admin/auth/github/oauth.ts
+++ b/packages/cli/src/commands/admin/auth/github/oauth.ts
@@ -16,15 +16,14 @@
 
 import { OAuthApp } from '@octokit/oauth-app';
 import chalk from 'chalk';
+import * as fs from 'fs-extra';
 import inquirer from 'inquirer';
 import fetch from 'node-fetch';
-import * as fs from 'fs-extra';
 import * as path from 'path';
 import { Task } from '../../../../lib/tasks';
-import { addUserEntity, updateConfigFile, updateEnvFile } from '../config';
+import { addUserEntity, updateConfigFile } from '../config';
 import {
   APP_CONFIG_FILE,
-  ENV_CONFIG_FILE,
   patchMap,
   PATCH_FOLDER,
   USER_ENTITY_FILE,
@@ -56,7 +55,7 @@ const validateCredentials = async (clientId: string, clientSecret: string) => {
   }
 };
 
-const getConfig = (answers: Answers, useEnvForSecrets: boolean) => {
+const getConfig = (answers: Answers) => {
   const { clientId, clientSecret, hasEnterprise, enterpriseInstanceUrl } =
     answers;
 
@@ -65,12 +64,10 @@ const getConfig = (answers: Answers, useEnvForSecrets: boolean) => {
       providers: {
         github: {
           development: {
-            clientId: useEnvForSecrets ? '${AUTH_GITHUB_CLIENT_ID}' : clientId,
-            clientSecret: useEnvForSecrets
-              ? '${AUTH_GITHUB_CLIENT_SECRET}'
-              : clientSecret,
+            clientId,
+            clientSecret,
             ...(hasEnterprise && {
-              enterpriseInstanceUrl: enterpriseInstanceUrl,
+              enterpriseInstanceUrl,
             }),
           },
         },
@@ -96,7 +93,7 @@ type Answers = {
   enterpriseInstanceUrl?: string;
 };
 
-export const oauth = async (useEnvForSecrets: boolean) => {
+export const oauth = async () => {
   Task.log(`
     To add GitHub authentication, you must create an OAuth App from the GitHub developer settings: ${chalk.blue(
       'https://github.com/settings/developers',
@@ -153,7 +150,7 @@ export const oauth = async (useEnvForSecrets: boolean) => {
   ]);
 
   const { username, clientId, clientSecret } = answers;
-  const config = getConfig(answers, useEnvForSecrets);
+  const config = getConfig(answers);
 
   Task.log('Setting up GitHub Authentication for you...');
 
@@ -167,13 +164,6 @@ export const oauth = async (useEnvForSecrets: boolean) => {
     APP_CONFIG_FILE,
     async () => await updateConfigFile(APP_CONFIG_FILE, config),
   );
-  if (useEnvForSecrets) {
-    await Task.forItem(
-      'Updating',
-      ENV_CONFIG_FILE,
-      async () => await updateEnvFile(ENV_CONFIG_FILE, clientId, clientSecret),
-    );
-  }
   await Task.forItem(
     'Creating',
     USER_ENTITY_FILE,