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.

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

Adding support for X-Dgraph-AuthToken header #248

Merged
merged 1 commit into from Mar 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions client/src/actions/connection.js
Expand Up @@ -31,6 +31,7 @@ export const SET_ACL_ENABLED = "connection/SET_ACL_ENABLED";
export const SET_BACKUP_ENABLED = "connection/SET_BACKUP_ENABLED";
export const SET_QUERY_TIMEOUT = "connection/SET_QUERY_TIMEOUT";
export const SET_SLASH_API_KEY = "connection/SET_SLASH_API_KEY";
export const SET_AUTH_TOKEN = "connection/SET_AUTH_TOKEN";
export const REMOVE_URL = "connection/REMOVE_URL";
export const UPDATE_URL = "connection/UPDATE_URL";
export const UPDATE_ACL_STATE = "connection/UPDATE_ACL_STATE";
Expand Down Expand Up @@ -70,6 +71,14 @@ export function setSlashApiKey(url, slashApiKey) {
};
}

export function setAuthToken(url, authToken) {
return {
type: SET_AUTH_TOKEN,
url,
authToken,
};
}

export function setAclEnabled(url, isAclEnabled) {
return {
type: SET_ACL_ENABLED,
Expand Down
16 changes: 16 additions & 0 deletions client/src/components/ServerConnectionModal.js
Expand Up @@ -153,6 +153,22 @@ export default function ServerConnectionModal() {
}
/>
</Form.Group>
<Form.Group controlId="authToken">
<Form.Label>Auth Token:</Form.Label>
<Form.Control
type="text"
placeholder="Auth Token"
value={activeServer.authToken || ""}
onChange={e =>
dispatch(
actions.setAuthToken(
activeServer.url,
e.target.value,
),
)
}
/>
</Form.Group>
</Tab>
</Tabs>
);
Expand Down
15 changes: 14 additions & 1 deletion client/src/containers/AppProvider.js
Expand Up @@ -22,7 +22,12 @@ import ReduxThunk from "redux-thunk";

import { getAddrParam, getHashParams } from "lib/helpers";
import { runQuery, setResultsTab } from "actions/frames";
import { loginUser, setSlashApiKey, updateUrl } from "actions/connection";
import {
loginUser,
setSlashApiKey,
setAuthToken,
updateUrl
} from "actions/connection";
import {
migrateToServerConnection,
migrateToHaveZeroUrl,
Expand Down Expand Up @@ -119,6 +124,14 @@ export default class AppProvider extends React.Component {
),
);
}
if (hashParams.authToken) {
store.dispatch(
setAuthToken(
hashParams.addr || addrParam,
hashParams.authToken,
),
);
}
if (hashParams.query) {
store.dispatch(updateAction("query"));
store.dispatch(updateQuery(hashParams.query));
Expand Down
4 changes: 4 additions & 0 deletions client/src/lib/helpers.js
Expand Up @@ -111,6 +111,10 @@ export function setCurrentServerSlashApiKey(slashApiKey) {
clientStubOptions.headers["X-Auth-Token"] = slashApiKey;
}

export function setCurrentServerAuthToken(authToken) {
clientStubOptions.headers["X-Dgraph-AuthToken"] = authToken;
}

export const getDgraphClient = async () =>
(await createDgraphClient(dgraphServerUrl)).client;

Expand Down
10 changes: 10 additions & 0 deletions client/src/reducers/connection.js
Expand Up @@ -25,6 +25,7 @@ import {
SET_BACKUP_ENABLED,
SET_QUERY_TIMEOUT,
SET_SLASH_API_KEY,
SET_AUTH_TOKEN,
REMOVE_URL,
UPDATE_URL,
UPDATE_ACL_STATE,
Expand All @@ -41,6 +42,7 @@ import {
getDefaultUrl,
setCurrentServerQueryTimeout,
setCurrentServerSlashApiKey,
setCurrentServerAuthToken,
setCurrentServerUrl,
sanitizeUrl,
} from "lib/helpers";
Expand Down Expand Up @@ -71,6 +73,7 @@ const makeServerRecord = url => ({
aclState: Unknown,
queryTimeout: QUERY_TIMEOUT_DEFAULT,
slashApiKey: null,
accessToken: null,
isAclEnabled: true,
isBackupEnabled: true,

Expand Down Expand Up @@ -189,6 +192,13 @@ export default (state = defaultState, action) =>
setCurrentServerSlashApiKey(activeServer.slashApiKey);
}
break;
case SET_AUTH_TOKEN:
assert(action.url, "This action requires url " + action.type);
activeServer.authToken = action.authToken;
if (action.url === currentServer.url) {
setCurrentServerAuthToken(activeServer.authToken);
}
break;

case DO_LOGOUT:
logoutServer(currentServer);
Expand Down