Merge pull request #173 from ankita685/main

added google authentication fixes #74 #154

newsaggregator/newsaggregator/settings.py

@@ -48,6 +48,8 @@
 
     # custom apps
     'django_social_share',
+    'social_django',
+
     'core',
 
     # authentication
@@ -62,6 +64,7 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'social_django.middleware.SocialAuthExceptionMiddleware',
 
     # render.com middleware
     "whitenoise.middleware.WhiteNoiseMiddleware",
@@ -80,6 +83,7 @@
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
+                'social_django.context_processors.backends',
             ],
         },
     },
@@ -147,3 +151,16 @@
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
 AUTH_USER_MODEL='userauths.User'
+
+
+AUTHENTICATION_BACKENDS =[
+    'social_core.backends.google.GoogleOAuth2',
+    'django.contrib.auth.backends.ModelBackend',
+]
+LOGIN_URL = 'login'
+LOGIN_REDIRECT_URL = 'home'
+LOGOUT_URL ='logout'
+LOGOUT_REDIRECT_URL ='login'
+
+SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = 'google_key'
+SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET ='google_secret'

newsaggregator/newsaggregator/urls.py

@@ -1,9 +1,16 @@
 from django.contrib import admin
 from django.urls import path, include
+from django.contrib.auth import views as auth_views
+from userauths import views
 
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('user/',include('userauths.urls')),
     path('',include('core.urls')),
+    path('login/',views.login, name ='login'),
+    path('logout/',auth_views.LogoutView.as_view(),name ='logout'),
+    path('social-auth/',include('social_django.urls',namespace='social')),
+    path("",views.home,name='home'),
+
 
 ]

newsaggregator/static/assets/css/userauth.css

@@ -248,6 +248,7 @@ body {
     border-radius: 4px;
 }
 
+
 button:disabled {
     background-color: rgba(0, 149, 246, 0.3);
 }

newsaggregator/templates/userauths/sign-in.html

@@ -2,6 +2,34 @@
 {% load static %}
 
 {% block authentication %}
+<style>
+    .social-container1 {
+        text-align: center; /* Center-align content */
+    }
+
+    .btn-primary1 {
+        background-color: #4285F4; /* Google Blue */
+        border: none; /* Remove border */
+        padding: 10px 20px; /* Adjust padding */
+        font-size: 16px; /* Adjust font size */
+        cursor: pointer; /* Add cursor pointer on hover */
+    }
+
+    .btn-primary1:hover {
+        background-color: #357AE8; /* Darker shade of Google Blue on hover */
+    }
+
+    .btn-lin {
+        color: #fff; /* White text color */
+        text-decoration: none; /* Remove underline */
+    }
+
+    .btn-lin:hover {
+        color: #fff; /* White text color on hover */
+        text-decoration: none; /* Remove underline on hover */
+    }
+</style>
+
 <div class="container">
     <div class="main-container">
         <div class="main-content">
@@ -59,8 +87,18 @@
                                     </div>
                                 </div>
                             </form>
-
-
+
+                            <div class="row">
+                                <div class="col-md-8 mx-auto my-2 order-md-1">
+                                    <div class="social-container1">
+                                        <button class="btn btn-primary1 mb-4">
+                                            <a href="{% url 'social:begin' 'google-oauth2' %}" class="btn-lin">Login With Google</a>
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+
+
                         </div>
                         <div class="box goto">
                             <p>

newsaggregator/templates/userauths/sign-up.html

@@ -2,6 +2,34 @@
 {% load static %}
 
 {% block authentication %}
+
+<style>
+    .social-container1 {
+        text-align: center; /* Center-align content */
+    }
+
+    .btn-primary1 {
+        background-color: #4285F4; /* Google Blue */
+        border: none; /* Remove border */
+        padding: 10px 20px; /* Adjust padding */
+        font-size: 16px; /* Adjust font size */
+        cursor: pointer; /* Add cursor pointer on hover */
+    }
+
+    .btn-primary1:hover {
+        background-color: #357AE8; /* Darker shade of Google Blue on hover */
+    }
+
+    .btn-lin {
+        color: #fff; /* White text color */
+        text-decoration: none; /* Remove underline */
+    }
+
+    .btn-lin:hover {
+        color: #fff; /* White text color on hover */
+        text-decoration: none; /* Remove underline on hover */
+    }
+</style>
 <div class="container">
     <div class="main-container">
         <div class="main-content">
@@ -85,7 +113,15 @@
 
                                 </div>
                             </form>
-
+                            <div class="row">
+                                <div class="col-md-8 mx-auto my-2 order-md-1">
+                                    <div class="social-container1">
+                                        <button class="btn btn-primary1 mb-4">
+                                            <a href="{% url 'social:begin' 'google-oauth2' %}" class="btn-lin">Login With Google</a>
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
 
                         </div>
                         <div class="box goto">

newsaggregator/userauths/urls.py

@@ -1,4 +1,6 @@
-from django.urls import path
+from django.contrib import admin
+from django.urls import path, include
+from django.contrib.auth import views as auth_views
 from userauths import views
 
 app_name='userauths'

newsaggregator/userauths/views.py

@@ -61,4 +61,7 @@ def logout_view(request):
     logout(request)
     messages.success(request, "You Logged-Out, successfully")
 
-    return redirect("userauths:sign-in",)
+    return redirect("userauths:sign-in",)
+
+def home(request):
+    return render(request,'base_auth.html')