8a1c6ec4 by Jeff Balicki

commit

1 parent 2c2d0207
...@@ -106,6 +106,8 @@ class ApiController extends Controller ...@@ -106,6 +106,8 @@ class ApiController extends Controller
106 106
107 $json = json_encode($json); 107 $json = json_encode($json);
108 $json = json_decode($json); 108 $json = json_decode($json);
109 $pdfLocation = $json->pdf[0]->pdfLocation;
110
109 111
110 112
111 $storagePath = Storage::disk('public')->getDriver()->getAdapter()->getPathPrefix(); 113 $storagePath = Storage::disk('public')->getDriver()->getAdapter()->getPathPrefix();
...@@ -142,8 +144,8 @@ class ApiController extends Controller ...@@ -142,8 +144,8 @@ class ApiController extends Controller
142 $response = $pdfId; 144 $response = $pdfId;
143 $statusCode = 200; 145 $statusCode = 200;
144 $UploaqdPdf = new GoogledriveuploadpdfController(); 146 $UploaqdPdf = new GoogledriveuploadpdfController();
145 $UploaqdPdf = $UploaqdPdf->google_drive_upload($folder, 'new_'.$fileClean); 147 $UploaqdPdf = $UploaqdPdf->google_drive_upload($folder, 'new_'.$pdfLocation);
146 return Response::json( $response, $statusCode); 148 return Response::json( $response, $statusCode);
147 149
148 150
149 151
......
...@@ -37,19 +37,19 @@ class GoogledriveuploadpdfController extends Controller ...@@ -37,19 +37,19 @@ class GoogledriveuploadpdfController extends Controller
37 $client->setScopes(array('https://www.googleapis.com/auth/drive.file')); 37 $client->setScopes(array('https://www.googleapis.com/auth/drive.file'));
38 $client->setClientId('206523860143-kgs80emhfm1sof79nggd48gnhbl1j6ei.apps.googleusercontent.com'); 38 $client->setClientId('206523860143-kgs80emhfm1sof79nggd48gnhbl1j6ei.apps.googleusercontent.com');
39 $client->setClientSecret('qmUMAi09SU4wU4R3uOkvsiwK'); 39 $client->setClientSecret('qmUMAi09SU4wU4R3uOkvsiwK');
40 $client->setRedirectUri('http://pdf-customizer.synapsus.co/auth/google/callback'); 40 $client->setRedirectUri('http://pdf-customizer.synapsus.co//public/auth/google/token');
41 $client->setAccessType('offline'); 41 //$client->setRedirectUri('http://localhost:8888/pdf-customizer/public/auth/google/token');
42
42 43
43 44
44 // error_log(print_r($client,true)); 45 // error_log(print_r($client,true));
45 46
46 session_start(); 47 session_start();
47 if (isset($_GET['code'])) { 48
48 $client->authenticate();
49 $_SESSION['access_token'] = $client->getAccessToken(); 49 $_SESSION['access_token'] = $client->getAccessToken();
50 } 50
51 $google_token= json_decode($_SESSION['access_token']); 51
52 $client->refreshToken($google_token->refresh_token); 52 $client->refreshToken('1/PZ1OjsCxkeGJx6iVnsQnHOkFYj1_PXir2w-fnugqIkg');
53 53
54 $_SESSION['access_token']= $client->getAccessToken(); 54 $_SESSION['access_token']= $client->getAccessToken();
55 55
...@@ -60,6 +60,10 @@ class GoogledriveuploadpdfController extends Controller ...@@ -60,6 +60,10 @@ class GoogledriveuploadpdfController extends Controller
60 60
61 $file = new \Google_Service_Drive_DriveFile(); 61 $file = new \Google_Service_Drive_DriveFile();
62 62
63 $parent = new \Google_Service_Drive_ParentReference();
64 $parent->setId('0B2R_Tz3gJKhwMUUwclozRWxsRTA');
65 $file->setParents(array($parent));
66
63 67
64 $mimetype = 'application/pdf'; 68 $mimetype = 'application/pdf';
65 $uploadType = 'media'; 69 $uploadType = 'media';
...@@ -84,26 +88,21 @@ class GoogledriveuploadpdfController extends Controller ...@@ -84,26 +88,21 @@ class GoogledriveuploadpdfController extends Controller
84 88
85 } 89 }
86 90
87 public function handleGoogleCallback()
88 {
89
90
91 91
92 92
93 }
94
95 public function GoogleToken() 93 public function GoogleToken()
96 { 94 {
97 95
98 session_start(); 96 session_start();
99 97
100 98
101 99
102 $client = new \Google_Client(); 100 $client = new \Google_Client();
103 $client->setScopes(array('https://www.googleapis.com/auth/drive.file')); 101 $client->setScopes(array('https://www.googleapis.com/auth/drive.file'));
104 $client->setClientId('206523860143-kgs80emhfm1sof79nggd48gnhbl1j6ei.apps.googleusercontent.com'); 102 $client->setClientId('206523860143-kgs80emhfm1sof79nggd48gnhbl1j6ei.apps.googleusercontent.com');
105 $client->setClientSecret('qmUMAi09SU4wU4R3uOkvsiwK'); 103 $client->setClientSecret('qmUMAi09SU4wU4R3uOkvsiwK');
106 $client->setRedirectUri('http://pdf-customizer.synapsus.co/auth/google/callback'); 104 //$client->setRedirectUri('http://pdf-customizer.synapsus.co/auth/google/token');
105 $client->setRedirectUri('http://localhost:8888/pdf-customizer/public/auth/google/tokenCallback');
107 $client->setAccessType('offline'); 106 $client->setAccessType('offline');
108 107
109 if (isset($_GET['code'])) { 108 if (isset($_GET['code'])) {
...@@ -138,7 +137,7 @@ class GoogledriveuploadpdfController extends Controller ...@@ -138,7 +137,7 @@ class GoogledriveuploadpdfController extends Controller
138 echo "Refresh Token = " . $token->refresh_token . '<br/>'; 137 echo "Refresh Token = " . $token->refresh_token . '<br/>';
139 echo "Token type = " . $token->token_type . '<br/>'; 138 echo "Token type = " . $token->token_type . '<br/>';
140 echo "Expires in = " . $token->expires_in . '<br/>'; 139 echo "Expires in = " . $token->expires_in . '<br/>';
141 echo "ID Token = " . $token->id_token . '<br/>'; 140 //echo "ID Token = " . $token->id_token . '<br/>';
142 echo "Created = " . $token->created . '<br/>'; 141 echo "Created = " . $token->created . '<br/>';
143 echo "<a class='logout' href='?logout'>Logout</a>"; 142 echo "<a class='logout' href='?logout'>Logout</a>";
144 } else { 143 } else {
......
...@@ -54,4 +54,5 @@ Route::post('fileentry/add',[ ...@@ -54,4 +54,5 @@ Route::post('fileentry/add',[
54 54
55 Route::get('api/googlePdfUpload/{folder}/{filename}', 'GoogledriveuploadpdfController@google_drive_upload'); 55 Route::get('api/googlePdfUpload/{folder}/{filename}', 'GoogledriveuploadpdfController@google_drive_upload');
56 Route::get('auth/google/callback', 'GoogledriveuploadpdfController@google_drive_upload'); 56 Route::get('auth/google/callback', 'GoogledriveuploadpdfController@google_drive_upload');
57 Route::get('auth/google/token', 'GoogledriveuploadpdfController@GoogleToken');
...\ No newline at end of file ...\ No newline at end of file
57 Route::get('auth/google/token', 'GoogledriveuploadpdfController@GoogleToken');
58 Route::get('auth/google/tokenCallback', 'GoogledriveuploadpdfController@GoogleToken');
...\ No newline at end of file ...\ No newline at end of file
......