fix: Redirect to workspaces after selecting org_id in local

juspay · Jan 2, 2025 · c885e1c · c885e1c
1 parent 80acad9
commit c885e1c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/.env.example b/.env.example
@@ -24,9 +24,10 @@ TENANT_MIDDLEWARE_EXCLUSION_LIST="/health,/assets/favicon.ico,/pkg/frontend.js,/
 SERVICE_PREFIX=""
 SERVICE_NAME="CAC"
 AUTH_PROVIDER=DISABLED
-## AUTH_PROVIDER=OIDC+http://localhost:8081/realms/users
-OIDC_CLIENT_ID=superposition
-OIDC_CLIENT_SECRET=superposition_secret
-OIDC_TOKEN_ENDPOINT_FORMAT="http://localhost:8081/realms/<organisation>/protocol/openid-connect/token"
-OIDC_ISSUER_ENDPOINT_FORMAT="http://http://localhost:8081/realms/<organisation>"
+LOCAL_ORGS=superposition
+# AUTH_PROVIDER=OIDC+http://localhost:8081/realms/users
+# OIDC_CLIENT_ID=superposition
+# OIDC_CLIENT_SECRET=superposition_secret
+# OIDC_TOKEN_ENDPOINT_FORMAT="http://localhost:8081/realms/<organisation>/protocol/openid-connect/token"
+# OIDC_ISSUER_ENDPOINT_FORMAT="http://http://localhost:8081/realms/<organisation>"
 WORKER_ID=1
diff --git a/crates/superposition/src/auth.rs b/crates/superposition/src/auth.rs
@@ -104,7 +104,13 @@ impl AuthHandler {
         let mut auth = auth_provider.split('+');
 
         let ap: Arc<dyn Authenticator> = match auth.next() {
-            Some("DISABLED") => Arc::new(DisabledAuthenticator),
+            Some("DISABLED") => Arc::new(DisabledAuthenticator::new(
+                get_from_env_unsafe::<String>("LOCAL_ORGS")
+                    .unwrap()
+                    .split(",")
+                    .map(String::from)
+                    .collect(),
+            )),
             Some("OIDC") => {
                 let url = Url::parse(auth.next().unwrap())
                     .map_err(|e| e.to_string())

diff --git a/crates/superposition/src/auth/no_auth.rs b/crates/superposition/src/auth/no_auth.rs
@@ -9,7 +9,13 @@ use superposition_types::User;
 
 use super::authenticator::{Authenticator, SwitchOrgParams};
 
-pub struct DisabledAuthenticator;
+pub struct DisabledAuthenticator(Vec<String>);
+
+impl DisabledAuthenticator {
+    pub fn new(organisations: Vec<String>) -> Self {
+        Self(organisations)
+    }
+}
 
 impl Authenticator for DisabledAuthenticator {
     fn authenticate(&self, _: &ServiceRequest) -> Result<User, actix_web::HttpResponse> {
@@ -21,24 +27,26 @@ impl Authenticator for DisabledAuthenticator {
     }
 
     fn get_organisations(&self, _: &actix_web::HttpRequest) -> HttpResponse {
-        HttpResponse::Ok().json(serde_json::json!(vec!["superposition"]))
+        HttpResponse::Ok().json(serde_json::json!(self.0))
     }
 
     fn switch_organisation(
         &self,
         _: &HttpRequest,
-        _: &Path<SwitchOrgParams>,
+        path: &Path<SwitchOrgParams>,
     ) -> LocalBoxFuture<'static, actix_web::Result<HttpResponse>> {
         let cookie = Cookie::build("org_user", "org_token")
             .path("/")
             .http_only(true)
             .max_age(Duration::days(1))
             .finish();
 
+        let org_id = path.organisation_id.clone();
+
         Box::pin(async move {
             Ok(HttpResponse::Found()
                 .cookie(cookie)
-                .insert_header(("Location", "/"))
+                .insert_header(("Location", format!("/admin/{org_id}/workspaces")))
                 .finish())
         })
     }