Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: adds azure ad login #85

Merged
merged 3 commits into from
Oct 15, 2021
Merged

feat: adds azure ad login #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
622b657
feat: adds azure ad login
Aug 30, 2021
ce83b1d
fix: linting error
Oct 14, 2021
dff15e4
adds azure logo
ernstluring Oct 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions packages/login-extension/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import github_logo from '../style/img/github-logo.svg';

import google_logo from '../style/img/google-logo.svg';

import azure_logo from '../style/img/azure-logo.svg';

export namespace CommandIDs {
export const plugin = '@quetz-frontend/login-extension:login';
}
Expand All @@ -34,6 +36,14 @@ const plugin: JupyterFrontEndPlugin<void> = {
loggedIn: false,
};

const azuread: LogInItem = {
id: 'azuread',
label: 'AzureAD LogIn',
icon: azure_logo,
api: '/auth/azuread/login',
loggedIn: false,
};

const config_data = document.getElementById('jupyter-config-data');
if (config_data) {
try {
Expand All @@ -44,11 +54,15 @@ const plugin: JupyterFrontEndPlugin<void> = {
if (data.google_login_available) {
logInMenu.addItem(google);
}
if (data.azuread_login_available) {
logInMenu.addItem(azuread);
}
} catch (err) {
console.error(err.message);
// add both if cannot parse data
logInMenu.addItem(gitHub);
logInMenu.addItem(google);
logInMenu.addItem(azuread);
}
}
},
Expand Down
126 changes: 126 additions & 0 deletions packages/login-extension/style/img/azure-logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions quetz_frontend/backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,10 @@ def register(app):
google_login_available = auth_registry.is_registered("google")
github_login_available = auth_registry.is_registered("github")
gitlab_login_available = auth_registry.is_registered("gitlab")
azuread_login_available = auth_registry.is_registered("azuread")

config_data = {
"appName": "Quetz – the fast conda package server!",
"github_login_available": github_login_available,
"google_login_available": google_login_available,
"baseUrl": "/",
"wsUrl": "",
"appUrl": "/jlabmock",
Expand All @@ -251,6 +250,7 @@ def register(app):
"github_login_available": github_login_available,
"gitlab_login_available": gitlab_login_available,
"google_login_available": google_login_available,
"azuread_login_available" : azuread_login_available,
"cacheFiles": False,
"devMode": False,
"mode": "multiple-document",
Expand Down