fix(http): honor authType first (#28304)

Author: rarkins

lib/util/http/auth.spec.ts

@@ -189,6 +189,30 @@ describe('util/http/auth', () => {
         token: 'test',
       });
     });
+
+    it(`honors authType`, () => {
+      const opts: GotOptions = {
+        headers: {},
+        token: 'test',
+        context: {
+          authType: 'Bearer',
+        },
+        hostType: 'custom',
+      };
+
+      applyAuthorization(opts);
+
+      expect(opts).toEqual({
+        context: {
+          authType: 'Bearer',
+        },
+        headers: {
+          authorization: 'Bearer test',
+        },
+        hostType: 'custom',
+        token: 'test',
+      });
+    });
   });
 
   describe('removeAuthorization', () => {

lib/util/http/auth.ts

@@ -29,7 +29,14 @@ export function applyAuthorization<GotOptions extends AuthGotOptions>(
 
   options.headers ??= {};
   if (options.token) {
-    if (
+    const authType = options.context?.authType;
+    if (authType) {
+      if (authType === 'Token-Only') {
+        options.headers.authorization = options.token;
+      } else {
+        options.headers.authorization = `${authType} ${options.token}`;
+      }
+    } else if (
       options.hostType &&
       GITEA_API_USING_HOST_TYPES.includes(options.hostType)
     ) {
@@ -61,14 +68,7 @@ export function applyAuthorization<GotOptions extends AuthGotOptions>(
         options.headers.authorization = `Bearer ${options.token}`;
       }
     } else {
-      // Custom Auth type, eg `Basic XXXX_TOKEN`
-      const type = options.context?.authType ?? 'Bearer';
-
-      if (type === 'Token-Only') {
-        options.headers.authorization = options.token;
-      } else {
-        options.headers.authorization = `${type} ${options.token}`;
-      }
+      options.headers.authorization = `Bearer ${options.token}`;
     }
     delete options.token;
   } else if (options.password !== undefined) {