@@ -441,7 +441,7 @@ export function getChannelDetails(channelId: string): ChannelDetail | null {
441441}
442442
443443export type GitHubInfo = {
444- token : string ;
444+ token ? : string ;
445445 gitName ?: string ;
446446 gitEmail ?: string ;
447447} ;
@@ -454,11 +454,15 @@ export type UserGeneralSettings = {
454454export function getGitHubInfoForUser ( userId : string ) : GitHubInfo | null {
455455 const info = loadOdeConfig ( ) . githubInfos ?. [ userId ] ;
456456 if ( ! info ) return null ;
457- const token = info . token ?. trim ( ) ;
458- if ( ! token ) return null ;
459- const gitName = info . gitName ?. trim ( ) || undefined ;
460- const gitEmail = info . gitEmail ?. trim ( ) || undefined ;
461- return { token, gitName, gitEmail } ;
457+ const token = info . token ?. trim ( ) || "" ;
458+ const gitName = info . gitName ?. trim ( ) || "" ;
459+ const gitEmail = info . gitEmail ?. trim ( ) || "" ;
460+ if ( ! token && ! gitName && ! gitEmail ) return null ;
461+ return {
462+ token : token || undefined ,
463+ gitName : gitName || undefined ,
464+ gitEmail : gitEmail || undefined ,
465+ } ;
462466}
463467
464468export function getUserGeneralSettings ( ) : UserGeneralSettings {
@@ -487,14 +491,16 @@ export function setUserGeneralSettings(settings: UserGeneralSettings): void {
487491export function setGitHubInfoForUser ( userId : string , info : GitHubInfo ) : void {
488492 const config = loadOdeConfig ( ) ;
489493 const githubInfos = { ...( config . githubInfos ?? { } ) } ;
490- const token = info . token . trim ( ) ;
491- if ( token . length === 0 ) {
494+ const token = info . token ?. trim ( ) || "" ;
495+ const gitName = info . gitName ?. trim ( ) || "" ;
496+ const gitEmail = info . gitEmail ?. trim ( ) || "" ;
497+ if ( ! token && ! gitName && ! gitEmail ) {
492498 delete githubInfos [ userId ] ;
493499 } else {
494500 githubInfos [ userId ] = {
495501 token,
496- gitName : info . gitName ?. trim ( ) || "" ,
497- gitEmail : info . gitEmail ?. trim ( ) || "" ,
502+ gitName,
503+ gitEmail,
498504 } ;
499505 }
500506 saveOdeConfig ( { ...config , githubInfos } ) ;
0 commit comments