Skip to content

Commit 32da681

Browse files
committed
add a few try catch'es
1 parent 1ca153c commit 32da681

1 file changed

Lines changed: 25 additions & 15 deletions

File tree

OpenFlow/src/LoginProvider.ts

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ export class LoginProvider {
129129
res.end(JSON.stringify({ jwt: Crypt.createToken(tuser) }));
130130
} catch (error) {
131131
res.end(error);
132+
console.error(error);
132133
}
133134
});
134135
app.get("/config", (req: any, res: any, next: any): void => {
@@ -149,22 +150,30 @@ export class LoginProvider {
149150
res.end(JSON.stringify(res2));
150151
});
151152
app.get("/loginproviders", async (req: any, res: any, next: any): Promise<void> => {
152-
LoginProvider.login_providers = await Config.db.query<Provider>({ _type: "provider" }, null, 10, 0, null, "config", TokenUser.rootToken());
153-
var result: any[] = [];
154-
LoginProvider.login_providers.forEach(provider => {
155-
var item: any = { name: provider.name, id: provider.id, provider: provider.provider, logo: "fa-question-circle" };
156-
if (provider.provider === "google") { item.logo = "fa-google"; }
157-
if (provider.provider === "saml") { item.logo = "fa-windows"; }
158-
result.push(item);
159-
});
160-
if (result.length === 0) {
161-
var item: any = { name: "Local", id: "local", provider: "local", logo: "fa-question-circle" };
162-
result.push(item);
153+
try {
154+
LoginProvider.login_providers = await Config.db.query<Provider>({ _type: "provider" }, null, 10, 0, null, "config", TokenUser.rootToken());
155+
var result: any[] = [];
156+
LoginProvider.login_providers.forEach(provider => {
157+
var item: any = { name: provider.name, id: provider.id, provider: provider.provider, logo: "fa-question-circle" };
158+
if (provider.provider === "google") { item.logo = "fa-google"; }
159+
if (provider.provider === "saml") { item.logo = "fa-windows"; }
160+
result.push(item);
161+
});
162+
if (result.length === 0) {
163+
var item: any = { name: "Local", id: "local", provider: "local", logo: "fa-question-circle" };
164+
result.push(item);
165+
}
166+
res.setHeader("Content-Type", "application/json");
167+
res.end(JSON.stringify(result));
168+
res.end();
169+
} catch (error) {
170+
res.end(error);
171+
console.error(error);
172+
}
173+
try {
174+
LoginProvider.RegisterProviders(app, baseurl);
175+
} catch (error) {
163176
}
164-
res.setHeader("Content-Type", "application/json");
165-
res.end(JSON.stringify(result));
166-
res.end();
167-
LoginProvider.RegisterProviders(app, baseurl);
168177
});
169178
}
170179
static async RegisterProviders(app: express.Express, baseurl: string) {
@@ -294,6 +303,7 @@ export class LoginProvider {
294303
return done(null, tuser);
295304
} catch (error) {
296305
done(error);
306+
console.error(error);
297307
}
298308
});
299309
passport.use("local", strategy);

0 commit comments

Comments
 (0)