From 8e0da711c267e15aff72e056f274b13816ebb6f1 Mon Sep 17 00:00:00 2001
From: John Bohannon <imjohnbo@github.com>
Date: Tue, 9 Aug 2022 20:42:18 -0400
Subject: [PATCH] feat: move workflow environment variables to user
 configuration

---
 .gitignore |  3 +++
 index.js   | 22 ++++++++++------
 info.plist | 75 +++++++++++++++++++++++++++++++++++++++++++++---------
 3 files changed, 80 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6704566..a38fe52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# User configuration
+prefs.plist
+
 # Logs
 logs
 *.log
diff --git a/index.js b/index.js
index 972c2dc..95c4a6f 100644
--- a/index.js
+++ b/index.js
@@ -1,5 +1,10 @@
 import alfy from 'alfy'
 import { Octokit } from '@octokit/rest'
+
+const filename = process.env.JSON_FILENAME
+const nwo = process.env.GITHUB_NWO
+const token = process.env.GITHUB_TOKEN
+
 const octokit = getOctokit()
 
 try {
@@ -12,27 +17,28 @@ try {
 }
 
 function checkEnv () {
-  if (!process.env.GITHUB_JSON_FILENAME ||
-    !process.env.GITHUB_REPO ||
-    !process.env.GITHUB_TOKEN) {
-    throw new Error('Required workflow environment variables missing (GITHUB_JSON_FILENAME, GITHUB_REPO, and GITHUB_TOKEN). Please set them in your workflow settings.')
+  if (!filename || !nwo || !token) {
+    throw new Error('Required workflow user configuration missing (JSON_FILENAME, GITHUB_NWO, and GITHUB_TOKEN). Please set them in your workflow settings.')
   }
 }
 
 function getOctokit () {
   return new Octokit({
-    auth: process.env.GITHUB_TOKEN
+    auth: token
   })
 }
 
 async function getRemoteLinks () {
-  const [owner, repo] = process.env.GITHUB_REPO.split('/') || ['imjohnbo', 'ghLinks-example']
-  const path = process.env.GITHUB_JSON_FILENAME || 'ghLinks.json'
+  const [owner, repo] = nwo.split('/')
+
+  if (!owner || !repo) {
+    throw new Error('GitHub repo name with owner must be in format owner/repo, e.g. monalisa/hello-world.')
+  }
 
   const { data: ghLinks } = await octokit.repos.getContent({
     owner,
     repo,
-    path,
+    path: filename,
     mediaType: {
       format: 'raw'
     }
diff --git a/info.plist b/info.plist
index b087eb7..03bc9c1 100644
--- a/info.plist
+++ b/info.plist
@@ -634,19 +634,70 @@ Community support available at https://github.com/imjohnbo/ghLinks.alfred. Enjoy
 		</dict>
 	</dict>
 	<key>userconfigurationconfig</key>
-	<array/>
-	<key>variables</key>
-	<dict>
-		<key>GITHUB_JSON_FILENAME</key>
-		<string></string>
-		<key>GITHUB_REPO</key>
-		<string></string>
-		<key>GITHUB_TOKEN</key>
-		<string></string>
-	</dict>
-	<key>variablesdontexport</key>
 	<array>
-		<string>GITHUB_TOKEN</string>
+		<dict>
+			<key>config</key>
+			<dict>
+				<key>default</key>
+				<string></string>
+				<key>placeholder</key>
+				<string>ghLinks.json</string>
+				<key>required</key>
+				<true/>
+				<key>trim</key>
+				<true/>
+			</dict>
+			<key>description</key>
+			<string>The name of the JSON file containing links</string>
+			<key>label</key>
+			<string>JSON Filename</string>
+			<key>type</key>
+			<string>textfield</string>
+			<key>variable</key>
+			<string>JSON_FILENAME</string>
+		</dict>
+		<dict>
+			<key>config</key>
+			<dict>
+				<key>default</key>
+				<string></string>
+				<key>placeholder</key>
+				<string>imjohnbo/ghLinks</string>
+				<key>required</key>
+				<true/>
+				<key>trim</key>
+				<true/>
+			</dict>
+			<key>description</key>
+			<string>The GitHub repository containing JSON_FILENAME</string>
+			<key>label</key>
+			<string>GitHub repo name with owner</string>
+			<key>type</key>
+			<string>textfield</string>
+			<key>variable</key>
+			<string>GITHUB_NWO</string>
+		</dict>
+		<dict>
+			<key>config</key>
+			<dict>
+				<key>default</key>
+				<string></string>
+				<key>placeholder</key>
+				<string>github_pat_123alongpersonalaccesstoken_replaceme456</string>
+				<key>required</key>
+				<true/>
+				<key>trim</key>
+				<true/>
+			</dict>
+			<key>description</key>
+			<string>GitHub token (personal access token, installation access token, etc.) to access API</string>
+			<key>label</key>
+			<string>GitHub token</string>
+			<key>type</key>
+			<string>textfield</string>
+			<key>variable</key>
+			<string>GITHUB_TOKEN</string>
+		</dict>
 	</array>
 	<key>version</key>
 	<string>0.0.1</string>