File tree Expand file tree Collapse file tree 2 files changed +18
-5
lines changed
Expand file tree Collapse file tree 2 files changed +18
-5
lines changed Original file line number Diff line number Diff line change @@ -104,10 +104,14 @@ export function fromGKDevAIProviders(providers?: GkDevAIProviders): OrgAIProvide
104104 if ( providers == null ) return result ;
105105
106106 Object . entries ( providers ) . forEach ( ( [ type , provider ] ) => {
107- result [ fromGkDevAIProviderType ( type as GkDevAIProviderType ) ] = fromGkDevAIProvider (
108- type as GkDevAIProviderType ,
109- provider ,
110- ) ;
107+ try {
108+ result [ fromGkDevAIProviderType ( type as GkDevAIProviderType ) ] = fromGkDevAIProvider (
109+ type as GkDevAIProviderType ,
110+ provider ,
111+ ) ;
112+ } catch {
113+ // ignore invalid provider, continue with others
114+ }
111115 } ) ;
112116 return result ;
113117}
Original file line number Diff line number Diff line change @@ -140,13 +140,22 @@ export class OrganizationService implements Disposable {
140140
141141 private async updateOrganizationPermissions ( orgId : string | undefined ) : Promise < void > {
142142 const settings = orgId != null ? await this . getOrganizationSettings ( orgId ) : undefined ;
143+ let aiProviders ;
144+ try {
145+ aiProviders = fromGKDevAIProviders ( settings ?. aiProviders ) ;
146+ } catch {
147+ aiProviders = { } ;
148+ if ( settings ) {
149+ settings . enforceAiProviders = false ;
150+ }
151+ }
143152
144153 void setContext (
145154 'gitlens:gk:organization:ai:enabled' ,
146155 settings ?. aiSettings . enabled ?? settings ?. aiEnabled ?? true ,
147156 ) ;
148157 void setContext ( 'gitlens:gk:organization:ai:enforceProviders' , settings ?. enforceAiProviders ?? false ) ;
149- void setContext ( 'gitlens:gk:organization:ai:providers' , fromGKDevAIProviders ( settings ?. aiProviders ) ?? { } ) ;
158+ void setContext ( 'gitlens:gk:organization:ai:providers' , aiProviders ) ;
150159 void setContext ( 'gitlens:gk:organization:drafts:byob' , settings ?. draftsSettings . bucket != null ) ;
151160 void setContext ( 'gitlens:gk:organization:drafts:enabled' , settings ?. draftsSettings . enabled ?? true ) ;
152161 }
You can’t perform that action at this time.
0 commit comments