Merge pull request elbuo8#10 from AMeng/use-api-key

Use SendGrid API key

Author: Yamil Asusta

.gitignore

@@ -2,4 +2,5 @@ build
 dist
 sendgrid_django.egg-info
 .pyc
+.eggs
 venv

README.rst

@@ -14,6 +14,13 @@ Install the backend from PyPI:
 
 Add the following to your project’s **settings.py**:
 
+.. code:: python
+
+    EMAIL_BACKEND = "sgbackend.SendGridBackend"
+    SENDGRID_API_KEY = "Your SendGrid API Key"
+
+Or, SendGrid username and password can be used instead of an API key:
+
 .. code:: python
 
     EMAIL_BACKEND = "sgbackend.SendGridBackend"

setup.py

@@ -14,5 +14,5 @@
     license='MIT',
     description='SendGrid Backend for Django',
     long_description=open('./README.rst').read(),
-    install_requires=["sendgrid==1.3.0"],
+    install_requires=["sendgrid==1.4.0"],
 )

sgbackend/mail.py

@@ -18,15 +18,22 @@ class SendGridBackend(BaseEmailBackend):
     def __init__(self, fail_silently=False, **kwargs):
         super(SendGridBackend, self).__init__(
             fail_silently=fail_silently, **kwargs)
+        self.api_key = getattr(settings, "SENDGRID_API_KEY", None)
         self.api_user = getattr(settings, "SENDGRID_USER", None)
-        self.api_key = getattr(settings, "SENDGRID_PASSWORD", None)
-
-        if self.api_user is None or self.api_key is None:
+        self.api_password = getattr(settings, "SENDGRID_PASSWORD", None)
+
+        credentials = []
+        if self.api_key:
+            credentials.append(self.api_key)
+        elif self.api_user and self.api_password:
+            credentials.append(self.api_user)
+            credentials.append(self.api_password)
+        else:
             raise ImproperlyConfigured('''
-                Either SENDGRID_USER or SENDGRID_PASSWORD
-                was not declared in settings.py''')
+                Either SENDGRID_API_KEY or both (SENDGRID_USER and
+                SENDGRID_PASSWORD) must be declared in settings.py''')
         self.sg = sendgrid.SendGridClient(
-            self.api_user, self.api_key,
+            *credentials,
             raise_errors=not fail_silently)
 
     def open(self):