Update instructions

Signed-off-by: Phillip Rak <[email protected]>

Author: rak-phillip

shell/assets/translations/en-us.yaml

@@ -506,27 +506,27 @@ authConfig:
     warning: The GitHub App authentication provider only works with <a href="https://docs.github.com/en/get-started/learning-about-github/types-of-github-accounts" target="_blank" rel="noopener noreferrer nofollow">GitHub Organization accounts</a>. It does not support User accounts.
     form:
       prefix:
-        1: <li><a href="{baseUrl}/settings/organizations" target="_blank" rel="noopener noreferrer nofollow">Click here</a> to go to GitHub organization settings in a new window.</li>
-        2: <li>To the right of the organization, click Settings.</li>
-        3: <li>In the left sidebar, click Developer settings.</li>
-        4: <li>In the left sidebar, click GitHub Apps.</li>
-        5: <li>Click New Github App.</li>
+        1: <li>Open your <a href="{baseUrl}/settings/organizations" target="_blank" rel="noopener noreferrer nofollow">GitHub organization settings</a> in a new window</li>
+        2: <li>To the right of the organization, click "Settings"</li>
+        3: <li>In the left sidebar, click "Developer settings" -> "GitHub Apps"</li>
+        4: <li>Click "New Github App"</li>
       instruction: 'Fill in the form with these values:'
       app:
         label: GitHub App name 
         value: 'Anything you like, e.g. My {vendor}'
       callback:
         label: Callback URL
+        value: '{serverUrl}/verify-auth'
       description:
         label: Application description
         value: 'Optional, can be left blank'
       homepage:
         label: Homepage URL
+      create: Click "Create Github App"
       suffix:
-        1: <li>Click "Create Github App"</li>
-        2: <li>Click "Generate a new client secret"</li>
-        3: <li>Click "Generate a private key"</li>
-        4: <li>Copy and paste the App ID, Client ID, Client Secret, and Private Key of your newly created OAuth app into the fields below</li>
+        1: <li>Under Client Secrets, click "Generate a new client secret"</li>
+        2: <li>Under Private Keys, click "Generate a private key"</li>
+        3: <li>Copy and paste the "App ID", "Client ID", "Client Secret", and "Private Key" of your newly created OAuth app into the fields below</li>
     host:
       label: GitHub Enterprise Host
       placeholder: e.g. github.mycompany.example

shell/edit/auth/github-app-steps.vue

@@ -26,7 +26,6 @@ defineProps<{
       <li v-clean-html="t(`authConfig.${name}.form.prefix.2`, tArgs, true)" />
       <li v-clean-html="t(`authConfig.${name}.form.prefix.3`, tArgs, true)" />
       <li v-clean-html="t(`authConfig.${name}.form.prefix.4`, tArgs, true)" />
-      <li v-clean-html="t(`authConfig.${name}.form.prefix.5`, tArgs, true)" />
     </ul>
   </InfoBox>
   <InfoBox
@@ -64,7 +63,7 @@ defineProps<{
             <b>
               {{ t(`authConfig.${name}.form.callback.label`) }}
             </b>:
-            {{ tArgs.serverUrl }}
+            {{ t(`authConfig.${name}.form.callback.value`, tArgs, true) }}
             <CopyToClipboard
               :text="tArgs.serverUrl"
               label-as="tooltip"
@@ -74,6 +73,9 @@ defineProps<{
           </li>
         </ul>
       </li>
+      <li>
+        {{ t(`authConfig.${name}.form.create`, tArgs, true) }}
+      </li>
     </ul>
   </InfoBox>
   <InfoBox
@@ -84,7 +86,6 @@ defineProps<{
       <li v-clean-html="t(`authConfig.${name}.form.suffix.1`, tArgs, true)" />
       <li v-clean-html="t(`authConfig.${name}.form.suffix.2`, tArgs, true)" />
       <li v-clean-html="t(`authConfig.${name}.form.suffix.3`, tArgs, true)" />
-      <li v-clean-html="t(`authConfig.${name}.form.suffix.4`, tArgs, true)" />
     </ul>
   </InfoBox>
 </template>