my-cloud-devops-consulting 1.1.202507211816__tar.gz → 1.1.202507212139__tar.gz

{my-cloud-devops-consulting-1.1.202507211816/my_cloud_devops_consulting.egg-info → my-cloud-devops-consulting-1.1.202507212139}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: my-cloud-devops-consulting
-Version: 1.1.202507211816
+Version: 1.1.202507212139
 Summary: This is my consulting website for Cloud & DevOps services.
 Home-page: https://github.com/Betrand1999/project-root
 Author: Betrand Mutagha

{my-cloud-devops-consulting-1.1.202507211816 → my-cloud-devops-consulting-1.1.202507212139}/app.py

@@ -5,7 +5,7 @@ from urllib.parse import quote_plus
 from bson.objectid import ObjectId
 import os
 from flask_login import LoginManager,login_user,UserMixin,login_required,logout_user,current_user
-from settings import SECRET_KEY,MONGO_URI, EMAIL_USER, MONGO_PASSWORD, MONGO_USERNAME
+from settings import SECRET_KEY,MONGO_URI, EMAIL_USER, MONGO_PASSWORD, MONGO_USERNAME, COGNITO_CLIENT_ID, COGNITO_CLIENT_SECRET
 from utils import send_email, get_videos
 from werkzeug.middleware.proxy_fix import ProxyFix
 
@@ -270,24 +270,13 @@ oauth = OAuth(app)
 oauth.register(
   name='oidc',
   authority='https://cognito-idp.us-east-1.amazonaws.com/us-east-1_TZVykdVvG',
-  client_id='1lc7qso1g3lr9kqbr0nb0jktbs',
-  client_secret='1f1qa6rf66549cta1uqpamjpjqt06ne3agvlgou638e56kmt8dve',
+  client_id= COGNITO_CLIENT_ID,
+  client_secret=COGNITO_CLIENT_SECRET,    
   server_metadata_url='https://cognito-idp.us-east-1.amazonaws.com/us-east-1_TZVykdVvG/.well-known/openid-configuration',
   client_kwargs={'scope': 'phone openid email'}
 )
 ################################################
 
-#  Configure a login route to direct to Amazon Cognito managed login for authentication with a redirect to an authorize route.
-# @app.route('/login/cognito')
-# def login_cognito():
-#     session.pop('user', None)
-#     redirect_uri = url_for('authorize', _external=True)
-#     print("🧭 Redirect URI being used:", redirect_uri)  # <--- add this
-#     return oauth.oidc.authorize_redirect(
-#         redirect_uri,
-#         prompt='login'
-#     )
-
 @app.route('/login/cognito')
 def login_cognito():
     session.pop('user', None)
@@ -316,19 +305,22 @@ def authorize():
     return redirect(url_for('home'))  # ✅ Fixed: 'home' matches your defined route
 
 
-# Configure a logout route that erases user session data.
-# @app.route('/logout/cognito')
-# def logout_cognito():  # ✅ Renamed to avoid conflict
-#     session.pop('user', None)
-#     return redirect(url_for('home'))  # 🔁 Also change to 'home' if 'index' doesn't exist
+
+
+from flask import request
 
 @app.route('/logout/cognito')
 def logout_cognito():
     session.pop('user', None)
 
     cognito_domain = 'https://us-east-1tzvykdvvg.auth.us-east-1.amazoncognito.com'
-    client_id = '1lc7qso1g3lr9kqbr0nb0jktbs'  # Make sure this matches your App Client ID
-    logout_redirect_uri = url_for('home', _external=True)
+    client_id = '1lc7qso1g3lr9kqbr0nb0jktbs'
+
+    # Ensure trailing slash and domain match Cognito settings exactly
+    if '1beto.com' in request.host:
+        logout_redirect_uri = 'https://1beto.com/'  # ✅ Matches Cognito config
+    else:
+        logout_redirect_uri = 'http://localhost:50/'  # ✅ Matches Cognito config for local
 
     return redirect(
         f"{cognito_domain}/logout?client_id={client_id}&logout_uri={logout_redirect_uri}"
@@ -336,8 +328,6 @@ def logout_cognito():
 
 
 
-
-
 if __name__ == '__main__':
     app.run(debug=True, host='0.0.0.0', port=50)
 

{my-cloud-devops-consulting-1.1.202507211816 → my-cloud-devops-consulting-1.1.202507212139/my_cloud_devops_consulting.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: my-cloud-devops-consulting
-Version: 1.1.202507211816
+Version: 1.1.202507212139
 Summary: This is my consulting website for Cloud & DevOps services.
 Home-page: https://github.com/Betrand1999/project-root
 Author: Betrand Mutagha

my-cloud-devops-consulting-1.1.202507212139/setup.py

@@ -0,0 +1,32 @@
+from setuptools import setup, find_packages
+from datetime import datetime
+
+setup(
+    name='my-cloud-devops-consulting',
+    version=datetime.now().strftime("1.1.%Y%m%d%H%M"),  # auto-version like 1.1.202503241130
+    author='Betrand Mutagha',
+    author_email='mmutagha@gmail.com',
+    description='This is my consulting website for Cloud & DevOps services.',
+    long_description=open('README.md').read(),
+    long_description_content_type='text/markdown',
+    url='https://github.com/Betrand1999/project-root',
+    packages=find_packages(where="."),
+    py_modules=["app"],
+    include_package_data=True,
+    package_data={
+        "": ["static/**/*", "templates/**/*"],
+    },
+    install_requires=[
+        'Flask>=2.0',
+        'pymongo',
+        'werkzeug',
+        'requests',
+    ],
+    classifiers=[
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.10',
+        'License :: OSI Approved :: MIT License',
+        'Operating System :: OS Independent',
+    ],
+    python_requires='>=3.6',
+)

my-cloud-devops-consulting-1.1.202507211816/setup.py

@@ -1,65 +0,0 @@
-# from setuptools import setup, find_packages
-
-# setup(
-#     name='my-cloud-devops-consulting',
-#     version='1.1.5',
-#     author='Betrand Mutagha',
-#     author_email='mmutagha@gmail.com',
-#     description='This is my consulting website for Cloud & DevOps services.',
-#     long_description=open('README.md').read(),
-#     long_description_content_type='text/markdown',
-#     url='https://github.com/Betrand1999/project-root',
-#     packages=find_packages(where="."),  # Include the root as the package
-#     py_modules=["app"],  # Explicitly include app.py
-#     include_package_data=True,  # Ensures static and template files are included
-#     package_data={
-#         "": ["static/**/*", "templates/**/*"],  # Include static and templates from the root
-#     },
-#     install_requires=[
-#         'Flask>=2.0',
-#         'pymongo',
-#         'werkzeug',
-#         'requests',
-#     ],
-#     classifiers=[
-#         'Programming Language :: Python :: 3',
-#         'Programming Language :: Python :: 3.10',
-#         'License :: OSI Approved :: MIT License',
-#         'Operating System :: OS Independent',
-#     ],
-#     python_requires='>=3.6',
-# )
-
-
-from setuptools import setup, find_packages
-from datetime import datetime
-
-setup(
-    name='my-cloud-devops-consulting',
-    version=datetime.now().strftime("1.1.%Y%m%d%H%M"),  # auto-version like 1.1.202503241130
-    author='Betrand Mutagha',
-    author_email='mmutagha@gmail.com',
-    description='This is my consulting website for Cloud & DevOps services.',
-    long_description=open('README.md').read(),
-    long_description_content_type='text/markdown',
-    url='https://github.com/Betrand1999/project-root',
-    packages=find_packages(where="."),
-    py_modules=["app"],
-    include_package_data=True,
-    package_data={
-        "": ["static/**/*", "templates/**/*"],
-    },
-    install_requires=[
-        'Flask>=2.0',
-        'pymongo',
-        'werkzeug',
-        'requests',
-    ],
-    classifiers=[
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.10',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-    ],
-    python_requires='>=3.6',
-)