@@ -1314,6 +1314,7 @@ export class GitpodServerImpl<Client extends GitpodClient, Server extends Gitpod
1314
1314
async setEnvVar ( variable : UserEnvVarValue ) : Promise < void > {
1315
1315
// Note: this operation is per-user only, hence needs no resource guard
1316
1316
const user = this . checkUser ( "setEnvVar" ) ;
1317
+ const userId = user . id ;
1317
1318
1318
1319
variable . repositoryPattern = UserEnvVar . normalizeRepoPattern ( variable . repositoryPattern ) ;
1319
1320
const existingVars = ( await this . userDB . getEnvVars ( user . id ) ) . filter ( v => ! v . deleted ) ;
@@ -1335,17 +1336,18 @@ export class GitpodServerImpl<Client extends GitpodClient, Server extends Gitpod
1335
1336
const envvar : UserEnvVar = {
1336
1337
...variable ,
1337
1338
id : variable . id || uuidv4 ( ) ,
1338
- userId : user . id ,
1339
+ userId,
1339
1340
} ;
1340
1341
await this . guardAccess ( { kind : 'envVar' , subject : envvar } , typeof variable . id === 'string' ? 'update' : 'create' ) ;
1341
- this . analytics . track ( { event : "envvar-set" , userId : this . user ?. id || "" } ) ;
1342
+ this . analytics . track ( { event : "envvar-set" , userId } ) ;
1342
1343
1343
1344
await this . userDB . setEnvVar ( envvar ) ;
1344
1345
}
1345
1346
1346
1347
async deleteEnvVar ( variable : UserEnvVarValue ) : Promise < void > {
1347
1348
// Note: this operation is per-user only, hence needs no resource guard
1348
1349
const user = this . checkUser ( "deleteEnvVar" ) ;
1350
+ const userId = user . id ;
1349
1351
1350
1352
if ( ! variable . id && variable . name && variable . repositoryPattern ) {
1351
1353
variable . repositoryPattern = UserEnvVar . normalizeRepoPattern ( variable . repositoryPattern ) ;
@@ -1361,10 +1363,10 @@ export class GitpodServerImpl<Client extends GitpodClient, Server extends Gitpod
1361
1363
const envvar : UserEnvVar = {
1362
1364
...variable ,
1363
1365
id : variable . id ! ,
1364
- userId : user . id ,
1366
+ userId,
1365
1367
} ;
1366
1368
await this . guardAccess ( { kind : 'envVar' , subject : envvar } , 'delete' ) ;
1367
- this . analytics . track ( { event : "envvar-deleted" , userId : this . user ?. id || "" } ) ;
1369
+ this . analytics . track ( { event : "envvar-deleted" , userId } ) ;
1368
1370
1369
1371
await this . userDB . deleteEnvVar ( envvar ) ;
1370
1372
}
0 commit comments