diff --git a/adminSDK/directory/quickstart.gs b/adminSDK/directory/quickstart.gs index 18d2b744c..78fe433c0 100644 --- a/adminSDK/directory/quickstart.gs +++ b/adminSDK/directory/quickstart.gs @@ -24,21 +24,25 @@ function listUsers() { maxResults: 10, orderBy: 'email' }; - try { - const response = AdminDirectory.Users.list(optionalArgs); - const users = response.users; - if (!users || users.length === 0) { - console.log('No users found.'); - return; - } - // Print the list of user's full name and email - console.log('Users:'); - for (const user of users) { - console.log('%s (%s)', user.primaryEmail, user.name.fullName); + if (!AdminDirectory || !AdminDirectory.Users) { + throw new Error('Enable the AdminDirectory Advanced Service.'); + } + const response = AdminDirectory.Users.list(optionalArgs); + const users = response.users; + if (!users || users.length === 0) { + console.log('No users found.'); + return; + } + // Print the list of user's full name and email + console.log('Users:'); + for (const user of users) { + if (user.primaryEmail) { + if (user.name?.fullName) { + console.log('%s (%s)', user.primaryEmail, user.name.fullName); + } else { + console.log('%s', user.primaryEmail); + } } - } catch (err) { - // TODO (developer)- Handle exception from the Directory API - console.log('Failed with error %s', err.message); } } // [END admin_sdk_directory_quickstart] diff --git a/adminSDK/reports/quickstart.gs b/adminSDK/reports/quickstart.gs index 5b5778886..9612f39aa 100644 --- a/adminSDK/reports/quickstart.gs +++ b/adminSDK/reports/quickstart.gs @@ -24,22 +24,23 @@ function listLogins() { const optionalArgs = { maxResults: 10 }; - try { - const response = AdminReports.Activities.list(userKey, applicationName, optionalArgs); - const activities = response.items; - if (!activities || activities.length === 0) { - console.log('No logins found.'); - return; - } - // Print login events - console.log('Logins:'); - for (const activity of activities) { + if (!AdminReports || !AdminReports.Activities) { + throw new Error('Enable the AdminReports Advanced Service.'); + } + const response = AdminReports.Activities.list( + userKey, applicationName, optionalArgs); + const activities = response.items; + if (!activities || activities.length === 0) { + console.log('No logins found.'); + return; + } + // Print login events + console.log('Logins:'); + for (const activity of activities) { + if (activity.id?.time && activity.actor?.email && activity.events?.[0]?.name) { console.log('%s: %s (%s)', activity.id.time, activity.actor.email, activity.events[0].name); } - } catch (err) { - // TODO (developer)- Handle exception from the Report API - console.log('Failed with error %s', err.message); } } // [END admin_sdk_reports_quickstart] diff --git a/adminSDK/reseller/quickstart.gs b/adminSDK/reseller/quickstart.gs index 3e7ee0e6b..95947e24c 100644 --- a/adminSDK/reseller/quickstart.gs +++ b/adminSDK/reseller/quickstart.gs @@ -22,21 +22,25 @@ function listSubscriptions() { const optionalArgs = { maxResults: 10 }; - try { - const response = AdminReseller.Subscriptions.list(optionalArgs); - const subscriptions = response.subscriptions; - if (!subscriptions || subscriptions.length === 0) { - console.log('No subscriptions found.'); - return; - } - console.log('Subscriptions:'); - for (const subscription of subscriptions) { - console.log('%s (%s, %s)', subscription.customerId, subscription.skuId, - subscription.plan.planName); + if (!AdminReseller || !AdminReseller.Subscriptions) { + throw new Error('Enable the AdminReseller Advanced Service.'); + } + const response = AdminReseller.Subscriptions.list(optionalArgs); + const subscriptions = response.subscriptions; + if (!subscriptions || subscriptions.length === 0) { + console.log('No subscriptions found.'); + return; + } + console.log('Subscriptions:'); + for (const subscription of subscriptions) { + if (subscription.customerId && subscription.skuId) { + if (subscription.plan?.planName) { + console.log('%s (%s, %s)', subscription.customerId, subscription.skuId, + subscription.plan.planName); + } else { + console.log('%s (%s)', subscription.customerId, subscription.skuId); + } } - } catch (err) { - // TODO (developer)- Handle exception from the Reseller API - console.log('Failed with error %s', err.message); } } // [END admin_sdk_reseller_quickstart]