Merge branch 'CHAOS-529-email-sending' of https://github.com/devsoc-unsw/chaos into CHAOS-529-email-sending

Author: KavikaPalletenne

backend/migrations/20240406023149_create_users.sql

@@ -9,7 +9,7 @@ CREATE TABLE users (
     gender TEXT,
     degree_name TEXT,
     degree_starting_year INTEGER,
-    role user_role NOT NULL,
+    role user_role NOT NULL DEFAULT 'User',
     created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
     updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
 );

backend/server/src/handler/auth.rs

@@ -11,8 +11,6 @@ use crate::service::auth::create_or_get_user_id;
 use crate::service::jwt::encode_auth_token;
 use axum::extract::{Query, State};
 use axum::response::IntoResponse;
-use axum::Extension;
-use oauth2::basic::BasicClient;
 use oauth2::reqwest::async_http_client;
 use oauth2::{AuthorizationCode, TokenResponse};
 
@@ -38,9 +36,8 @@ use oauth2::{AuthorizationCode, TokenResponse};
 pub async fn google_callback(
     State(state): State<AppState>,
     Query(query): Query<AuthRequest>,
-    Extension(oauth_client): Extension<BasicClient>,
 ) -> Result<impl IntoResponse, ChaosError> {
-    let token = oauth_client
+    let token = state.oauth2_client
         .exchange_code(AuthorizationCode::new(query.code))
         .request_async(async_http_client)
         .await?;
@@ -52,16 +49,15 @@ pub async fn google_callback(
         .send()
         .await?;
 
-    let profile = profile.json::<GoogleUserProfile>().await.unwrap();
+    let profile = profile.json::<GoogleUserProfile>().await?;
 
     let user_id = create_or_get_user_id(
         profile.email.clone(),
         profile.name,
         state.db,
         state.snowflake_generator,
     )
-    .await
-    .unwrap();
+    .await?;
 
     // TODO: Return JWT as set-cookie header.
     let token = encode_auth_token(

backend/server/src/models/app.rs

@@ -21,11 +21,14 @@ use snowflake::SnowflakeIdGenerator;
 use sqlx::postgres::PgPoolOptions;
 use sqlx::{Pool, Postgres};
 use std::env;
+use oauth2::basic::BasicClient;
+use crate::service::oauth2::build_oauth_client;
 
 #[derive(Clone)]
 pub struct AppState {
     pub db: Pool<Postgres>,
     pub ctx: ReqwestClient,
+    pub oauth2_client: BasicClient,
     pub decoding_key: DecodingKey,
     pub encoding_key: EncodingKey,
     pub jwt_header: Header,
@@ -61,6 +64,15 @@ pub async fn app() -> Result<Router, ChaosError> {
     // Initialise reqwest client
     let ctx = reqwest::Client::new();
 
+    // Initialise oauth2 client
+    let client_id = env::var("GOOGLE_CLIENT_ID")
+        .expect("Error getting GOOGLE_CLIENT_ID")
+        .to_string();
+    let client_secret = env::var("GOOGLE_CLIENT_SECRET")
+        .expect("Error getting GOOGLE_CLIENT_SECRET")
+        .to_string();
+    let oauth2_client = build_oauth_client(client_id, client_secret);
+
     // Initialise Snowflake Generator
     let snowflake_generator = SnowflakeIdGenerator::new(1, 1);
 
@@ -74,6 +86,7 @@ pub async fn app() -> Result<Router, ChaosError> {
     let state = AppState {
         db: pool,
         ctx,
+        oauth2_client,
         encoding_key,
         decoding_key,
         jwt_header,

backend/server/src/service/oauth2.rs

@@ -37,9 +37,7 @@ use std::env;
 /// );
 /// ```
 pub fn build_oauth_client(client_id: String, client_secret: String) -> BasicClient {
-    let hostname = env::var("CHAOS_HOSTNAME").expect("Could not read CHAOS hostname");
-
-    let redirect_url = format!("{}/api/auth/callback/google", hostname);
+    let redirect_url = env::var("GOOGLE_REDIRECT_URI").expect("Could not read GOOGLE_REDIRECT_URI");
 
     let auth_url = AuthUrl::new("https://accounts.google.com/o/oauth2/v2/auth".to_string())
         .expect("Invalid authorization endpoint URL");

frontend/.eslintrc.json

@@ -14,6 +14,13 @@
     "plugin:import/typescript",
     "plugin:react/jsx-runtime"
   ],
+  "ignorePatterns": [
+    "babel-plugin-macros.config.js",
+    "tailwind.config.js",
+    "prettier.config.js",
+    "postcss.config.js",
+    "vite.config.ts"
+  ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
     "ecmaVersion": 12,
@@ -32,42 +39,43 @@
     "@typescript-eslint/no-shadow": "off",
     "no-unused-vars": "off",
     "@typescript-eslint/no-unused-vars": [
-      1,
+      "warn",
       {
         "varsIgnorePattern": "^_",
         "argsIgnorePattern": "^_"
       }
     ],
     "@typescript-eslint/naming-convention": [
-        "error",
-        {
-            "selector": "default",
-            "format": ["camelCase"],
-            "leadingUnderscore": "allow",
-            "trailingUnderscore": "allow"
-        },
+      "error",
+      {
+        "selector": "default",
+        "format": ["camelCase"],
+        "leadingUnderscore": "allow",
+        "trailingUnderscore": "allow"
+      },
 
-        {
-            "selector": "variable",
-            "format": ["camelCase", "UPPER_CASE", "PascalCase"],
-            "leadingUnderscore": "allow",
-            "trailingUnderscore": "allow"
-        },
+      {
+        "selector": "variable",
+        "format": ["camelCase", "UPPER_CASE", "PascalCase"],
+        "leadingUnderscore": "allow",
+        "trailingUnderscore": "allow"
+      },
 
-        {
-            "selector": "function",
-            "format": ["camelCase", "PascalCase"]
-        },
+      {
+        "selector": "function",
+        "format": ["camelCase", "PascalCase"]
+      },
 
-        {
-            "selector": "typeLike",
-            "format": ["PascalCase"]
-        },
+      {
+        "selector": "typeLike",
+        "format": ["PascalCase"],
+        "leadingUnderscore": "allow"
+      },
 
-        {
-            "selector": "objectLiteralProperty",
-            "format": null
-        }
+      {
+        "selector": "objectLiteralProperty",
+        "format": null
+      }
     ],
     "import/prefer-default-export": "off",
     "import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
@@ -103,7 +111,7 @@
         "custom": "ignore"
       }
     ],
-    "react/no-unknown-property": [2, { "ignore": ["tw", "css"] }],
+    "react/no-unknown-property": ["error", { "ignore": ["tw", "css"] }],
     "react/require-default-props": "off",
     "@typescript-eslint/consistent-type-imports": "error",
     "no-void": "off",

frontend/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />

frontend/package.json

@@ -79,11 +79,12 @@
     "eslint-import-resolver-typescript": "3.5.2",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-jsx-a11y": "6.7.1",
-    "eslint-plugin-prettier": "4.2.1",
+    "eslint-plugin-prettier": "5.0.0",
     "eslint-plugin-react": "7.32.2",
     "eslint-plugin-react-hooks": "4.6.0",
     "husky": "8.0.2",
-    "prettier": "2.8.0",
+    "prettier": "3.3.2",
+    "prettier-plugin-tailwindcss": "0.6.4",
     "tailwindcss": "3.3.2",
     "tailwindcss-gradient": "1.0.1",
     "twin.macro": "3.3.1",

frontend/prettier.config.js

@@ -1,3 +1,20 @@
+/**
+ * @type {import("prettier").Config}
+ */
 module.exports = {
-  plugins: [],
+  trailingComma: "es5",
+  tabWidth: 2,
+  semi: true,
+  singleQuote: false,
+  printWidth: 80,
+  useTabs: false,
+  quoteProps: "as-needed",
+  jsxSingleQuote: false,
+  bracketSpacing: true,
+  bracketSameLine: false,
+  arrowParens: "always",
+
+  plugins: ["prettier-plugin-tailwindcss"],
+  tailwindAttributes: ["className", "class", "tw"],
+  tailwindFunctions: ["tw"],
 };

frontend/public/site.webmanifest

@@ -1 +1,19 @@
-{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
+{
+  "name": "",
+  "short_name": "",
+  "icons": [
+    {
+      "src": "/android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "/android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "theme_color": "#ffffff",
+  "background_color": "#ffffff",
+  "display": "standalone"
+}

frontend/src/api/api.ts

@@ -5,7 +5,10 @@ export class FetchError extends Error {
 
   public statusText: string;
 
-  constructor(public resp: Response, public data?: unknown) {
+  constructor(
+    public resp: Response,
+    public data?: unknown
+  ) {
     super(resp.statusText);
 
     this.name = "FetchError";