Skip to content

Commit d11b893

Browse files
r4victorr4victor
authored
Implement dstack login command and CLI OAuth flow (#3415)
* Add common OAuth schemas * Add /api/auth/list_providers * Make state a struct * Add /api/auth/get_next_redirect * Implement localhost redirect from UI for github * Implement localhost redirect from UI for all providers * Prototype dstack login * Autoconfigure CLI projects * Minor fixes * Use webbrowser.open * Implement provider selection * Refactor server code into _LoginServer * Test dstack login * Add tests * Normalize server url * Minor adjustments * Document dstack login * Document register_provider * Disable control chars for tests
1 parent 237ddd1 commit d11b893

28 files changed

Lines changed: 937 additions & 166 deletions

File tree

‎docs/docs/reference/cli/dstack/login.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# dstack login
2+
3+
This command authorizes the CLI using Single Sign-On and automatically configures your projects.
4+
It provides an alternative to `dstack project add`.
5+
6+
## Usage
7+
8+
<div class="termy">
9+
10+
```shell
11+
$ dstack login --help
12+
#GENERATE#
13+
```
14+
15+
</div>
16+
17+
[//]: # (TODO: Provide examples)

‎frontend/src/App/Login/EntraID/LoginByEntraIDCallback/index.tsx‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { UnauthorizedLayout } from 'layouts/UnauthorizedLayout';
77

88
import { useAppDispatch } from 'hooks';
99
import { ROUTES } from 'routes';
10-
import { useEntraCallbackMutation } from 'services/auth';
10+
import { useEntraCallbackMutation, useGetNextRedirectMutation } from 'services/auth';
1111

1212
import { AuthErrorMessage } from 'App/AuthErrorMessage';
1313
import { getBaseUrl } from 'App/helpers';
@@ -23,15 +23,27 @@ export const LoginByEntraIDCallback: React.FC = () => {
2323
const [isInvalidCode, setIsInvalidCode] = useState(false);
2424
const dispatch = useAppDispatch();
2525

26+
const [getNextRedirect] = useGetNextRedirectMutation();
2627
const [entraCallback] = useEntraCallbackMutation();
2728

2829
const checkCode = () => {
2930
if (code && state) {
30-
entraCallback({ code, state, base_url: getBaseUrl() })
31+
getNextRedirect({ code, state })
3132
.unwrap()
32-
.then(({ creds: { token } }) => {
33-
dispatch(setAuthData({ token }));
34-
navigate('/');
33+
.then(({ redirect_url }) => {
34+
if (redirect_url) {
35+
window.location.href = redirect_url;
36+
return;
37+
}
38+
entraCallback({ code, state, base_url: getBaseUrl() })
39+
.unwrap()
40+
.then(({ creds: { token } }) => {
41+
dispatch(setAuthData({ token }));
42+
navigate('/');
43+
})
44+
.catch(() => {
45+
setIsInvalidCode(true);
46+
});
3547
})
3648
.catch(() => {
3749
setIsInvalidCode(true);

‎frontend/src/App/Login/LoginByGithubCallback/index.tsx‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { UnauthorizedLayout } from 'layouts/UnauthorizedLayout';
77

88
import { useAppDispatch } from 'hooks';
99
import { ROUTES } from 'routes';
10-
import { useGithubCallbackMutation } from 'services/auth';
10+
import { useGetNextRedirectMutation, useGithubCallbackMutation } from 'services/auth';
1111
import { useLazyGetProjectsQuery } from 'services/project';
1212

1313
import { AuthErrorMessage } from 'App/AuthErrorMessage';
@@ -23,26 +23,35 @@ export const LoginByGithubCallback: React.FC = () => {
2323
const [isInvalidCode, setIsInvalidCode] = useState(false);
2424
const dispatch = useAppDispatch();
2525

26+
const [getNextRedirect] = useGetNextRedirectMutation();
2627
const [githubCallback] = useGithubCallbackMutation();
2728
const [getProjects] = useLazyGetProjectsQuery();
2829

2930
const checkCode = () => {
3031
if (code && state) {
31-
githubCallback({ code, state })
32+
getNextRedirect({ code: code, state: state })
3233
.unwrap()
33-
.then(async ({ creds: { token } }) => {
34-
dispatch(setAuthData({ token }));
35-
36-
if (process.env.UI_VERSION === 'sky') {
37-
const result = await getProjects().unwrap();
38-
39-
if (result?.length === 0) {
40-
navigate(ROUTES.PROJECT.ADD);
41-
return;
42-
}
34+
.then(async ({ redirect_url }) => {
35+
if (redirect_url) {
36+
window.location.href = redirect_url;
37+
return;
4338
}
44-
45-
navigate('/');
39+
githubCallback({ code, state })
40+
.unwrap()
41+
.then(async ({ creds: { token } }) => {
42+
dispatch(setAuthData({ token }));
43+
if (process.env.UI_VERSION === 'sky') {
44+
const result = await getProjects().unwrap();
45+
if (result?.length === 0) {
46+
navigate(ROUTES.PROJECT.ADD);
47+
return;
48+
}
49+
}
50+
navigate('/');
51+
})
52+
.catch(() => {
53+
setIsInvalidCode(true);
54+
});
4655
})
4756
.catch(() => {
4857
setIsInvalidCode(true);

‎frontend/src/App/Login/LoginByGoogleCallback/index.tsx‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { UnauthorizedLayout } from 'layouts/UnauthorizedLayout';
77

88
import { useAppDispatch } from 'hooks';
99
import { ROUTES } from 'routes';
10-
import { useGoogleCallbackMutation } from 'services/auth';
10+
import { useGetNextRedirectMutation, useGoogleCallbackMutation } from 'services/auth';
1111

1212
import { AuthErrorMessage } from 'App/AuthErrorMessage';
1313
import { Loading } from 'App/Loading';
@@ -22,15 +22,27 @@ export const LoginByGoogleCallback: React.FC = () => {
2222
const [isInvalidCode, setIsInvalidCode] = useState(false);
2323
const dispatch = useAppDispatch();
2424

25+
const [getNextRedirect] = useGetNextRedirectMutation();
2526
const [googleCallback] = useGoogleCallbackMutation();
2627

2728
const checkCode = () => {
2829
if (code && state) {
29-
googleCallback({ code, state })
30+
getNextRedirect({ code, state })
3031
.unwrap()
31-
.then(({ creds: { token } }) => {
32-
dispatch(setAuthData({ token }));
33-
navigate('/');
32+
.then(({ redirect_url }) => {
33+
if (redirect_url) {
34+
window.location.href = redirect_url;
35+
return;
36+
}
37+
googleCallback({ code, state })
38+
.unwrap()
39+
.then(({ creds: { token } }) => {
40+
dispatch(setAuthData({ token }));
41+
navigate('/');
42+
})
43+
.catch(() => {
44+
setIsInvalidCode(true);
45+
});
3446
})
3547
.catch(() => {
3648
setIsInvalidCode(true);

‎frontend/src/App/Login/LoginByOktaCallback/index.tsx‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { UnauthorizedLayout } from 'layouts/UnauthorizedLayout';
77

88
import { useAppDispatch } from 'hooks';
99
import { ROUTES } from 'routes';
10-
import { useOktaCallbackMutation } from 'services/auth';
10+
import { useGetNextRedirectMutation, useOktaCallbackMutation } from 'services/auth';
1111

1212
import { AuthErrorMessage } from 'App/AuthErrorMessage';
1313
import { Loading } from 'App/Loading';
@@ -22,15 +22,27 @@ export const LoginByOktaCallback: React.FC = () => {
2222
const [isInvalidCode, setIsInvalidCode] = useState(false);
2323
const dispatch = useAppDispatch();
2424

25+
const [getNextRedirect] = useGetNextRedirectMutation();
2526
const [oktaCallback] = useOktaCallbackMutation();
2627

2728
const checkCode = () => {
2829
if (code && state) {
29-
oktaCallback({ code, state })
30+
getNextRedirect({ code, state })
3031
.unwrap()
31-
.then(({ creds: { token } }) => {
32-
dispatch(setAuthData({ token }));
33-
navigate('/');
32+
.then(({ redirect_url }) => {
33+
if (redirect_url) {
34+
window.location.href = redirect_url;
35+
return;
36+
}
37+
oktaCallback({ code, state })
38+
.unwrap()
39+
.then(({ creds: { token } }) => {
40+
dispatch(setAuthData({ token }));
41+
navigate('/');
42+
})
43+
.catch(() => {
44+
setIsInvalidCode(true);
45+
});
3446
})
3547
.catch(() => {
3648
setIsInvalidCode(true);

‎frontend/src/api.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ export const API = {
55

66
AUTH: {
77
BASE: () => `${API.BASE()}/auth`,
8+
NEXT_REDIRECT: () => `${API.AUTH.BASE()}/get_next_redirect`,
89
GITHUB: {
910
BASE: () => `${API.AUTH.BASE()}/github`,
1011
AUTHORIZE: () => `${API.AUTH.GITHUB.BASE()}/authorize`,

‎frontend/src/services/auth.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ export const authApi = createApi({
1212
tagTypes: ['Auth'],
1313

1414
endpoints: (builder) => ({
15+
getNextRedirect: builder.mutation<{ redirect_url?: string }, { code: string; state: string }>({
16+
query: (body) => ({
17+
url: API.AUTH.NEXT_REDIRECT(),
18+
method: 'POST',
19+
body,
20+
}),
21+
}),
22+
1523
githubAuthorize: builder.mutation<{ authorization_url: string }, void>({
1624
query: () => ({
1725
url: API.AUTH.GITHUB.AUTHORIZE(),
@@ -103,6 +111,7 @@ export const authApi = createApi({
103111
});
104112

105113
export const {
114+
useGetNextRedirectMutation,
106115
useGithubAuthorizeMutation,
107116
useGithubCallbackMutation,
108117
useGetOktaInfoQuery,

0 commit comments

Comments
 (0)