diff --git a/.gitignore b/.gitignore index b6e4761..a18594f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ __pycache__/ *.py[cod] *$py.class +secret.py +Pipfile.lock # C extensions *.so diff --git a/Pipfile b/Pipfile index 69fc25e..9157bcf 100644 --- a/Pipfile +++ b/Pipfile @@ -6,6 +6,7 @@ name = "pypi" [packages] django = "*" gunicorn = "*" +social-auth-app-django = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index 859c6cb..b0322a3 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "8406c88dd72dca81bf19e078be4d2bf789f5202903d10e4efd681365a35855ab" + "sha256": "d853e4c75aba1818ace5cf2562827f0410b9dbdc49c6a53cfcd94033c2b9adfd" }, "pipfile-spec": 6, "requires": { @@ -24,6 +24,131 @@ "markers": "python_version >= '3.7'", "version": "==3.5.2" }, + "certifi": { + "hashes": [ + "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14", + "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382" + ], + "markers": "python_version >= '3.6'", + "version": "==2022.9.24" + }, + "cffi": { + "hashes": [ + "sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5", + "sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef", + "sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104", + "sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426", + "sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405", + "sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375", + "sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a", + "sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e", + "sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc", + "sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf", + "sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185", + "sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497", + "sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3", + "sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35", + "sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c", + "sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83", + "sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21", + "sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca", + "sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984", + "sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac", + "sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd", + "sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee", + "sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a", + "sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2", + "sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192", + "sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7", + "sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585", + "sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f", + "sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e", + "sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27", + "sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b", + "sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e", + "sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e", + "sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d", + "sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c", + "sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415", + "sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82", + "sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02", + "sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314", + "sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325", + "sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c", + "sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3", + "sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914", + "sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045", + "sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d", + "sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9", + "sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5", + "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2", + "sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c", + "sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3", + "sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2", + "sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8", + "sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d", + "sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d", + "sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9", + "sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162", + "sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76", + "sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4", + "sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e", + "sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9", + "sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6", + "sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b", + "sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01", + "sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0" + ], + "version": "==1.15.1" + }, + "charset-normalizer": { + "hashes": [ + "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845", + "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f" + ], + "markers": "python_full_version >= '3.6.0'", + "version": "==2.1.1" + }, + "cryptography": { + "hashes": [ + "sha256:0297ffc478bdd237f5ca3a7dc96fc0d315670bfa099c04dc3a4a2172008a405a", + "sha256:10d1f29d6292fc95acb597bacefd5b9e812099d75a6469004fd38ba5471a977f", + "sha256:16fa61e7481f4b77ef53991075de29fc5bacb582a1244046d2e8b4bb72ef66d0", + "sha256:194044c6b89a2f9f169df475cc167f6157eb9151cc69af8a2a163481d45cc407", + "sha256:1db3d807a14931fa317f96435695d9ec386be7b84b618cc61cfa5d08b0ae33d7", + "sha256:3261725c0ef84e7592597606f6583385fed2a5ec3909f43bc475ade9729a41d6", + "sha256:3b72c360427889b40f36dc214630e688c2fe03e16c162ef0aa41da7ab1455153", + "sha256:3e3a2599e640927089f932295a9a247fc40a5bdf69b0484532f530471a382750", + "sha256:3fc26e22840b77326a764ceb5f02ca2d342305fba08f002a8c1f139540cdfaad", + "sha256:5067ee7f2bce36b11d0e334abcd1ccf8c541fc0bbdaf57cdd511fdee53e879b6", + "sha256:52e7bee800ec869b4031093875279f1ff2ed12c1e2f74923e8f49c916afd1d3b", + "sha256:64760ba5331e3f1794d0bcaabc0d0c39e8c60bf67d09c93dc0e54189dfd7cfe5", + "sha256:765fa194a0f3372d83005ab83ab35d7c5526c4e22951e46059b8ac678b44fa5a", + "sha256:79473cf8a5cbc471979bd9378c9f425384980fcf2ab6534b18ed7d0d9843987d", + "sha256:896dd3a66959d3a5ddcfc140a53391f69ff1e8f25d93f0e2e7830c6de90ceb9d", + "sha256:89ed49784ba88c221756ff4d4755dbc03b3c8d2c5103f6d6b4f83a0fb1e85294", + "sha256:ac7e48f7e7261207d750fa7e55eac2d45f720027d5703cd9007e9b37bbb59ac0", + "sha256:ad7353f6ddf285aeadfaf79e5a6829110106ff8189391704c1d8801aa0bae45a", + "sha256:b0163a849b6f315bf52815e238bc2b2346604413fa7c1601eea84bcddb5fb9ac", + "sha256:b6c9b706316d7b5a137c35e14f4103e2115b088c412140fdbd5f87c73284df61", + "sha256:c2e5856248a416767322c8668ef1845ad46ee62629266f84a8f007a317141013", + "sha256:ca9f6784ea96b55ff41708b92c3f6aeaebde4c560308e5fbbd3173fbc466e94e", + "sha256:d1a5bd52d684e49a36582193e0b89ff267704cd4025abefb9e26803adeb3e5fb", + "sha256:d3971e2749a723e9084dd507584e2a2761f78ad2c638aa31e80bc7a15c9db4f9", + "sha256:d4ef6cc305394ed669d4d9eebf10d3a101059bdcf2669c366ec1d14e4fb227bd", + "sha256:d9e69ae01f99abe6ad646947bba8941e896cb3aa805be2597a0400e0764b5818" + ], + "markers": "python_version >= '3.6'", + "version": "==38.0.1" + }, + "defusedxml": { + "hashes": [ + "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69", + "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==0.7.1" + }, "django": { "hashes": [ "sha256:26dc24f99c8956374a054bcbf58aab8dc0cad2e6ac82b0fe036b752c00eee793", @@ -40,13 +165,83 @@ "index": "pypi", "version": "==20.1.0" }, - "setuptools": { + "idna": { "hashes": [ - "sha256:1b6bdc6161661409c5f21508763dc63ab20a9ac2f8ba20029aaaa7fdb9118012", - "sha256:3050e338e5871e70c72983072fe34f6032ae1cdeeeb67338199c2f74e083a80e" + "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4", + "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2" + ], + "markers": "python_version >= '3.5'", + "version": "==3.4" + }, + "oauthlib": { + "hashes": [ + "sha256:8139f29aac13e25d502680e9e19963e83f16838d48a0d71c287fe40e7067fbca", + "sha256:9859c40929662bec5d64f34d01c99e093149682a3f38915dc0655d5a633dd918" + ], + "markers": "python_version >= '3.6'", + "version": "==3.2.2" + }, + "pycparser": { + "hashes": [ + "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9", + "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206" + ], + "version": "==2.21" + }, + "pyjwt": { + "hashes": [ + "sha256:8d82e7087868e94dd8d7d418e5088ce64f7daab4b36db654cbaedb46f9d1ca80", + "sha256:e77ab89480905d86998442ac5788f35333fa85f65047a534adc38edf3c88fc3b" ], "markers": "python_version >= '3.7'", - "version": "==65.4.1" + "version": "==2.5.0" + }, + "python3-openid": { + "hashes": [ + "sha256:33fbf6928f401e0b790151ed2b5290b02545e8775f982485205a066f874aaeaf", + "sha256:6626f771e0417486701e0b4daff762e7212e820ca5b29fcc0d05f6f8736dfa6b" + ], + "version": "==3.2.0" + }, + "requests": { + "hashes": [ + "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983", + "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349" + ], + "markers": "python_version >= '3.7' and python_version < '4'", + "version": "==2.28.1" + }, + "requests-oauthlib": { + "hashes": [ + "sha256:2577c501a2fb8d05a304c09d090d6e47c306fef15809d102b327cf8364bddab5", + "sha256:75beac4a47881eeb94d5ea5d6ad31ef88856affe2332b9aafb52c6452ccf0d7a" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==1.3.1" + }, + "setuptools": { + "hashes": [ + "sha256:512e5536220e38146176efb833d4a62aa726b7bbff82cfbc8ba9eaa3996e0b17", + "sha256:f62ea9da9ed6289bfe868cd6845968a2c854d1427f8548d52cae02a42b4f0356" + ], + "markers": "python_version >= '3.7'", + "version": "==65.5.0" + }, + "social-auth-app-django": { + "hashes": [ + "sha256:52241a25445a010ab1c108bafff21fc5522d5c8cd0d48a92c39c7371824b065d", + "sha256:b6e3132ce087cdd6e1707aeb1b588be41d318408fcf6395435da0bc6fe9a9795" + ], + "index": "pypi", + "version": "==5.0.0" + }, + "social-auth-core": { + "hashes": [ + "sha256:1e3440d104f743b02dfe258c9d4dba5b4065abf24b2f7eb362b47054d21797df", + "sha256:4686f0e43cf12954216875a32e944847bb1dc69e7cd9573d16a9003bb05ca477" + ], + "markers": "python_version >= '3.6'", + "version": "==4.3.0" }, "sqlparse": { "hashes": [ @@ -55,6 +250,14 @@ ], "markers": "python_version >= '3.5'", "version": "==0.4.3" + }, + "urllib3": { + "hashes": [ + "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e", + "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' and python_version < '4'", + "version": "==1.26.12" } }, "develop": {} diff --git a/global/apps/base/admin.py b/global/apps/base/admin.py index 8c38f3f..0c8e18f 100644 --- a/global/apps/base/admin.py +++ b/global/apps/base/admin.py @@ -1,3 +1,18 @@ from django.contrib import admin +from .models import User -# Register your models here. +@admin.action(description="Mark as Global Student") +def mark_global_student(modeladmin, request, queryset): + queryset.update(is_global_student=True) + queryset.update(is_alumni=False) + +@admin.action(description="Mark as Alumni") +def mark_alumni(modeladmin, request, queryset): + queryset.update(is_global_student=False) + queryset.update(is_alumni=True) + +class UserAdmin(admin.ModelAdmin): + actions = [mark_global_student, mark_alumni] + + +admin.site.register(User, UserAdmin) \ No newline at end of file diff --git a/global/apps/base/migrations/0001_initial.py b/global/apps/base/migrations/0001_initial.py new file mode 100644 index 0000000..b02d4f9 --- /dev/null +++ b/global/apps/base/migrations/0001_initial.py @@ -0,0 +1,46 @@ +# Generated by Django 4.1.2 on 2022-10-19 14:04 + +import django.contrib.auth.models +import django.contrib.auth.validators +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ] + + operations = [ + migrations.CreateModel( + name='User', + fields=[ + ('password', models.CharField(max_length=128, verbose_name='password')), + ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), + ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), + ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), + ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')), + ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), + ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), + ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), + ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), + ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('id', models.AutoField(primary_key=True, serialize=False)), + ('graduation_year', models.IntegerField(blank=True, null=True)), + ('college', models.CharField(blank=True, max_length=100, null=True)), + ('is_alumni', models.BooleanField(default=False)), + ('is_global_student', models.BooleanField(default=False)), + ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')), + ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')), + ], + options={ + 'ordering': ('last_name', 'first_name'), + }, + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + ] diff --git a/global/apps/base/models.py b/global/apps/base/models.py index 71a8362..bdde666 100644 --- a/global/apps/base/models.py +++ b/global/apps/base/models.py @@ -1,3 +1,22 @@ +from django.contrib.auth.models import AbstractUser from django.db import models -# Create your models here. + +class User(AbstractUser): + id = models.AutoField(primary_key=True) + + graduation_year = models.IntegerField(blank=True, null=True) + college = models.CharField(max_length=100, blank=True, null=True) + + is_alumni = models.BooleanField(default=False) + is_global_student = models.BooleanField(default=False) + + class Meta: + ordering = ("last_name", "first_name") + + + def get_social_auth(self): + return self.social_auth.get(provider="ion") + + def __str__(self): + return f"{self.first_name} {self.last_name}" \ No newline at end of file diff --git a/global/apps/base/oauth.py b/global/apps/base/oauth.py new file mode 100644 index 0000000..0947b36 --- /dev/null +++ b/global/apps/base/oauth.py @@ -0,0 +1,29 @@ +from social_core.backends.oauth import BaseOAuth2 + + +class IonOauth2(BaseOAuth2): # pylint: disable=abstract-method + name = "ion" + AUTHORIZATION_URL = "https://ion.tjhsst.edu/oauth/authorize" + ACCESS_TOKEN_URL = "https://ion.tjhsst.edu/oauth/token" + ACCESS_TOKEN_METHOD = "POST" + EXTRA_DATA = [("refresh_token", "refresh_token", True), ("expires_in", "expires")] + + def get_scope(self): + return ["read"] + + def get_user_details(self, response): + return { + "id": response["id"], + "username": response["ion_username"], + "first_name": response["first_name"], + "last_name": response["last_name"], + "graduation_year": response["graduation_year"], + "is_staff": False, + "is_superuser": False, + } + + def user_data(self, access_token, *args, **kwargs): + return self.get_json("https://ion.tjhsst.edu/api/profile", params={"access_token": access_token}) + + def get_user_id(self, details, response): + return details["id"] \ No newline at end of file diff --git a/global/apps/base/urls.py b/global/apps/base/urls.py index 1331a1d..49481a9 100644 --- a/global/apps/base/urls.py +++ b/global/apps/base/urls.py @@ -1,7 +1,12 @@ +from django.contrib.auth.views import LogoutView from django.urls import path from . import views +app_name = "base" + urlpatterns = [ - path("", views.under_construction) -] + path("", views.index, name="index"), + path("login/", views.login, name="login"), + path("logout/", LogoutView.as_view(), name="logout") +] \ No newline at end of file diff --git a/global/apps/base/views.py b/global/apps/base/views.py index 862f77c..5d2dc19 100644 --- a/global/apps/base/views.py +++ b/global/apps/base/views.py @@ -3,3 +3,10 @@ from django.shortcuts import render # Create your views here. def under_construction(request): return render(request, "base/under_construction.html") + +def index(request): + return render(request, "base/index.html") + +def login(request): + return render(request, "base/login.html") + diff --git a/global/settings/__init__.py b/global/settings/__init__.py index 874b70a..a6a4f94 100644 --- a/global/settings/__init__.py +++ b/global/settings/__init__.py @@ -1,36 +1,17 @@ -""" -Django settings for global project. - -Generated by 'django-admin startproject' using Django 4.1.2. - -For more information on this file, see -https://docs.djangoproject.com/en/4.1/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/4.1/ref/settings/ -""" - from pathlib import Path +from django.urls import reverse_lazy -# Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/ -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'django-insecure-$ilb3n76m-u+1#xt^^%zck!)t)pizy1u&o(%g-i3wgln^!*k81' - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -ALLOWED_HOSTS = [] - # Application definition INSTALLED_APPS = [ + 'social_django', 'global.apps.base', 'django.contrib.admin', @@ -72,17 +53,6 @@ TEMPLATES = [ WSGI_APPLICATION = 'global.wsgi.application' -# Database -# https://docs.djangoproject.com/en/4.1/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', - } -} - - # Password validation # https://docs.djangoproject.com/en/4.1/ref/settings/#auth-password-validators @@ -117,9 +87,51 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/4.1/howto/static-files/ -STATIC_URL = 'static/' +STATIC_ROOT = BASE_DIR / 'serve/' + +STATIC_URL = '/static/' + +STATICFILES_DIRS = ( + BASE_DIR / 'static/', +) + +MEDIA_ROOT = BASE_DIR / 'media/' + +MEDIA_URL = '/media/' # Default primary key field type # https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field -DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' +AUTH_USER_MODEL = 'base.User' +AUTHENTICATION_BACKENDS = ['global.apps.base.oauth.IonOauth2'] + +LOGIN_REDIRECT_URL = reverse_lazy("base:index") +LOGOUT_REDIRECT_URL = reverse_lazy("base:index") +LOGIN_URL = reverse_lazy("base:login") + +SOCIAL_AUTH_ALWAYS_ASSOCIATE = True + +SOCIAL_AUTH_PIPELINE = ( + "social_core.pipeline.social_auth.social_details", + "social_core.pipeline.social_auth.social_uid", + "social_core.pipeline.social_auth.auth_allowed", + "social_core.pipeline.social_auth.social_user", + "social_core.pipeline.social_auth.associate_by_email", + "social_core.pipeline.user.create_user", + "social_core.pipeline.social_auth.associate_user", + "social_core.pipeline.social_auth.load_extra_data", +) + +SOCIAL_AUTH_URL_NAMESPACE = "social" + +SOCIAL_AUTH_USER_FIELDS = [ + "first_name", + "graduation_year", + "id", + "is_staff", + "is_superuser", + "last_name", + "username", +] + +from .secret import * \ No newline at end of file diff --git a/global/settings/secret.sample b/global/settings/secret.sample new file mode 100644 index 0000000..9dd61f1 --- /dev/null +++ b/global/settings/secret.sample @@ -0,0 +1,40 @@ +from . import BASE_DIR + +DEBUG=True +SECRET_KEY='insecure_global_key' + +SOCIAL_AUTH_ION_KEY = '' +SOCIAL_AUTH_ION_SECRET = '' +SOCIAL_AUTH_REDIRECT_IS_HTTPS = not DEBUG + + +if DEBUG: + ALLOWED_HOSTS = ['localhost', '127.0.0.1'] +else: + ALLOWED_HOSTS = ['global.sites.tjhsst.edu'] + + +# Database + +if DEBUG: + DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': BASE_DIR / 'db.sqlite3', + } + } +else: + DATABASES = { + "default": { + "ENGINE": 'django.db.backends.postgresql_psycopg2', + "NAME": '', + "USER": '', + "PASSWORD": '', + "HOST": '', + "PORT": '', + } + } + +if DEBUG: + AUTH_PASSWORD_VALIDATORS = [] + AUTHENTICATION_BACKENDS.append('django.contrib.auth.backends.ModelBackend') \ No newline at end of file diff --git a/global/templates/base.html b/global/templates/base.html index 18ecdcb..4892eba 100644 --- a/global/templates/base.html +++ b/global/templates/base.html @@ -1 +1,53 @@ - + + +{% load static %} + + + + + + + + Global Studies + + + + {% block head %}{% endblock %} + + + {% block body %}{% endblock %} + + + + + + + + diff --git a/global/templates/base/index.html b/global/templates/base/index.html new file mode 100644 index 0000000..a181612 --- /dev/null +++ b/global/templates/base/index.html @@ -0,0 +1,11 @@ +{% extends 'base.html' %} + +{% block body %} + +{% if request.user.is_authenticated %} +

Welcome {{user.username}}!

+{% else %} +

Welcome!

+{% endif %} + +{% endblock body %} diff --git a/global/templates/base/login.html b/global/templates/base/login.html new file mode 100644 index 0000000..33fc0ca --- /dev/null +++ b/global/templates/base/login.html @@ -0,0 +1,28 @@ +{% extends 'base.html' %} + +{% block head %} + +{% endblock %} + +{% block body %} +

bruh

+
+
+

To access this application, you must log in with your Intranet account.

+
+ {% csrf_token %} + +
+
+
+{% endblock %} \ No newline at end of file diff --git a/global/urls.py b/global/urls.py index e7536d3..18dcb80 100644 --- a/global/urls.py +++ b/global/urls.py @@ -18,5 +18,6 @@ from django.urls import path, include urlpatterns = [ path('admin/', admin.site.urls), + path('', include('social_django.urls', namespace='social')), path('', include('global.apps.base.urls')) ]