Feature/944

.circleci/config.yml

@@ -1,39 +1,42 @@
 version: 2.1
+
+commands: 
+  install:
+    steps:
+      - run: pip install . --user
+      - run: pip install -r requirements.txt --user
+
 jobs:
     build:
       docker:
         - image: circleci/python:3.6  # primary container for the build job
       steps:
         - checkout
-        - run: make
+        - install
         - run: make test
     lint:
       docker:
         - image: circleci/python:3.6  # primary container for the build job
       steps:
         - checkout
-        - run: make
+        - install
         - run: make lint
-    python34:
-      docker:
-        - image: circleci/python:3.4
-      steps:
-        - checkout
-        - run: make
-        - run: make test
     python35:
       docker:
-        - image: circleci/python:3.5
+        - image: circleci/python:3.7
       steps:
         - checkout
-        - run: make
+        - install
         - run: make test
     python37:
       docker:
-        - image: circleci/python:3.7
+        - image: circleci/python:3.8.0b2-buster
+          auth:
+            username: jmancuso9  # can specify string literal values
+            password: $DOCKERHUB_PASSWORD
       steps:
         - checkout
-        - run: make
+        - install
         - run: make test
     python38:
       docker:
@@ -47,31 +50,28 @@ jobs:
         - image: circleci/python:3.6
       steps:
         - checkout
+        - install
         - run: pip install -r requirements.txt --user
         - run: make coverage
         - run: make deepsource
 
 orbs:
-    masonite: masonite/trigger@dev:latest
+    masonite: masonite/trigger@1.0.0
 
 workflows: 
   version: 2
   build_and_test:
     jobs: 
-      - build:
+      - build: # Python 3.6
           filters:  # required since `deploy` has tag filters AND requires `build`
             tags:
               only: /^.*/
-      - lint:
+      - lint: # Python 3.6
           requires:
               - build
           filters:  # required since `deploy` has tag filters AND requires `build`
             tags:
               only: /^.*/
-      - python34:
-          filters:  # required since `deploy` has tag filters AND requires `build`
-            tags:
-              only: /^.*/
       - python35:
           filters:  # required since `deploy` has tag filters AND requires `build`
             tags:

.deepsource.toml

@@ -3,8 +3,8 @@ version = 1
 
 test_patterns = [
   'tests/**/*.py',
-  'masonite/testing/*.py',
-  'masonite/testsuite/*.py',
+  'src/masonite/testing/*.py',
+  'src/masonite/testsuite/*.py',
   'testpackage/*.py'
 ]
 

MANIFEST.in

@@ -1,7 +1,7 @@
-include masonite/snippets/exceptions/css/*
-include masonite/snippets/exceptions/*
-include masonite/snippets/*
-include masonite/snippets/migrations/*
-include masonite/snippets/scaffold/*
-include masonite/snippets/auth/controllers/*
-include masonite/snippets/auth/templates/auth/*
+include src/masonite/snippets/exceptions/css/*
+include src/masonite/snippets/exceptions/*
+include src/masonite/snippets/*
+include src/masonite/snippets/migrations/*
+include src/masonite/snippets/scaffold/*
+include src/masonite/snippets/auth/controllers/*
+include src/masonite/snippets/auth/templates/auth/*

Makefile

@@ -8,12 +8,12 @@ ci:
 	make test
 	make lint
 lint:
-	python -m flake8 masonite/ --ignore=E501,F401,E128,E402,E731,F821,E712,W503
+	python -m flake8 src/masonite/ --ignore=E501,F401,E128,E402,E731,F821,E712,W503
 deepsource:
 	curl https://deepsource.io/cli | sh
 	./bin/deepsource report --analyzer test-coverage --key python --value-file ./coverage.xml
 coverage:
-	python -m pytest --cov-report term --cov-report xml --cov=masonite tests/
+	python -m pytest --cov-report term --cov-report xml --cov=src/masonite tests/
 	python -m coveralls
 publish:
 	pip install 'twine>=1.5.0'

app/http/controllers/ConfirmController.py

@@ -0,0 +1,70 @@
+"""The ConfirmController Module."""
+import datetime
+
+from src.masonite.auth import Auth, MustVerifyEmail
+from src.masonite.auth.Sign import Sign
+from src.masonite.managers import MailManager
+from src.masonite.request import Request
+from src.masonite.view import View
+from src.masonite.helpers import config
+
+
+class ConfirmController:
+    """The ConfirmController class."""
+
+    def __init__(self):
+        """The ConfirmController Constructor."""
+        pass
+
+    def verify_show(self, view: View, auth: Auth):
+        """Show the Verify Email page for unverified users.
+
+        Arguments:
+            request {masonite.request.request} -- The Masonite request class.
+            request {masonite.view.view} -- The Masonite view class.
+            request {masonite.auth.auth} -- The Masonite Auth class.
+
+        Returns:
+            [type] -- [description]
+        """
+        return view.render('auth/verify', {'app': config('application'), 'Auth': auth})
+
+    def confirm_email(self, request: Request, view: View, auth: Auth):
+        """Confirm User email and show the correct response.
+
+        Arguments:
+            request {masonite.request.request} -- The Masonite request class.
+            request {masonite.view.view} -- The Masonite view class.
+            request {masonite.auth.auth} -- The Masonite Auth class.
+
+        Returns:
+            [type] -- [description]
+        """
+        sign = Sign()
+        token = sign.unsign(request.param('id'))
+
+        if token is not None:
+            tokenParts = token.split("::")
+            if len(tokenParts) > 1:
+                user = auth.auth_model.find(tokenParts[0])
+
+                if user.verified_at is None:
+                    timestamp = datetime.datetime.fromtimestamp(float(tokenParts[1]))
+                    now = datetime.datetime.now()
+                    timestamp_plus_10 = timestamp + datetime.timedelta(minutes=10)
+
+                    if now < timestamp_plus_10:
+                        user.verified_at = datetime.datetime.now()
+                        user.save()
+
+                        return view.render('auth/confirm', {'app': config('application'), 'Auth': auth})
+
+        return view.render('auth/error', {'app': config('application'), 'Auth': auth})
+
+    def send_verify_email(self, manager: MailManager, request: Request):
+        user = request.user()
+
+        if isinstance(user, MustVerifyEmail):
+            user.verify_email(manager, request)
+
+        return request.redirect('/home')

app/http/controllers/ControllerTest.py

@@ -1,5 +1,5 @@
-from masonite.request import Request
-from masonite.view import View
+from src.masonite.request import Request
+from src.masonite.view import View
 
 
 class ControllerTest:

app/http/controllers/TestController.py

@@ -1,7 +1,7 @@
 from app.jobs.TestJob import TestJob
-from masonite import Queue
-from masonite.request import Request
-from masonite.view import View
+from src.masonite import Queue, Mail
+from src.masonite.request import Request
+from src.masonite.view import View
 
 class TestController:
 
@@ -29,7 +29,7 @@ def change_404(self, request: Request):
     def testing(self):
         return 'test'
 
-    def json_response(self, request: Request):
+    def json_response(self):
         return {'id': 2}
 
     def post_test(self):
@@ -53,3 +53,6 @@ def queue(self, queue: Queue):
         # queue.driver('amqp').push(self.bad)
         queue.driver('amqp').push(TestJob, channel='default')
         return 'queued'
+
+    def mail(self, mail: Mail):
+        return mail.to('idmann509@gmail.com').template('test', {'test': 'mail'})

app/http/controllers/UnitTestController.py

@@ -1,7 +1,7 @@
 """A UnitTestController Module."""
 
-from masonite.request import Request
-from masonite.controllers import Controller
+from src.masonite.request import Request
+from src.masonite.controllers import Controller
 
 
 class UnitTestController(Controller):

app/http/controllers/WelcomeController.py

@@ -1,14 +1,13 @@
 """Welcome The User To Masonite."""
 
-from masonite.view import View
-from masonite.request import Request
-from masonite.controllers import Controller
+from src.masonite.view import View
+from src.masonite.controllers import Controller
 
 
 class WelcomeController(Controller):
     """Controller For Welcoming The User."""
 
-    def show(self, view: View, request: Request):
+    def show(self, view: View):
         """Show the welcome page.
 
         Arguments:

app/http/middleware/AddAttributeMiddleware.py

@@ -1,14 +1,14 @@
 """Add Attribute Middleware."""
 
-from masonite.request import Request
+from src.masonite.request import Request
 
 
 class AddAttributeMiddleware:
     """Middleware class which loads the current user into the request."""
 
     def __init__(self, request: Request):
         """Inject Any Dependencies From The Service Container."""
-        self.request = Request
+        self.request = request
 
     def before(self):
         """Run This Middleware Before The Route Executes."""

app/http/middleware/AuthenticationMiddleware.py

@@ -1,6 +1,6 @@
 """Authentication Middleware."""
 
-from masonite.request import Request
+from src.masonite.request import Request
 
 
 class AuthenticationMiddleware:

app/http/middleware/CsrfMiddleware.py

@@ -1,6 +1,6 @@
 """CSRF Middleware."""
 
-from masonite.middleware import CsrfMiddleware as Middleware
+from src.masonite.middleware import CsrfMiddleware as Middleware
 
 
 class CsrfMiddleware(Middleware):

app/http/middleware/LoadUserMiddleware.py

@@ -1,7 +1,7 @@
 """Load User Middleware."""
 
-from masonite.auth import Auth
-from masonite.request import Request
+from src.masonite.auth import Auth
+from src.masonite.request import Request
 
 
 class LoadUserMiddleware:

app/http/middleware/MiddlewareTest.py

@@ -1,6 +1,6 @@
 """Middleware Test."""
 
-from masonite.request import Request
+from src.masonite.request import Request
 
 
 class MiddlewareTest:

app/http/middleware/TestHttpMiddleware.py

@@ -1,4 +1,4 @@
-from masonite.request import Request
+from src.masonite.request import Request
 
 
 class TestHttpMiddleware:

app/http/middleware/TestMiddleware.py

@@ -1,4 +1,4 @@
-from masonite.request import Request
+from src.masonite.request import Request
 
 
 class TestMiddleware:

app/http/middleware/VerifyEmailMiddleware.py

@@ -1,6 +1,6 @@
 """Verify Email Middleware."""
 
-from masonite.request import Request
+from src.masonite.request import Request
 
 
 class VerifyEmailMiddleware:

app/jobs/TestJob.py

@@ -1,6 +1,6 @@
 """ A TestJob Queue Job """
 
-from masonite.queues import Queueable
+from src.masonite.queues import Queueable
 
 
 class TestJob(Queueable):

bootstrap/start.py

@@ -1,6 +1,6 @@
 """Start of Application. This function is the gunicorn server."""
 
-from masonite.environment import LoadEnvironment
+from src.masonite.environment import LoadEnvironment
 
 """Load Environment Variables
 Take environment variables from the .env file and load them in.

config/application.py

@@ -2,7 +2,7 @@
 
 import os
 
-from masonite import env
+from src.masonite import env
 
 """Application Name
 This value is the name of your application. This value is used when the
@@ -57,4 +57,9 @@
     'app',
 ]
 
-FALSY = False
+FALSY = False
+
+TEMPLATES={
+    'statuscode': '/src/masonite/snippets/statuscode',
+    'exceptions': '/src/masonite/snippets/exception'
+}