fix: oauth should be independent from allowPasswordAuth [#349]

ytsaurus · Feb 9, 2024 · 8af0d99 · 8af0d99
1 parent 04046cc
commit 8af0d99
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/packages/ui/src/server/index.ts b/packages/ui/src/server/index.ts
@@ -21,14 +21,23 @@ nodekit.ctx.log('AppConfig details', {
     appDevMode,
 });
 
-const {allowPasswordAuth} = nodekit.config;
+const {allowPasswordAuth, ytOAuthSettings} = nodekit.config;
+
+const middlewares = [...(nodekit.config.appBeforeAuthMiddleware || [])];
 
 if (allowPasswordAuth) {
     nodekit.config.appBeforeAuthMiddleware = [
-        ...(nodekit.config.appBeforeAuthMiddleware || []),
-        authorizationResolver(createOAuthAuthorizationResolver()),
+        ...middlewares,
         authorizationResolver(createYTAuthorizationResolver()),
     ];
+} else if (ytOAuthSettings) {
+    nodekit.config.appBeforeAuthMiddleware = [
+        ...middlewares,
+        authorizationResolver(createOAuthAuthorizationResolver()),
+    ];
+}
+
+if (allowPasswordAuth || ytOAuthSettings) {
     nodekit.config.appAuthHandler = createAuthMiddleware();
 }