From 98567b8d75f4eb23a6b8c6d617acb3d0f9597d84 Mon Sep 17 00:00:00 2001
From: Innocent Zenda <zendainnocent@gmail.com>
Date: Sun, 8 Nov 2020 11:25:14 +0300
Subject: [PATCH 1/2] show system messages

---
 templates/base.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/templates/base.html b/templates/base.html
index 4b80c9e..dff1f8d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -50,6 +50,18 @@ <h5 class="my-0 mr-md-auto font-weight-normal">Django Saas</h5>
       {% endif %}
     </div>
 
+    {% if messages %}
+    {% for message in messages %}
+    <div class="alert alert-{{ message.tags }} alert-dismissible fade show" role="alert">
+      <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+        <span aria-hidden="true">&times;</span>
+        <span class="sr-only">Close</span>
+      </button>
+      {{ message }}
+    </div>
+    {% endfor %}
+    {% endif %}
+
     {% block content %}
     {% endblock %}
 

From 6acc31cffff0b3745402a001cf0e93f43ce6a0fe Mon Sep 17 00:00:00 2001
From: Innocent Zenda <zendainnocent@gmail.com>
Date: Sun, 8 Nov 2020 11:31:01 +0300
Subject: [PATCH 2/2] Fix: send raw password to team member

---
 accounts/views.py                |  6 ++----
 teams/migrations/0001_initial.py | 25 +++++++++++++++++++++++++
 teams/models.py                  |  8 +++++++-
 teams/views.py                   |  3 +++
 4 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 teams/migrations/0001_initial.py

diff --git a/accounts/views.py b/accounts/views.py
index 4e3a64c..059e062 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -77,7 +77,7 @@ def signup(request):
         plan = Plan.objects.first()
 
         day = plan.duration_days
-        
+
         ends_time = timezone.now() + timedelta(days=day)
 
         subscription = Subscription.objects.get_or_create(
@@ -120,7 +120,7 @@ def get(self, request, user_id, token):
                 message = get_template(
                     'teams/login_credentials_email.html').render({
                         'email': f'{user.email}',
-                        'password': f'{user.password}',
+                        'password': f'{user.teampassword.password}',
                     })
                 mail = EmailMessage(
                     'Login credentials',
@@ -129,7 +129,5 @@ def get(self, request, user_id, token):
                     from_email=settings.EMAIL_HOST_USER)
                 mail.content_subtype = 'html'
                 mail.send()
-            else:
-                context['message'] = 'Registration complete. Please login'
 
         return render(request, 'accounts/registration_complete.html', context)
diff --git a/teams/migrations/0001_initial.py b/teams/migrations/0001_initial.py
new file mode 100644
index 0000000..5427a86
--- /dev/null
+++ b/teams/migrations/0001_initial.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.1 on 2020-11-08 07:55
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TeamPassword',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('password', models.CharField(max_length=10)),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]
diff --git a/teams/models.py b/teams/models.py
index 71a8362..b944431 100644
--- a/teams/models.py
+++ b/teams/models.py
@@ -1,3 +1,9 @@
 from django.db import models
+from django.contrib.auth import get_user_model
 
-# Create your models here.
+User = get_user_model()
+
+
+class TeamPassword(models.Model):
+    user = models.OneToOneField(User, on_delete=models.CASCADE)
+    password = models.CharField(max_length=10)
diff --git a/teams/views.py b/teams/views.py
index a49d8cf..00987c6 100644
--- a/teams/views.py
+++ b/teams/views.py
@@ -24,6 +24,7 @@
 from .forms import CreateTeamForm, UpdateTeamForm
 from membership.models import Business, BusinessTeamMember, Subscription, Plan
 from accounts.models import Profile
+from teams.models import TeamPassword
 
 
 User = get_user_model()
@@ -63,6 +64,8 @@ def post(self, request, *args, **kwargs):
             team_obj.created_by = self.request.user
 
             team_obj.save()
+            TeamPassword.objects.create(
+                user=team_obj, password=self.team_password)
 
             # create profile
             profile = Profile(user=team_obj)