From bc9afd396b68f5af4eabd8dbfbd7f288f09b1066 Mon Sep 17 00:00:00 2001
From: emaric <elena.maric@listlabs.net>
Date: Mon, 22 Jan 2024 09:12:29 +0100
Subject: [PATCH] dodan user

---
 .../__pycache__/models.cpython-38.pyc         | Bin 975 -> 1105 bytes
 .../0009_objektsigurnosti_operater.py         |  22 +++++
 ...9_objektsigurnosti_operater.cpython-38.pyc | Bin 0 -> 923 bytes
 plovidba_aplikacija/models.py                 |   3 +-
 .../__pycache__/settings.cpython-38.pyc       | Bin 3793 -> 4989 bytes
 plovidba_projekt/settings.py                  |  79 ++++++++++++++++--
 6 files changed, 95 insertions(+), 9 deletions(-)
 create mode 100644 plovidba_aplikacija/migrations/0009_objektsigurnosti_operater.py
 create mode 100644 plovidba_aplikacija/migrations/__pycache__/0009_objektsigurnosti_operater.cpython-38.pyc

diff --git a/plovidba_aplikacija/__pycache__/models.cpython-38.pyc b/plovidba_aplikacija/__pycache__/models.cpython-38.pyc
index 17ad5fe8e5ff66f6fa5b4bccae10dcde3b6fdbb8..29ae890ecd67123e8f7e4200da0444c9b730383e 100644
GIT binary patch
delta 400
zcmX@levyMWl$V!_0SI)gR;4bR$Scd}Hc?yMJ%u5KIfpfuEsBki!JQ$6C55$xA%!)S
zF^j#KIf^5NEto-*{Uu17CgUx(-29Z(oMIr0CA2uT2uO1jr<Rmt=A{=;Y?NYLH*wBn
zg;eG&fmFdPAs{WB!qLkVC6dCK!qvhMC7QwwG>d1lEu)PlJJ7r$4j^%hH7O@CFI$rd
z%qs%94`?c9eqKD#qSTVq$x|7v8Tlq(WK3lgnrzOb#wa#9j>(jfXYv%L^2l3UZuv#2
zndy1nsg*@6Ak+9ALqj~`LxWv|;(h&HTzzh_J39tDJG!_=apV`I7A2OX78MDA?B+uy
z_(5D&Ai)O2#bT57nZ>vng_yuXewv(<{g^#{xKpwc^V0M6lJoP@Ahxmkf`S9A2%CYo
XIBbC7RhpA(#|SbN<Xs*{Fk}J%UPfGV

delta 309
zcmcb}ah{zwl$V!_0SHbiu1qbQ$ScceHBnpL%bg*GIfbQ#A%!KCF^jdCIf^ZXHJCw@
z?IlR5CgUx(-29Z(oMIr0CA2uTC>bP-3|N622Out<GjYpgz7&oW&K8C!ffO#F8Qhc8
z8Es_PfRaV*K;jl_QchxCwk8vpSHuYvntX=QnvrKR2U9Ae;N(0eH6S^a$&`_6@@b}W
z=OR9kP99W(7sO=&5+HkvMSuhcBM&1VqW};>NFa+Dtin%|eexb=PYYIGkPpB@*i5^{
XVFUDHX-=vgBgjaQb9sP9@-P7aWA8Ql

diff --git a/plovidba_aplikacija/migrations/0009_objektsigurnosti_operater.py b/plovidba_aplikacija/migrations/0009_objektsigurnosti_operater.py
new file mode 100644
index 0000000..166e146
--- /dev/null
+++ b/plovidba_aplikacija/migrations/0009_objektsigurnosti_operater.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.2.9 on 2024-01-22 07:59
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('plovidba_aplikacija', '0008_objektsigurnosti_e_br_objektsigurnosti_fotografija_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='objektsigurnosti',
+            name='operater',
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+            preserve_default=False,
+        ),
+    ]
diff --git a/plovidba_aplikacija/migrations/__pycache__/0009_objektsigurnosti_operater.cpython-38.pyc b/plovidba_aplikacija/migrations/__pycache__/0009_objektsigurnosti_operater.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..59ac68e461a90e070b5d318e92053442074ea9f1
GIT binary patch
literal 923
zcmZWn&2G~`5cc{nj+@d*^iU3P;Fe2NZh#PK)HWbNi$uu9vb1tC6U(mcHD0GET;bXi
zF91g_yaw;ES5AEegn(I_G!-3dM>FFY&3yCCbbH%3NIu>FhTl!Y_@SNaVv}<~Pd+9E
z2C&S?S-_aK&CJZLz{>5wZhR|q0{58#HaH&*aL`ISAFQAQ*2EaNmsD>InDQjnbyCD~
zU@AXP;wq{WQAp+H0x*-ObDeixJaP``$uTK30tQB4qV?HECw0FtV6ho=sFw#OSlCT{
zuyHHxrQLKpy`^)&xv;>6&V?PbU<W*!rmMOq>((^K?J^VR3CtoMm05BY&66|=4)*u=
zA968E@vN3fysQc#>x3hpRX3vxQ44~yph6xMz;jVy(Eq<!d7?xDjMXJ0Fat|<02k3R
zt5sJNobY3f%B;nBVAFE+LU<A7sO&~Niv%-J{jx%d)j3i@Q+zt;D~~ssoGYJGcUWdf
zc8~M7%P7;;oL3h0RJ-zBRF=_<{sWd+02cFAMbsN=XEc5DoKGjmuldQVqvMyVca@Q#
zRNe?+tS6}SQ7C^*7?Zeofh*-g8WpinCd`!Az#vXl=WsMR9334izlE)N{%TZrsk%`=
z-yc2>rvycYlX^*m)DOZVlxMXl!!;vezQW@C%H?GxG$EV7hOuySO(Ajj=q5|+?GMXU
z<<J!RwB)WfET5UbZP#WdeS6IOW&de12A<k#u?^><ShRcU{)@n@S!uhDJ6FMBd&$G~
f9;!VJSohmNZ>@V2Q{I!7uBVzF>5}TPKJ%=<im(*Y

literal 0
HcmV?d00001

diff --git a/plovidba_aplikacija/models.py b/plovidba_aplikacija/models.py
index b3f0763..fad5ea1 100644
--- a/plovidba_aplikacija/models.py
+++ b/plovidba_aplikacija/models.py
@@ -1,6 +1,7 @@
 from django.db import models
 from django.contrib.gis.db import models
 from django.contrib.auth.models import User
+from django.conf import settings
 
 class ObjektSigurnosti(models.Model):
     naziv = models.CharField(max_length=255)
@@ -12,7 +13,7 @@ class ObjektSigurnosti(models.Model):
     fotografija = models.CharField(max_length=255, null=True, blank=True)
     id_ais = models.CharField(max_length=255, null=True, blank=True)
     simbol_oznaka = models.CharField(max_length=255, null=True, blank=True)
-    #operater = models.ForeignKey(User, on_delete=models.CASCADE)
+    operater = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
 
     def __str__(self):
         return self.naziv
diff --git a/plovidba_projekt/__pycache__/settings.cpython-38.pyc b/plovidba_projekt/__pycache__/settings.cpython-38.pyc
index 13bfc01e85e022c771173baf63863a6e207015b8..8f218dcfc111f6b3945c5796bd5d2e0a910c4cec 100644
GIT binary patch
delta 1951
zcmZuwTW=Fb6!u<xzr?viNC?*uLog&E;TA3%?>OGX_J-XxA=ArZawf(!w&~if1XAUP
z^tBbpuaOFmm8z-|{RjO8eck>7-jFJ_5>iFatV2i;JDM|lzB%`E=FhSJCK9E1JmSM|
za`abrXzY1nRQz3hK6SY*fPX7ei_)mzg8&4#VzmGb)Z#Q=OVC8EhxXKxG+FDVy@HPg
zAN9TH-$w_S^itr91|UQSAxwuVJ~|8$dI<jyvjjvTR`G31bOiY$5T~Oo35jiijzJG3
zp%?nv&<_JJ2tzOohu|=bRATff9Dz|7gQGAG$KZG+NXOv>Jq9N|*T-1^PQ4T>0)*i-
zOu!kKgj7YY3UGEut_bu5oTDdU3eH0sF5tQd(=f9Ws0#EH%%b~CFt;sM1$GLi4*Q@z
zzu<$*^fX*S)d`q|t7vEzu6gvjM;EF>MW$ywsT=6_Chl9fZ-WAhJAOI|8JfcU&SKu@
zK&4Ya=y}M}G>ftxSc2TP2-*)AuE#IK3i5f*Ljl5VDDDL41r`S#!rLOf2&;4&?$8-D
zIE(ud?zz3Z4W2ih2NUV#J=A(B(koD+SND*+h+Km;dVLSMhseSnw~pKmtOea}3-l&@
zMsFeWIedWu+{RG8^g>ZEdK>N|wurZ7>{<rT2Y9M@Zs18g*$7Hx0q7E<3?$@o__yi(
zX)O0lbY8F=x?Tph;A0x{zcJ0@Hy3;XkW62y@@iCE72+wu4Y#T_25hTU?rcflYgu<7
zqZ_8J<n#I(QElDOmb9YzR+vhObSP(8tM)xRs~c;Iq2l$bp<BA^f7oh0Zo09op%*Pu
zRPB<HfAvPXEej*BrbB;-Z9l7(t6MZ&E7zgiYB*2aKzU<>HJdc(uuX?GAJXyVHOn?g
z)*xoiw)7QJwDVe)SXzPDs<Ljr?!mW&@ybws(xk_^w35jX)BIStpcP9NF<<k?hw{N%
zwch@w#hR{MY}8pQK!-l<g$`maibW0vVbZ}*x}kka$;#OoU0>0NZIVpMAavjWrWA;&
zSp*FX>=X4$s2B6=oxdYzdsCv5!Z_Vf#%YvW)pETv6TRMcql$`Y*rcFn`KRaLQMq1e
zq&FH4OY=IWACxz~Vs&Vyo3+;CG~w7{7jh$>j-As@>uH~N-Pqi$Zm`+;IW$nCiSB*L
zB!+F}&G+)Fx?xpUM2w_|6z0*ZXTj!TZvO|9_Nro<Yr3JjeJaT+rMzWh&kNl^JGJQe
zup7dWSjN^Zy5S{N$z$&<CAHG|F*<uQz%vyaP3mtnE3Dy2UgkIujL)DWb5>&YZ=E3i
zIU!EMobXOM(axLbjVc}bFr9ox-_Pd(JYx`*6fI53n@$XM-2u$wz}WKgxWnD9@fp6i
zZks0NOca$E4xhBn`PeUQI^s2y6K*e~Sejn63&hIlD(&~~y0tOLosx!L>5vEVvK6uY
zI7++t@IK+Y#L%+4#&#7Bj2PFXT;W9S;4IqSO~lj+t9fGM3vebof5n!fZaA+LmrBYK
zF*|c{t?i_F((!I+i%JIHlImR8hw*Y?^PP)`In$iXa5DRm2$tkSpD`ZY&T1sDI+wWc
z92X8^x2jH~{<F`y&p}S!c7BR)P9z1NPmaZ;q!bcjLQFg+js|5}mSn#y$U;m)Duw)=
zvBY;@CuP6*PLy#YDhlGifj%y?yZoXMdM8VW@15d5fkebFqe^!rQCAKpBsr8os|hI~
Thfq7>t&qSMO3TQL0dM~g+*A;H

delta 728
zcmYjPJ8u&~5Wd|zpB>w`ek9J*j-8idCvl!YATf{&j)Nmhjv#5Kar2!{j&LkpBs!EL
zq=x7yT_h3`LZZtLprE0pbwxpgM2{#?*fYptM>G1q*>7iONBcYbB_$3GBdEyL`S{K{
zPh5y3|G_R6)=z!Vp9Pyb>CF&@nqdkz4KkX7L^DDWrda-?=w<A`7`N0b<{9bmQ$GSU
zU@MeBAA$%W3<ClYL=i(A{TQ&rG>8NSF@#}^U=(AvpN5d6VWhmOr<Ws^j`1sQGX#)E
z1{0XXl&v)wrrVm$XcRLvhAd{0Ltfe(=CRP$8;p`DSOSY!I^zvyC6OIbuv}EILMg1u
zljA60P1Y&kRyW@6#ybsWYm~;iyz#Dm%5YDD4Q!&=_EE+P;XVRqoF?#qCh?G_<O`>z
z&q&X9=ioKG<uy#R@_G}hROckx?xMVvd(E6TR!(Z?U=|fCFZo+5-{sqqdlU6)Ji6jE
zUqp!(dZ`_mDxge@z09u6EcMu9$(B)}6{t^@{ND99zRz4!dwDH<TN+DT*ZMwjcgDyk
zI)VKswY_?^vfb(1Et%DN$viOKy0PijM4IPU-E*-v?(@C_Z=H~@bz)mBNA<XB9Y1$;
ziQKPZ!2KmQ+;-#xcarY+=x)E0mK#pS)A^;Y;k1t3%~&PXiI;ZD=3(`qZXO=g>gCE#
zwe((b%AUIH-o%cEKTD{E!)jCwurSZ?q+e4tuIcWp_>1*8zu}s6Rb!m-pSltB$-RFT
U<v|wY`d{}8RSO8FsX`ULKQME%2LJ#7

diff --git a/plovidba_projekt/settings.py b/plovidba_projekt/settings.py
index aeaa151..5b9304b 100644
--- a/plovidba_projekt/settings.py
+++ b/plovidba_projekt/settings.py
@@ -18,6 +18,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 # dodano
 import os
 from osgeo import gdal
+from datetime import timedelta
 
 from .env import BASE_DIR, ENV_BOOL, ENV_LIST, ENV_NUM, ENV_STR, PARDIR  # noqa
 
@@ -31,10 +32,25 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 SECRET_KEY = 'django-insecure-6iovioyxw5hqwp)0=zu&yu&p!ql34g+x(p4xgk79vs57zpinio'
 
 # SECURITY WARNING: don't run with debug turned on in production!
+
 DEBUG = True
+# DEBUG = ENV_BOOL("DEBUG")
 
 ALLOWED_HOSTS = []
 
+# CSRF_TRUSTED_ORIGINS = ENV_LIST("CSRF_TRUSTED_ORIGINS", ",", []),
+
+# CORS settings
+CORS_ALLOW_ALL_ORIGINS = False
+CORS_ALLOW_CREDENTIALS = True
+CORS_ALLOWED_ORIGINS = ENV_LIST("CORS_ALLOWED_ORIGINS", ",", [])
+
+# HTTP -> HTTPS
+USE_X_FORWARDED_HOST = True
+SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
+
+# Frontend
+FRONTEND_URL = ENV_STR("FRONTEND_URL")
 
 # Application definition
 
@@ -130,6 +146,9 @@ AUTH_PASSWORD_VALIDATORS = [
     },
 ]
 
+# Substituting a custom User model
+AUTH_USER_MODEL = "user.User"
+
 # Define DRF settings
 REST_FRAMEWORK = {
     "DEFAULT_AUTHENTICATION_CLASSES": [
@@ -143,6 +162,34 @@ REST_FRAMEWORK = {
     "PAGE_SIZE": 100,
 }
 
+
+# # # AUTH SETTINGS
+
+# Force email based auth
+
+# Custom auth variables
+AUTH_AUTHENTICATION_METHOD = "email"  # Options: username | email | username_email
+AUTH_EMAIL_REQUIRED = True
+AUTH_USERNAME_REQUIRED = False  # Require username in registration
+AUTH_EMAIL_VERIFICATION = "mandatory"  # <mandatory|optional|None>
+AUTH_ACCESS_TOKEN_NAME = "access"  # set access token name
+AUTH_REFRESH_TOKEN_NAME = "refresh"  # set access token name
+
+# Simple JWT config
+
+SIMPLE_JWT = {
+    "REFRESH_TOKEN_LIFETIME": timedelta(
+        days=ENV_NUM("JWT_REFRESH_TOKEN_LIFETIME_DAYS", 15)
+    ),
+    "ROTATE_REFRESH_TOKENS": True,
+    "ACCESS_TOKEN_LIFETIME": timedelta(
+        minutes=ENV_NUM("JWT_ACCESS_TOKEN_LIFETIME_MINUTES", 10)
+    ),
+    "AUTH_COOKIE_SECURE": True,
+    "AUTH_COOKIE_SAMESITE": "None",
+    "AUTH_COOKIE_HTTP_ONLY": True,
+}
+
 # API docs
 SHOW_API_DOCS = ENV_BOOL("SHOW_API_DOCS", True)
 
@@ -161,14 +208,10 @@ USE_TZ = True
 
 LOCALE_PATHS = [os.path.join(BASE_DIR, "locale")]
 
-PROJ_LIB = ENV_STR("PROJ_LIB", None)
-GDAL_DATA = ENV_STR("GDAL_DATA", None)
-
-if PROJ_LIB:
-    os.environ["PROJ_LIB"] = PROJ_LIB
-
-if GDAL_DATA:
-    os.environ["GDAL_DATA"] = GDAL_DATA
+# Available languages
+LANGUAGES = [
+    ("hr", ("Croatian")),
+]
 
 
 # Static files (CSS, JavaScript, Images)
@@ -195,6 +238,18 @@ RESOURCES_DIR = os.path.join(BASE_DIR, "resources")
 # TEMP DIR
 TEMP_DIR = os.path.join(BASE_DIR, "temp")
 
+# # # Email and support settings # # #
+
+ADMIN_EMAIL = ENV_STR("ADMIN_EMAIL")
+EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
+EMAIL_HOST = ENV_STR("EMAIL_HOST", "smtp.office365.com")
+EMAIL_USE_TLS = ENV_BOOL("EMAIL_USER_TLS", True)
+EMAIL_PORT = ENV_NUM("EMAIL_PORT", 587)
+EMAIL_HOST_USER = ENV_STR("EMAIL_HOST_USER")
+EMAIL_HOST_PASSWORD = ENV_STR("EMAIL_HOST_PASSWORD")
+DEFAULT_FROM_EMAIL = ENV_STR("DEFAULT_FROM_EMAIL")
+EMAIL_USE_SSL = ENV_BOOL("EMAIL_USER_TLS", False)
+
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
 
@@ -202,3 +257,11 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
 
 
+PROJ_LIB = ENV_STR("PROJ_LIB", None)
+GDAL_DATA = ENV_STR("GDAL_DATA", None)
+
+if PROJ_LIB:
+    os.environ["PROJ_LIB"] = PROJ_LIB
+
+if GDAL_DATA:
+    os.environ["GDAL_DATA"] = GDAL_DATA
\ No newline at end of file