diff --git a/src/auth/LoginPage.tsx b/src/auth/LoginPage.tsx index ad71985..8ef1ca5 100644 --- a/src/auth/LoginPage.tsx +++ b/src/auth/LoginPage.tsx @@ -37,7 +37,7 @@ export const LoginPage: FC = () => { usePageTitle("Login"); const { setClient } = useClient(); - const [, login] = useInteractiveLogin(); + const login = useInteractiveLogin(); const homeserver = defaultHomeserver; // TODO: Make this configurable const usernameRef = useRef(); const passwordRef = useRef(); diff --git a/src/auth/useInteractiveLogin.js b/src/auth/useInteractiveLogin.js deleted file mode 100644 index a9fa804..0000000 --- a/src/auth/useInteractiveLogin.js +++ /dev/null @@ -1,58 +0,0 @@ -/* -Copyright 2022 Matrix.org Foundation C.I.C. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -import matrix, { InteractiveAuth } from "matrix-js-sdk/src/browser-index"; -import { useState, useCallback } from "react"; -import { initClient, defaultHomeserver } from "../matrix-utils"; - -export function useInteractiveLogin() { - const [state, setState] = useState({ loading: false }); - - const auth = useCallback(async (homeserver, username, password) => { - const authClient = matrix.createClient(homeserver); - - const interactiveAuth = new InteractiveAuth({ - matrixClient: authClient, - busyChanged(loading) { - setState((prev) => ({ ...prev, loading })); - }, - async doRequest(_auth, _background) { - return authClient.login("m.login.password", { - identifier: { - type: "m.id.user", - user: username, - }, - password, - }); - }, - }); - - const { user_id, access_token, device_id } = - await interactiveAuth.attemptAuth(); - const session = { user_id, access_token, device_id }; - - const client = await initClient({ - baseUrl: defaultHomeserver, - accessToken: access_token, - userId: user_id, - deviceId: device_id, - }); - - return [client, session]; - }, []); - - return [state, auth]; -} diff --git a/src/auth/useInteractiveLogin.ts b/src/auth/useInteractiveLogin.ts new file mode 100644 index 0000000..b4e3ad2 --- /dev/null +++ b/src/auth/useInteractiveLogin.ts @@ -0,0 +1,55 @@ +/* +Copyright 2022 Matrix.org Foundation C.I.C. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +import { useCallback } from "react"; +import matrix, { InteractiveAuth } from "matrix-js-sdk/src/browser-index"; + +import { initClient, defaultHomeserver } from "../matrix-utils"; + +export const useInteractiveLogin = () => + useCallback( + async (homeserver: string, username: string, password: string) => { + const authClient = matrix.createClient(homeserver); + + const interactiveAuth = new InteractiveAuth({ + matrixClient: authClient, + doRequest: () => + authClient.login("m.login.password", { + identifier: { + type: "m.id.user", + user: username, + }, + password, + }), + }); + + /* eslint-disable camelcase */ + const { user_id, access_token, device_id } = + await interactiveAuth.attemptAuth(); + const session = { user_id, access_token, device_id }; + + const client = await initClient({ + baseUrl: defaultHomeserver, + accessToken: access_token, + userId: user_id, + deviceId: device_id, + }); + /* eslint-enable camelcase */ + + return [client, session]; + }, + [] + );