From 77def611ccec2469f353f6c3af14b6658a752d5f Mon Sep 17 00:00:00 2001
From: Tanner Collin <git@tannercollin.com>
Date: Sun, 5 Sep 2021 00:47:44 +0000
Subject: [PATCH] Add Discourse auth

---
 apiserver/apiserver/api/serializers.py |  34 +++++++++++++++----
 apiserver/apiserver/api/utils_auth.py  |  12 +++++++
 apiserver/apiserver/secrets.py.example |   5 +++
 webclient/public/discourselogo.png     | Bin 0 -> 3049 bytes
 webclient/public/wikilogo.png          | Bin 1090 -> 5869 bytes
 webclient/src/Auth.js                  |  43 ++++++++++++++++++++++---
 6 files changed, 84 insertions(+), 10 deletions(-)
 create mode 100644 webclient/public/discourselogo.png

diff --git a/apiserver/apiserver/api/serializers.py b/apiserver/apiserver/api/serializers.py
index c769574..c4f857e 100644
--- a/apiserver/apiserver/api/serializers.py
+++ b/apiserver/apiserver/api/serializers.py
@@ -561,11 +561,20 @@ class MyPasswordChangeSerializer(PasswordChangeSerializer):
         data = dict(
             username=self.user.username,
             password=self.data['new_password1'],
+            email=self.user.email,
+            first_name=self.user.member.first_name,
         )
 
         if utils_auth.wiki_is_configured():
             if utils_auth.set_wiki_password(data) != 200:
-                msg = 'Problem connecting to Auth server: set.'
+                msg = 'Problem connecting to Wiki Auth server: set.'
+                utils.alert_tanner(msg)
+                logger.info(msg)
+                raise ValidationError(dict(non_field_errors=msg))
+
+        if utils_auth.discourse_is_configured():
+            if utils_auth.set_discourse_password(data) != 200:
+                msg = 'Problem connecting to Discourse Auth server: set.'
                 utils.alert_tanner(msg)
                 logger.info(msg)
                 raise ValidationError(dict(non_field_errors=msg))
@@ -602,11 +611,20 @@ class MyPasswordResetConfirmSerializer(PasswordResetConfirmSerializer):
         data = dict(
             username=self.user.username,
             password=self.data['new_password1'],
+            email=self.user.email,
+            first_name=self.user.member.first_name,
         )
 
         if utils_auth.wiki_is_configured():
             if utils_auth.set_wiki_password(data) != 200:
-                msg = 'Problem connecting to Auth server: set.'
+                msg = 'Problem connecting to Wiki Auth server: set.'
+                utils.alert_tanner(msg)
+                logger.info(msg)
+                raise ValidationError(dict(non_field_errors=msg))
+
+        if utils_auth.discourse_is_configured():
+            if utils_auth.set_discourse_password(data) != 200:
+                msg = 'Problem connecting to Discourse Auth server: set.'
                 utils.alert_tanner(msg)
                 logger.info(msg)
                 raise ValidationError(dict(non_field_errors=msg))
@@ -653,10 +671,14 @@ class HistorySerializer(serializers.ModelSerializer):
 
 class SpaceportAuthSerializer(LoginSerializer):
     def authenticate(self, **kwargs):
-        result = super().authenticate(**kwargs)
+        user = super().authenticate(**kwargs)
+
+        if user:
+            data = self.context['request'].data.copy()
+            data['email'] = user.email
+            data['first_name'] = user.member.first_name
 
-        if result:
-            data = self.context['request'].data
             utils_auth.set_wiki_password(data)
+            utils_auth.set_discourse_password(data)
 
-        return result
+        return user
diff --git a/apiserver/apiserver/api/utils_auth.py b/apiserver/apiserver/api/utils_auth.py
index 6a6f1a2..98481ec 100644
--- a/apiserver/apiserver/api/utils_auth.py
+++ b/apiserver/apiserver/api/utils_auth.py
@@ -9,6 +9,9 @@ from apiserver.api import utils
 def wiki_is_configured():
     return bool(secrets.WIKI_AUTH_API_URL and secrets.AUTH_API_KEY)
 
+def discourse_is_configured():
+    return bool(secrets.DISCOURSE_AUTH_API_URL and secrets.AUTH_API_KEY)
+
 
 def auth_api(url, data):
     try:
@@ -25,3 +28,12 @@ def set_wiki_password(data):
         password=data['password'],
     )
     return auth_api(secrets.WIKI_AUTH_API_URL + 'set-wiki-password', auth_data)
+
+def set_discourse_password(data):
+    auth_data = dict(
+        username=data['username'],
+        password=data['password'],
+        first_name=data['first_name'],
+        email=data['email'],
+    )
+    return auth_api(secrets.DISCOURSE_AUTH_API_URL + 'set-discourse-password', auth_data)
diff --git a/apiserver/apiserver/secrets.py.example b/apiserver/apiserver/secrets.py.example
index 1cf694e..0827e23 100644
--- a/apiserver/apiserver/secrets.py.example
+++ b/apiserver/apiserver/secrets.py.example
@@ -45,6 +45,11 @@ LDAP_API_KEY = ''
 # with trailing slash
 WIKI_AUTH_API_URL = ''
 
+# Discourse Auth API url
+# should contain the IP and port of the script and machine connected over VPN
+# with trailing slash
+DISCOURSE_AUTH_API_URL = ''
+
 # Auth API key
 # should be equal to the auth token value set in
 # spaceport/authserver/secrets.py
diff --git a/webclient/public/discourselogo.png b/webclient/public/discourselogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..294285f3765f7395db2359e6933250d9d4ff781c
GIT binary patch
literal 3049
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

literal 0
HcmV?d00001

diff --git a/webclient/public/wikilogo.png b/webclient/public/wikilogo.png
index 228f35244c652adbd5cc8d179e3a47a6f8c57bdd..e0763eeee3362dd8f6b0bc3ca8511e74bdf4c8ac 100644
GIT binary patch
literal 5869
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
JUae{q`#%C;)K>ri

literal 1090
zcmV-I1ikx-P)<h;3K|Lk000e1NJLTq005Q%006QG0{{R3m*U3o0001rP)t-s0001x
zkdSU~aIUVe+uYpN*4K}ZkI~W5M@UG!yS!&;X^4r6%FE26qNBsa#2+6ZFfcJzR#tz2
zfuf?Lva_=~J3LNKP<MBCmY0}cUtpS>n@&zoR8&=EW@mJDb-usAK|(`4KR<wgfhZ{{
zY;A4;000UM3@a-vLq$d#8ypf66H81@Gcz+IBO_+`=yd=903~!%PE!DlyH*Abdlc?G
z#F!vtDD>srj%`W)$FXqGd*#5bnlkj)r0k>zm)3y*00TlvL_t(|+U?tIbD}U1!0`ow
z5fx4W>tk!%>%x(P@Bj5~ZoHe4NY921mTUL-x;p>a1QR<WFvb{Tj4{T(G9eddQoslZ
z8D(?-FkRQ>S-qa_HeQ^3T%9;&&#PKtheAzfUa)}Mi{?8c$<#b<G6}a7?pI}j*Hvpj
zf?JW#CB9p+$^_hioY!bY-5@OV)@ZF*1u&>+rLd23vw*>fd5Jw0k9!!%Vpkx6FJK7y
z8fgv@xR*6ZRcGMZzQik3S>Y9>2X1+9&#GD;(`}GQ8A_Q1+w{0>iZ}mu<91dRc2djx
z_#{9l7Qw@l!fr0R;^vK}T)cU`czCKhU*v%+r?Tt)?<NxdMa0Lhux1Z#ge$!Cw3XLi
z7~d6mq0Yet;a|S@w^YJ=gxe)vm`ZTKtI%|p!+Rwi1DgR|RH8w>2%BN2-_W!NDzQSt
z_X*g!T*&$aM4mFMVz3olbooFd%_UsMU@te<vB`jBW<G)e^s%i_cL;$XsK`}ku{p0f
z^e1*k)fW1iG^nW;gkkABOQq18NDI_FLtnz!S@(i6`6Ft|5PFI#{TNJuA~Cj?2R-@b
zcBk1YeRm1yWl`%(2t?vu->EV5;uYGk5}=A27a#QpY<mE@7i?Q6(1TRQu;}vd*i!AG
zhq*Z{=i}Ou*RYDfg+OVmD8X7-V#_fE7sQkHEat>hT1~)>lzLvz3w%{Z;6|ixF5-E3
z6ySzf(#}QsLw^okIno}as5Z`tAvTxFNdI<d5^yCbNSCg?!dFXh=A=kpWH<Wd!5L9u
z%YpQjCk1!3NAZ#LWqJ$l+)=KAq4xQZ50zC?vWjGsS(W50i$#2xIFpvdtf6ogXLaB#
z&f+Z2`d_kk{y^qH$f^<;3G==+5}d_Ze{hx!&a%N-HaLsGahCFef#mjCZN)&=pYeA3
z7iV!6XK@y1*=9XrhY!z!*c-^EX=jb%2YSEBpQFqQIg7K-ILiiS+2AZ2oMmNPNA)-_
zHY2?Tj`h;aS)9dLh@8b)pEe6T-!xlQ?KhnHSIySga_}!b16|Ud;LiFtIXMhNwzFo|
zSrMFZ7H4r5XK@y1an{)v$r79CD-Yfwo3<=~F~%5Uj4|fSFLrsg(PHmq8UO$Q07*qo
IM6N<$g5HV)KL7v#

diff --git a/webclient/src/Auth.js b/webclient/src/Auth.js
index dabeecc..755c5ad 100644
--- a/webclient/src/Auth.js
+++ b/webclient/src/Auth.js
@@ -18,7 +18,7 @@ export function AuthForm(props) {
 
 	const handleSubmit = (e) => {
 		if (input.username.includes('@')) {
-			setError({ username: 'Username, not email.' });
+			setError({ username: 'Spaceport username, not email.' });
 		} else {
 			if (loading) return;
 			setLoading(true);
@@ -104,12 +104,43 @@ export function AuthWiki(props) {
 
 			<p>would like to request Spaceport authentication.</p>
 
-			<p>URL: <a href='http://wiki.protospace.ca/Welcome_to_Protospace' target='_blank' rel='noopener noreferrer'>wiki.protospace.ca</a></p>
+			<p>URL: <a href='https://wiki.protospace.ca/Welcome_to_Protospace' target='_blank' rel='noopener noreferrer'>wiki.protospace.ca</a></p>
 
 			<AuthForm user={user}>
 				<Header size='small'>Success!</Header>
-				<p>You can now log into the wiki:</p>
-				<p><a href='http://wiki.protospace.ca/index.php?title=Special:UserLogin&returnto=Welcome+to+Protospace' rel='noopener noreferrer'>Protospace Wiki</a></p>
+				<p>You can now log into the Wiki:</p>
+				<p>
+					Username: {user.username}<br/>
+					Password: [this Spaceport password]
+				</p>
+				<p><a href='https://wiki.protospace.ca/index.php?title=Special:UserLogin&returnto=Welcome+to+Protospace' rel='noopener noreferrer'>Protospace Wiki</a></p>
+			</AuthForm>
+		</Segment>
+	);
+}
+
+export function AuthDiscourse(props) {
+	const { user } = props;
+
+	return (
+		<Segment compact padded>
+			<Header size='medium'>
+				<Image src={'/discourselogo.png'} />
+				Protospace Discourse
+			</Header>
+
+			<p>would like to request Spaceport authentication.</p>
+
+			<p>URL: <a href='https://forum.protospace.ca' target='_blank' rel='noopener noreferrer'>forum.protospace.ca</a></p>
+
+			<AuthForm user={user}>
+				<Header size='small'>Success!</Header>
+				<p>You can now log into the Discourse:</p>
+				<p>
+					Username: {user.username}<br/>
+					Password: [this Spaceport password]
+				</p>
+				<p><a href='https://forum.protospace.ca' rel='noopener noreferrer'>Protospace Discourse</a></p>
 			</AuthForm>
 		</Segment>
 	);
@@ -127,6 +158,10 @@ export function Auth(props) {
 			<Route path='/auth/wiki'>
 				<AuthWiki user={user} />
 			</Route>
+
+			<Route path='/auth/discourse'>
+				<AuthDiscourse user={user} />
+			</Route>
 		</Container>
 	);
 }