Keep working it

Author: ViddeM

backend/.env.example

@@ -7,6 +7,7 @@ GAMMA_INTERNAL_URL=http://localhost:8081
 GAMMA_API_KEY=hubbit
 GAMMA_CLIENT_ID=hubbit
 GAMMA_CLIENT_SECRET=hubbit
+GAMMA_REDIRECT_URI=http://localhost:3000/api/auth/gamma/callback
 
 COOKIE_SECRET=bdvrJ2cYgPeaj6Tys5475QHoj7Qcenb2bdvrJ2cYgPeaj6Tys5475QHoj7Qcenb2
 COOKIE_SECURE=false

backend/src/config.rs

@@ -10,6 +10,7 @@ pub struct Config {
   pub gamma_api_key: String,
   pub gamma_client_id: String,
   pub gamma_client_secret: String,
+  pub gamma_redirect_uri: String,
   pub cookie_secret: String,
   pub cookie_secure: bool,
   pub group_whitelist: Vec<String>,
@@ -26,6 +27,7 @@ impl Config {
       gamma_api_key: try_read_var("GAMMA_API_KEY")?,
       gamma_client_id: try_read_var("GAMMA_CLIENT_ID")?,
       gamma_client_secret: try_read_var("GAMMA_CLIENT_SECRET")?,
+      gamma_redirect_uri: try_read_var("GAMMA_REIDRECT_URI")?,
       cookie_secret: try_read_var("COOKIE_SECRET")?,
       cookie_secure: try_read_var("COOKIE_SECURE")?,
       group_whitelist: try_read_var::<String>("GROUP_WHITELIST")

backend/src/handlers/auth.rs

@@ -57,13 +57,11 @@ async fn gamma_init_flow(
     }
   }
 
-  // TODO: these should be config params
   let scope = "openid%20profile";
-  let redirect_uri = "http://localhost:3000/api/auth/gamma/callback";
 
   let url = format!(
-    "{}/oauth2/authorize?response_type=code&client_id={}&state={}&scope={scope}&redirect_uri={redirect_uri}",
-    config.gamma_public_url, config.gamma_client_id, state
+    "{}/oauth2/authorize?response_type=code&client_id={}&state={}&scope={scope}&redirect_uri={}",
+    config.gamma_public_url, config.gamma_client_id, state, config.gamma_redirect_uri
   );
   HttpResponse::TemporaryRedirect()
     .append_header(("Location", url))

backend/src/models.rs

@@ -99,29 +99,55 @@ impl From<Period> for i32 {
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct GammaUser {
+  #[serde(rename = "sub")]
   pub id: Uuid,
   pub cid: String,
+  #[serde(rename = "nickname")]
   pub nick: String,
-  #[serde(rename = "firstName")]
+  #[serde(rename = "given_name")]
   pub first_name: String,
-  #[serde(rename = "lastName")]
+  #[serde(rename = "family_name")]
   pub last_name: String,
-  #[serde(rename = "avatarUrl")]
+  #[serde(rename = "picture")]
   pub avatar_url: String,
-  pub groups: Vec<GammaGroup>,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
 pub struct GammaGroup {
-  pub active: bool,
-  #[serde(rename = "superGroup")]
+  pub id: Uuid,
+  pub name: String,
+  pub pretty_name: String,
   pub super_group: GammaSuperGroup,
+  pub post: GammaGroupPost,
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
 pub struct GammaSuperGroup {
   pub id: Uuid,
   pub name: String,
-  #[serde(rename = "prettyName")]
   pub pretty_name: String,
+  #[serde(rename = "type")]
+  pub group_type: GammaGroupType,
+  pub sv_description: String,
+  pub en_description: String,
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+#[serde(rename = "camelCase")]
+pub enum GammaGroupType {
+  Society,
+  Functionaries,
+  Committee,
+  Alumni,
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct GammaGroupPost {
+  pub id: Uuid,
+  pub version: u32,
+  pub sv_name: String,
+  pub en_name: String,
 }

backend/src/utils/gamma.rs

@@ -20,9 +20,6 @@ struct GammaTokenRequest {
 pub async fn oauth2_token(config: &Config, code: &str) -> HubbitResult<GammaTokenResponse> {
   let client = Client::new();
 
-  // TODO: THis should be a config param
-  let redirect_uri = "http://localhost:3000/api/auth/gamma/callback";
-
   let url = format!("{}/oauth2/token", config.gamma_internal_url);
 
   let body_str = client
@@ -31,7 +28,7 @@ pub async fn oauth2_token(config: &Config, code: &str) -> HubbitResult<GammaToke
       client_id: config.gamma_client_id.clone(),
       client_secret: config.gamma_client_secret.clone(),
       code: code.into(),
-      redirect_uri: redirect_uri.into(),
+      redirect_uri: config.gamma_redirect_uri.clone(),
       grant_type: "authorization_code".into(),
     })
     .header("accept", "application/json")

docker-compose.yml

@@ -20,13 +20,19 @@ services:
       PORT: 8080
       DATABASE_URL: postgres://hubbit:hubbit@hubbit-db/hubbit
       REDIS_URL: redis://hubbit-redis:6379
-      GAMMA_PUBLIC_URL: http://localhost:8081
-      GAMMA_INTERNAL_URL: http://gamma-backend:3000
-      GAMMA_API_KEY: hubbit
-      GAMMA_CLIENT_ID: hubbit
-      GAMMA_CLIENT_SECRET: hubbit
-      COOKIE_SECRET: QkAbEaSuT5UNDthgnScWhQwET7HzHUzFPhrS62xwYUwvtbx2ihmQanSSML2Ky63r
-      COOKIE_SECURE: "false"
+      # GAMMA_PUBLIC_URL: http://localhost:8081
+      GAMMA_PUBLIC_URL: https://auth.chalmers.it
+      # GAMMA_INTERNAL_URL: http://gamma-backend:3000
+      GAMMA_INTERNAL_URL: https://auth.chalmers.it
+      # GAMMA_API_KEY: hubbit
+      # GAMMA_CLIENT_ID: hubbit
+      # GAMMA_CLIENT_SECRET: hubbit
+      GAMMA_API_KEY: 09a772ea-ba92-4ff9-b325-3f734abd9269:fjFwfa8flNtAt2hbCRE9Ca2dT1FWrlkR
+      GAMMA_CLIENT_ID: GKXA9NJALIU4MLTEW2LA8BQA1X4A6X
+      GAMMA_CLIENT_SECRET: dnW2HjRE9stNUdFlOkqCs4Za1eClsfEY
+      GAMMA_REDIRECT_URI: http://localhost:3000/api/auth/gamma/callback
+      COOKIE_SECRET: vVQvsmpCkHLuleJthaEd5KhCC23mnW3W5RGSNGQOru6Y32VBrddDJEMNSXGXiKeqWhTEOAQRlfYtYjbuLMY1N2PuDbOaMzx7UPpt6Ejnm2Rq4C3Wwew8wlLbMHOt14SQ
+      COOKIE_SECURE: true
       RUST_LOG: ${BACKEND_LOG_LEVEL}
       GROUP_WHITELIST: ${GROUP_WHITELIST}
     ports:
@@ -64,45 +70,45 @@ services:
     volumes:
       - /settings
 
-  gamma-frontend:
-    image: cthit/gamma-frontend:development
-    environment:
-      HTTP_PROXY: http://gamma-backend:3000
-    ports:
-      - ${LOCAL_GAMMA_FRONTEND_PORT}:3000
+  # gamma-frontend:
+  #   image: cthit/gamma-frontend:development
+  #   environment:
+  #     HTTP_PROXY: http://gamma-backend:3000
+  #   ports:
+  #     - ${LOCAL_GAMMA_FRONTEND_PORT}:3000
 
-  gamma-backend:
-    image: cthit/gamma-backend
-    environment:
-      # Default admin user name = admin
-      # Default admin password  = password
+  # gamma-backend:
+  #   image: cthit/gamma-backend
+  #   environment:
+  #     # Default admin user name = admin
+  #     # Default admin password  = password
 
-      DB_USER: gamma
-      DB_PASSWORD: gamma
-      DB_HOST: gamma-db
-      DB_PORT: 5432
-      DB_NAME: gamma
+  #     DB_USER: gamma
+  #     DB_PASSWORD: gamma
+  #     DB_HOST: gamma-db
+  #     DB_PORT: 5432
+  #     DB_NAME: gamma
 
-      REDIS_HOST: gamma-redis
-      REDIS_PASSWORD: ""
-      REDIS_PORT: 6379
+  #     REDIS_HOST: gamma-redis
+  #     REDIS_PASSWORD: ""
+  #     REDIS_PORT: 6379
 
-      SERVER_PORT: 3000
-      SUCCESSFUL_LOGIN: http://localhost:${LOCAL_GAMMA_FRONTEND_PORT}
-      CORS_ALLOWED_ORIGIN: http://localhost:${LOCAL_GAMMA_FRONTEND_PORT}
-      BACKEND_URI: http://localhost:${LOCAL_GAMMA_BACKEND_PORT}/api/
-      PRODUCTION: "false"
-      COOKIE_DOMAIN: localhost
-      IS_MOCKING: "true"
-    ports:
-      - ${LOCAL_GAMMA_BACKEND_PORT}:3000
+  #     SERVER_PORT: 3000
+  #     SUCCESSFUL_LOGIN: http://localhost:${LOCAL_GAMMA_FRONTEND_PORT}
+  #     CORS_ALLOWED_ORIGIN: http://localhost:${LOCAL_GAMMA_FRONTEND_PORT}
+  #     BACKEND_URI: http://localhost:${LOCAL_GAMMA_BACKEND_PORT}/api/
+  #     PRODUCTION: "false"
+  #     COOKIE_DOMAIN: localhost
+  #     IS_MOCKING: "true"
+  #   ports:
+  #     - ${LOCAL_GAMMA_BACKEND_PORT}:3000
 
-  gamma-redis:
-    image: redis:5.0
+  # gamma-redis:
+  #   image: redis:5.0
 
-  gamma-db:
-    image: postgres:10
-    environment:
-      POSTGRES_USER: gamma
-      POSTGRES_DB: gamma
-      POSTGRES_PASSWORD: gamma
+  # gamma-db:
+  #   image: postgres:10
+  #   environment:
+  #     POSTGRES_USER: gamma
+  #     POSTGRES_DB: gamma
+  #     POSTGRES_PASSWORD: gamma