Add token without file

.gitignore

@@ -3,4 +3,5 @@ composer.phar
 composer.lock
 .DS_Store
 Thumbs.db
-.idea
+.idea
+.history/

src/GmailConnection.php

@@ -27,24 +27,23 @@ class GmailConnection extends Google_Client
 	private $configuration;
 	public $userId;
 
-	public function __construct($config = null, $userId = null)
+	public function __construct($config = null, $userId = null, array $configObject = [])
 	{
 		$this->app = Container::getInstance();
-
 		$this->userId = $userId;
-
+		if (!empty($configObject)) {
+			$this->configObject = $configObject;
+		}
 		$this->configConstruct($config);
 
 		$this->configuration = $config;
-
 		parent::__construct($this->getConfigs());
 
 		$this->configApi();
 
 		if ($this->checkPreviouslyLoggedIn()) {
 			$this->refreshTokenIfNeeded();
 		}
-
 	}
 
 	/**
@@ -57,17 +56,20 @@ public function checkPreviouslyLoggedIn()
 		$fileName = $this->getFileName();
 		$file = "gmail/tokens/$fileName.json";
 		$allowJsonEncrypt = $this->_config['gmail.allow_json_encrypt'];
+		if (!empty($this->configObject)) {
+			return !empty($this->configObject['access_token']);
+		}
+		// if (Storage::disk('local')->exists($file)) {
+		// 	if ($allowJsonEncrypt) {
+		// 		$savedConfigToken = json_decode(decrypt(Storage::disk('local')->get($file)), true);
+		// 	} else {
+		// 		$savedConfigToken = json_decode(Storage::disk('local')->get($file), true);
+		// 	}
 
-		if (Storage::disk('local')->exists($file)) {
-			if ($allowJsonEncrypt) {
-				$savedConfigToken = json_decode(decrypt(Storage::disk('local')->get($file)), true);
-			} else {
-				$savedConfigToken = json_decode(Storage::disk('local')->get($file), true);
-			}
+		// 	return !empty($savedConfigToken['access_token']);
 
-			return !empty($savedConfigToken['access_token']);
 
-		}
+		// }
 
 		return false;
 	}
@@ -183,21 +185,26 @@ public function saveAccessToken(array $config)
 	 * @return array|string
 	 * @throws \Exception
 	 */
-	public function makeToken()
+	public function makeToken($saveFile = true)
 	{
 		if (!$this->check()) {
 			$request = Request::capture();
 			$code = (string)$request->input('code', null);
 			if (!is_null($code) && !empty($code)) {
 				$accessToken = $this->fetchAccessTokenWithAuthCode($code);
+                $this->configObject = $accessToken;
 				if ($this->haveReadScope()) {
 					$me = $this->getProfile();
 					if (property_exists($me, 'emailAddress')) {
 						$this->emailAddress = $me->emailAddress;
 						$accessToken['email'] = $me->emailAddress;
 					}
 				}
-				$this->setBothAccessToken($accessToken);
+				if ($saveFile) {
+					$this->setBothAccessToken($accessToken);
+				} else {
+					$this->setAccessToken($accessToken);
+				}
 
 				return $accessToken;
 			} else {

src/LaravelGmailClass.php

@@ -8,13 +8,13 @@
 
 class LaravelGmailClass extends GmailConnection
 {
-	public function __construct($config, $userId = null)
+	public function __construct($config, $userId = null, array $configObject = [])
 	{
 		if (class_basename($config) === 'Application') {
 			$config = $config['config'];
 		}
 
-		parent::__construct($config, $userId);
+		parent::__construct($config, $userId, $configObject);
 	}
 
 	/**

src/Services/Message/Mail.php

@@ -59,10 +59,10 @@ class Mail extends GmailConnection
 	 */
 	public $threadId;
 
-    /**
-     * @var
-     */
-    public $historyId;
+	/**
+	 * @var
+	 */
+	public $historyId;
 
 	/**
 	 * @var \Google_Service_Gmail_MessagePart
@@ -71,12 +71,17 @@ class Mail extends GmailConnection
 
 	public $parts;
 
+	/**
+	 * @var
+	 */
+	public $snippet;
+
 	/**
 	 * @var Google_Service_Gmail
 	 */
 	public $service;
 
-    /**
+	/**
 	 * SingleMessage constructor.
 	 *
 	 * @param \Google_Service_Gmail_Message $message
@@ -130,6 +135,7 @@ protected function setMessage(\Google_Service_Gmail_Message $message)
 		$this->threadId = $message->getThreadId();
 		$this->historyId = $message->getHistoryId();
 		$this->payload = $message->getPayload();
+		$this->snippet = $message->getSnippet();
 		if ($this->payload) {
 			$this->parts = collect($this->payload->getParts());
 		}
@@ -231,6 +237,18 @@ public function getReplyTo()
 		return $this->getFrom($replyTo ? $replyTo : $this->getHeader('From'));
 	}
 
+	/**
+	 * Returns the Snippet from the email
+	 *
+	 * @return string
+	 */
+	public function getSnippet()
+	{
+
+
+		return $this->snippet;
+	}
+
 	/**
 	 * Returns array of name and email of each recipient
 	 *
@@ -348,7 +366,6 @@ public function formatEmailList($emails)
 			$item['name'] = str_replace("\"", '', $name ?: null);
 
 			$all[] = $item;
-
 		}
 
 		return $all;
@@ -407,7 +424,6 @@ public function getPlainTextBody($raw = false)
 	public function getBody($type = 'text/plain')
 	{
 		$parts = $this->getAllParts($this->parts);
-
 		try {
 			if (!$parts->isEmpty()) {
 				foreach ($parts as $part) {
@@ -531,11 +547,9 @@ public function getAttachments($preload = false)
 		foreach ($parts as $part) {
 			if (!empty($part->body->attachmentId)) {
 				$attachment = (new Attachment($part->body->attachmentId, $part, $this->userId));
-
-				if ($preload) {
-					$attachment = $attachment->getData();
-				}
-
+				// if ($preload) {
+				// 	$attachment = $attachment->getData();
+				// }
 				$attachments->push($attachment);
 			}
 		}

src/Traits/Configurable.php

@@ -15,35 +15,47 @@ trait Configurable
 
 	protected $additionalScopes = [];
 	private $_config;
+	private $configObject;
 
 	public function __construct($config)
 	{
 		$this->_config = $config;
 	}
 
+	public function setConfiguration($config)
+	{
+		$this->configObject = $config;
+	}
+
 	public function config($string = null)
 	{
 		$disk = Storage::disk('local');
 		$fileName = $this->getFileName();
 		$file = "gmail/tokens/$fileName.json";
 		$allowJsonEncrypt = $this->_config['gmail.allow_json_encrypt'];
-
-		if ($disk->exists($file)) {
-			if ($allowJsonEncrypt) {
-				$config = json_decode(decrypt($disk->get($file)), true);
-			} else {
-				$config = json_decode($disk->get($file), true);
-			}
-
+		if ($this->configObject) {
 			if ($string) {
-				if (isset($config[$string])) {
-					return $config[$string];
+				if (isset($this->configObject[$string])) {
+					return $this->configObject[$string];
 				}
-			} else {
-				return $config;
 			}
-
+			return $this->configObject;
 		}
+		// if ($disk->exists($file)) {
+		// 	if ($allowJsonEncrypt) {
+		// 		$config = json_decode(decrypt($disk->get($file)), true);
+		// 	} else {
+		// 		$config = json_decode($disk->get($file), true);
+		// 	}
+
+		// 	if ($string) {
+		// 		if (isset($config[$string])) {
+		// 			return $config[$string];
+		// 		}
+		// 	} else {
+		// 		return $config;
+		// 	}
+		// }
 
 		return null;
 	}
@@ -90,12 +102,14 @@ private function configApi()
 	{
 		$type = $this->_config['gmail.access_type'];
 		$approval_prompt = $this->_config['gmail.approval_prompt'];
+		$prompt = $this->_config['gmail.prompt'];
 
 		$this->setScopes($this->getUserScopes());
 
 		$this->setAccessType($type);
 
 		$this->setApprovalPrompt($approval_prompt);
+		$this->setPrompt($prompt);
 	}
 
 	public abstract function setScopes($scopes);
@@ -141,5 +155,5 @@ private function scopeMap($scope)
 	public abstract function setAccessType($type);
 
 	public abstract function setApprovalPrompt($approval);
-
+	public abstract function setPrompt($prompt);
 }

src/Traits/HasLabels.php

@@ -56,4 +56,18 @@ public function firstOrCreateLabel($userEmail, $newLabel)
 
 		return $service->users_labels->create($userEmail, $newLabel);
 	}
+
+	/**
+	 * List the labels in the user's mailbox.
+	 *
+	 * @param $userEmail
+	 *
+	 * @return \Google\Service\Gmail\Label
+	 */
+	public function getLabel($userEmail, $id)
+	{
+		$service = new Google_Service_Gmail($this);
+
+		return $service->users_labels->get($userEmail, $id);
+	}
 }

src/Traits/Replyable.php

@@ -359,7 +359,6 @@ public function setHeader($header, $value)
 		$headers = $this->symfonyEmail->getHeaders();
 
 		$headers->addTextHeader($header, $value);
-
 	}
 
 	private function setReplySubject()
@@ -401,16 +400,18 @@ public abstract function getUser();
 	private function getMessageBody()
 	{
 		$body = new Google_Service_Gmail_Message();
-
 		$this->symfonyEmail
 			->from($this->fromAddress())
 			->to($this->toAddress())
-			->cc($this->returnCopies($this->cc))
-			->bcc($this->returnCopies($this->bcc))
 			->subject($this->subject)
 			->html($this->message)
 			->priority($this->priority);
-
+		if (!empty($this->cc)) {
+			$this->symfonyEmail->cc($this->returnCopies($this->cc));
+		}
+		if (!empty($this->bcc)) {
+			$this->symfonyEmail->bcc($this->returnCopies($this->bcc));
+		}
 		foreach ($this->attachments as $file) {
 			$this->symfonyEmail->attachFromPath($file);
 		}
@@ -438,7 +439,7 @@ public function returnCopies($cc)
 			return $final;
 		}
 
-		return [];
+		return "";
 	}
 
 	public function toAddress()
@@ -472,7 +473,6 @@ private function base64_encode($data)
 	public function send()
 	{
 		$body = $this->getMessageBody();
-
 		$this->setMessage($this->service->users_messages->send('me', $body, $this->parameters));
 
 		return $this;