Skip to content

Commit

Permalink
fix(ng-dev): always include the github token option on merge. (#771)
Browse files Browse the repository at this point in the history
During the transition from using the github token to using the ng-dev auth service, we
need to always include the github token option. If we fail to include the option, when
the `useNgDevAuthService` config value is not set to `true` no authentication mechanism
for Github will be present.

PR Close #771
  • Loading branch information
josephperrott committed Aug 17, 2022
1 parent 682adb7 commit 5d0da98
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions ng-dev/utils/ng-dev-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ import {
restoreNgTokenFromDiskIfValid,
} from '../auth/shared/ng-dev-token.js';
import {assertValidGithubConfig, getConfig} from './config.js';
import {configureGitClientWithTokenOrFromEnvironment} from './git/github-yargs.js';
import {
addGithubTokenOption,
configureGitClientWithTokenOrFromEnvironment,
} from './git/github-yargs.js';
import {Log} from './logging.js';

/** Configuration for the firebase application used for ng-dev token management. */
Expand Down Expand Up @@ -44,7 +47,7 @@ export async function useNgDevService<T>(
const {github} = await getConfig([assertValidGithubConfig]);

if (github.useNgDevAuthService !== true) {
return argv;
return addGithubTokenOption(argv);
}

return (
Expand Down

0 comments on commit 5d0da98

Please sign in to comment.