Skip to content

Commit 6e00380

Browse files
sqrrrlsqrrrl
authored
Merge pull request #105 from RajeshGogo/quickstart
Quickstart update
2 parents a521b7a + d1bb561 commit 6e00380

File tree

16 files changed

+275
-195
lines changed

16 files changed

+275
-195
lines changed

‎admin-sdk/directory/quickstart.php‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function getClient()
2929
{
3030
$client = new Google_Client();
3131
$client->setApplicationName('G Suite Directory API PHP Quickstart');
32-
$client->setScopes(Google_Service_Directory::ADMIN_DIRECTORY_USER_READONLY);
32+
$client->setScopes('https://www.googleapis.com/auth/admin.directory.user.readonly');
3333
$client->setAuthConfig('credentials.json');
3434
$client->setAccessType('offline');
3535
$client->setPrompt('select_account consent');
@@ -80,20 +80,27 @@ function getClient()
8080
$service = new Google_Service_Directory($client);
8181

8282
// Print the first 10 users in the domain.
83-
$optParams = array(
84-
'customer' => 'my_customer',
85-
'maxResults' => 10,
86-
'orderBy' => 'email',
87-
);
88-
$results = $service->users->listUsers($optParams);
83+
try{
8984

90-
if (count($results->getUsers()) == 0) {
91-
print "No users found.\n";
92-
} else {
93-
print "Users:\n";
94-
foreach ($results->getUsers() as $user) {
95-
printf("%s (%s)\n", $user->getPrimaryEmail(),
96-
$user->getName()->getFullName());
97-
}
85+
$optParams = array(
86+
'customer' => 'my_customer',
87+
'maxResults' => 10,
88+
'orderBy' => 'email',
89+
);
90+
$results = $service->users->listUsers($optParams);
91+
92+
if (count($results->getUsers()) == 0) {
93+
print "No users found.\n";
94+
} else {
95+
print "Users:\n";
96+
foreach ($results->getUsers() as $user) {
97+
printf("%s (%s)\n", $user->getPrimaryEmail(),
98+
$user->getName()->getFullName());
99+
}
100+
}
101+
}
102+
catch(Exception $e) {
103+
// TODO(developer) - handle error appropriately
104+
echo 'Message: ' .$e->getMessage();
98105
}
99-
// [END admin_sdk_directory_quickstart]
106+
// [END admin_sdk_directory_quickstart]

‎admin-sdk/reports/quickstart.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function getClient()
2929
{
3030
$client = new Google_Client();
3131
$client->setApplicationName('Reports API PHP Quickstart');
32-
$client->setScopes(Google_Service_Reports::ADMIN_REPORTS_AUDIT_READONLY);
32+
$client->setScopes('https://www.googleapis.com/auth/admin.reports.audit.readonly');
3333
$client->setAuthConfig('credentials.json');
3434
$client->setAccessType('offline');
3535
$client->setPrompt('select_account consent');
@@ -83,19 +83,19 @@ function getClient()
8383
$userKey = 'all';
8484
$applicationName = 'login';
8585
$optParams = array(
86-
'maxResults' => 10,
86+
'maxResults' => 10,
8787
);
8888
$results = $service->activities->listActivities(
8989
$userKey, $applicationName, $optParams);
9090

9191
if (count($results->getItems()) == 0) {
92-
print "No logins found.\n";
92+
print "No logins found.\n";
9393
} else {
94-
print "Logins:\n";
95-
foreach ($results->getItems() as $activity) {
96-
printf("%s: %s (%s)\n", $activity->getId()->getTime(),
97-
$activity->getActor()->getEmail(),
98-
$activity->getEvents()[0]->getName());
99-
}
94+
print "Logins:\n";
95+
foreach ($results->getItems() as $activity) {
96+
printf("%s: %s (%s)\n", $activity->getId()->getTime(),
97+
$activity->getActor()->getEmail(),
98+
$activity->getEvents()[0]->getName());
99+
}
100100
}
101-
// [END admin_sdk_reports_quickstart]
101+
// [END admin_sdk_reports_quickstart]

‎admin-sdk/reseller/quickstart.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function getClient()
2929
{
3030
$client = new Google_Client();
3131
$client->setApplicationName('G Suite Reseller API PHP Quickstart');
32-
$client->setScopes(Google_Service_Reseller::APPS_ORDER);
32+
$client->setScopes("https://www.googleapis.com/auth/apps.order");
3333
$client->setAuthConfig('credentials.json');
3434
$client->setAccessType('offline');
3535
$client->setPrompt('select_account consent');
@@ -81,17 +81,17 @@ function getClient()
8181

8282
// Print the first 10 subscriptions you manage.
8383
$optParams = array(
84-
'maxResults' => 10,
84+
'maxResults' => 10,
8585
);
8686
$results = $service->subscriptions->listSubscriptions($optParams);
8787

8888
if (count($results->getSubscriptions()) == 0) {
89-
print "No subscriptions found.\n";
89+
print "No subscriptions found.\n";
9090
} else {
91-
print "Subscriptions:\n";
92-
foreach ($results->getSubscriptions() as $subscription) {
93-
printf("%s (%s, %s)\n", $subscription->getCustomerId(),
94-
$subscription->getSkuId(), $subscription->getPlan()->getPlanName());
95-
}
91+
print "Subscriptions:\n";
92+
foreach ($results->getSubscriptions() as $subscription) {
93+
printf("%s (%s, %s)\n", $subscription->getCustomerId(),
94+
$subscription->getSkuId(), $subscription->getPlan()->getPlanName());
95+
}
9696
}
97-
// [END admin_sdk_reseller_quickstart]
97+
// [END admin_sdk_reseller_quickstart]

‎apps-script/quickstart/quickstart.php‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -85,37 +85,44 @@ function getClient()
8585
$service = new Google_Service_Script($client);
8686

8787
// Create a management request object.
88-
$request = new Google_Service_Script_CreateProjectRequest();
89-
$request->setTitle('My Script');
90-
$response = $service->projects->create($request);
88+
try{
9189

92-
$scriptId = $response->getScriptId();
90+
$request = new Google_Service_Script_CreateProjectRequest();
91+
$request->setTitle('My Script');
92+
$response = $service->projects->create($request);
9393

94-
$code = <<<EOT
94+
$scriptId = $response->getScriptId();
95+
96+
$code = <<<EOT
9597
function helloWorld() {
9698
console.log('Hello, world!');
9799
}
98100
EOT;
99-
$file1 = new Google_Service_Script_ScriptFile();
100-
$file1->setName('hello');
101-
$file1->setType('SERVER_JS');
102-
$file1->setSource($code);
101+
$file1 = new Google_Service_Script_ScriptFile();
102+
$file1->setName('hello');
103+
$file1->setType('SERVER_JS');
104+
$file1->setSource($code);
103105

104-
$manifest = <<<EOT
106+
$manifest = <<<EOT
105107
{
106108
"timeZone": "America/New_York",
107109
"exceptionLogging": "CLOUD"
108110
}
109111
EOT;
110-
$file2 = new Google_Service_Script_ScriptFile();
111-
$file2->setName('appsscript');
112-
$file2->setType('JSON');
113-
$file2->setSource($manifest);
112+
$file2 = new Google_Service_Script_ScriptFile();
113+
$file2->setName('appsscript');
114+
$file2->setType('JSON');
115+
$file2->setSource($manifest);
114116

115-
$request = new Google_Service_Script_Content();
116-
$request->setScriptId($scriptId);
117-
$request->setFiles([$file1, $file2]);
117+
$request = new Google_Service_Script_Content();
118+
$request->setScriptId($scriptId);
119+
$request->setFiles([$file1, $file2]);
118120

119-
$response = $service->projects->updateContent($scriptId, $request);
120-
echo "https://script.google.com/d/" . $response->getScriptId() . "/edit\n";
121-
// [END apps_script_api_quickstart]
121+
$response = $service->projects->updateContent($scriptId, $request);
122+
echo "https://script.google.com/d/" . $response->getScriptId() . "/edit\n";
123+
}
124+
catch(Exception $e) {
125+
// TODO(developer) - handle error appropriately
126+
echo 'Message: ' .$e->getMessage();
127+
}
128+
// [END apps_script_api_quickstart]

‎calendar/quickstart/quickstart.php‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function getClient()
2929
{
3030
$client = new Google_Client();
3131
$client->setApplicationName('Google Calendar API PHP Quickstart');
32-
$client->setScopes(Google_Service_Calendar::CALENDAR_READONLY);
32+
$client->setScopes('https://www.googleapis.com/auth/calendar.events.readonly');
3333
$client->setAuthConfig('credentials.json');
3434
$client->setAccessType('offline');
3535
$client->setPrompt('select_account consent');
@@ -80,26 +80,33 @@ function getClient()
8080
$service = new Google_Service_Calendar($client);
8181

8282
// Print the next 10 events on the user's calendar.
83-
$calendarId = 'primary';
84-
$optParams = array(
85-
'maxResults' => 10,
86-
'orderBy' => 'startTime',
87-
'singleEvents' => true,
88-
'timeMin' => date('c'),
89-
);
90-
$results = $service->events->listEvents($calendarId, $optParams);
91-
$events = $results->getItems();
83+
try{
9284

93-
if (empty($events)) {
94-
print "No upcoming events found.\n";
95-
} else {
96-
print "Upcoming events:\n";
97-
foreach ($events as $event) {
98-
$start = $event->start->dateTime;
99-
if (empty($start)) {
100-
$start = $event->start->date;
85+
$calendarId = 'primary';
86+
$optParams = array(
87+
'maxResults' => 10,
88+
'orderBy' => 'startTime',
89+
'singleEvents' => true,
90+
'timeMin' => date('c'),
91+
);
92+
$results = $service->events->listEvents($calendarId, $optParams);
93+
$events = $results->getItems();
94+
95+
if (empty($events)) {
96+
print "No upcoming events found.\n";
97+
} else {
98+
print "Upcoming events:\n";
99+
foreach ($events as $event) {
100+
$start = $event->start->dateTime;
101+
if (empty($start)) {
102+
$start = $event->start->date;
103+
}
104+
printf("%s (%s)\n", $event->getSummary(), $start);
101105
}
102-
printf("%s (%s)\n", $event->getSummary(), $start);
103106
}
104107
}
105-
// [END calendar_quickstart]
108+
catch(Exception $e) {
109+
// TODO(developer) - handle error appropriately
110+
echo 'Message: ' .$e->getMessage();
111+
}
112+
// [END calendar_quickstart]

‎classroom/quickstart/quickstart.php‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function getClient()
2929
{
3030
$client = new Google_Client();
3131
$client->setApplicationName('Google Classroom API PHP Quickstart');
32-
$client->setScopes(Google_Service_Classroom::CLASSROOM_COURSES_READONLY);
32+
$client->setScopes('https://www.googleapis.com/auth/classroom.courses.readonly');
3333
$client->setAuthConfig('credentials.json');
3434
$client->setAccessType('offline');
3535
$client->setPrompt('select_account consent');
@@ -80,17 +80,25 @@ function getClient()
8080
$service = new Google_Service_Classroom($client);
8181

8282
// Print the first 10 courses the user has access to.
83-
$optParams = array(
84-
'pageSize' => 10
85-
);
86-
$results = $service->courses->listCourses($optParams);
83+
try{
8784

88-
if (count($results->getCourses()) == 0) {
89-
print "No courses found.\n";
90-
} else {
91-
print "Courses:\n";
92-
foreach ($results->getCourses() as $course) {
93-
printf("%s (%s)\n", $course->getName(), $course->getId());
94-
}
85+
$optParams = array(
86+
'pageSize' => 10
87+
);
88+
$results = $service->courses->listCourses($optParams);
89+
90+
if (count($results->getCourses()) == 0) {
91+
print "No courses found.\n";
92+
} else {
93+
print "Courses:\n";
94+
foreach ($results->getCourses() as $course) {
95+
printf("%s (%s)\n", $course->getName(), $course->getId());
96+
}
97+
}
9598
}
96-
// [END classroom_quickstart]
99+
catch(Exception $e) {
100+
// TODO(developer) - handle error appropriately
101+
echo 'Message: ' .$e->getMessage();
102+
}
103+
104+
// [END classroom_quickstart]

‎docs/quickstart/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"require": {
3-
"google/apiclient": "^2.0"
3+
"google/apiclient": "^2.2"
44
}
55
}

‎docs/quickstart/quickstart.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function getClient()
2525
{
2626
$client = new Google_Client();
2727
$client->setApplicationName('Google Docs API PHP Quickstart');
28-
$client->setScopes(Google_Service_Docs::DOCUMENTS_READONLY);
28+
$client->setScopes('https://www.googleapis.com/auth/documents.readonly ');
2929
$client->setAuthConfig('credentials.json');
3030
$client->setAccessType('offline');
3131

‎drive/activity-v2/quickstart.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function getClient()
2929
{
3030
$client = new Google_Client();
3131
$client->setApplicationName('Google Drive Activity API Quickstart');
32-
$client->setScopes(Google_Service_DriveActivity::DRIVE_ACTIVITY_READONLY);
32+
$client->setScopes('https://www.googleapis.com/auth/drive.activity.readonly');
3333
$client->setAuthConfig('credentials.json');
3434
$client->setAccessType('offline');
3535
$client->setPrompt('select_account consent');
@@ -169,4 +169,4 @@ function getTargetInfo($target)
169169
}
170170
return getOneOf($target);
171171
}
172-
// [END drive_activity_v2_quickstart]
172+
// [END drive_activity_v2_quickstart]

0 commit comments

Comments
 (0)