gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(open-authoring): add alwaysFork option (#5204)

Browse Source
This commit is contained in:
Bassam Tabbara 2021-04-04 05:11:45 -07:00 committed by GitHub
parent 7a2a1810e3
commit 7b19e30dd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/netlify-cms-backend-github/src/implementation.tsx
View File

@ -67,6 +67,7 @@ export default class GitHub implements Implementation {
repo?: string; repo?: string;
openAuthoringEnabled: boolean; openAuthoringEnabled: boolean;
useOpenAuthoring?: boolean; useOpenAuthoring?: boolean;
alwaysForkEnabled: boolean;
branch: string; branch: string;
apiRoot: string; apiRoot: string;
mediaFolder: string; mediaFolder: string;
@ -109,6 +110,7 @@ export default class GitHub implements Implementation {
} else { } else {
this.repo = this.originRepo = config.backend.repo || ''; this.repo = this.originRepo = config.backend.repo || '';
} }
this.alwaysForkEnabled = config.backend.always_fork || false;
this.branch = config.backend.branch?.trim() || 'master'; this.branch = config.backend.branch?.trim() || 'master';
this.apiRoot = config.backend.api_root || 'https://api.github.com'; this.apiRoot = config.backend.api_root || 'https://api.github.com';
this.token = ''; this.token = '';
@ -268,8 +270,9 @@ export default class GitHub implements Implementation {
} }
const token = userData.token as string; const token = userData.token as string;
// Origin maintainers should be able to use the CMS normally // Origin maintainers should be able to use the CMS normally. If alwaysFork
if (await this.userIsOriginMaintainer({ token })) { // is enabled we always fork (and avoid the origin maintainer check)
if (!this.alwaysForkEnabled && (await this.userIsOriginMaintainer({ token }))) {
this.repo = this.originRepo; this.repo = this.originRepo;
this.useOpenAuthoring = false; this.useOpenAuthoring = false;
return Promise.resolve(); return Promise.resolve();

1
packages/netlify-cms-lib-util/src/implementation.ts
View File

@ -93,6 +93,7 @@ export type Config = {
backend: { backend: {
repo?: string | null; repo?: string | null;
open_authoring?: boolean; open_authoring?: boolean;
always_fork?: boolean;
branch?: string; branch?: string;
api_root?: string; api_root?: string;
squash_merges?: boolean; squash_merges?: boolean;