decap-cms-backend-github 3.3.1 → 3.5.0

package/src/implementation.tsx

@@ -26,7 +26,7 @@ import AuthenticationPage from './AuthenticationPage';
 import API, { API_NAME } from './API';
 import GraphQLAPI from './GraphQLAPI';
 
-import type { Octokit } from '@octokit/rest';
+import type { Endpoints } from '@octokit/types';
 import type {
   AsyncLock,
   Implementation,
@@ -42,7 +42,7 @@ import type {
 } from 'decap-cms-lib-util';
 import type { Semaphore } from 'semaphore';
 
-export type GitHubUser = Octokit.UsersGetAuthenticatedResponse;
+export type GitHubUser = Endpoints['GET /user']['response']['data'];
 
 const MAX_CONCURRENT_DOWNLOADS = 10;
 
@@ -210,13 +210,20 @@ export default class GitHub implements Implementation {
     return Promise.resolve();
   }
 
-  async currentUser({ token }: { token: string }) {
+  async currentUser({ token }: { token: string }): Promise<GitHubUser> {
     if (!this._currentUserPromise) {
-      this._currentUserPromise = fetch(`${this.apiRoot}/user`, {
-        headers: {
-          Authorization: `${this.tokenKeyword} ${token}`,
-        },
-      }).then(res => res.json());
+      this._currentUserPromise = (async () => {
+        const res = await fetch(`${this.apiRoot}/user`, {
+          headers: {
+            Authorization: `${this.tokenKeyword} ${token}`,
+          },
+        });
+        const user = await res.json();
+        return {
+          ...user,
+          name: user.name || 'Unknown',
+        } as GitHubUser;
+      })();
     }
     return this._currentUserPromise;
   }
@@ -346,7 +353,7 @@ export default class GitHub implements Implementation {
       useOpenAuthoring: this.useOpenAuthoring,
       initialWorkflowStatus: this.options.initialWorkflowStatus,
       baseUrl: this.baseUrl,
-      getUser: this.currentUser,
+      getUser: args => this.currentUser(args),
     });
     const user = await this.api!.user();
     const isCollab = await this.api!.hasWriteAccess().catch(error => {