Skip to content

fix: Suspended users cannot authenticate #1849

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

Merged
merged 18 commits into from
May 31, 2022
Merged

fix: Suspended users cannot authenticate #1849

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8a2b6c2
fix: Suspended users cannot authenticate
Emyrk May 27, 2022
43dece2
Merge remote-tracking branch 'origin/main' into stevenmasley/suspende…
Emyrk May 27, 2022
87f28a2
Add unit test for log into suspended account
Emyrk May 27, 2022
047c234
Formatting
Emyrk May 27, 2022
d2bc5b8
feat: UI Shows suspended error logging into suspended account
Emyrk May 27, 2022
cc9b573
Merge remote-tracking branch 'origin/main' into stevenmasley/suspende…
Emyrk May 27, 2022
8654dd1
cleanup
Emyrk May 27, 2022
489b2fe
fix: Show suspended users in the UI
Emyrk May 27, 2022
15a9b36
Fix column order
Emyrk May 27, 2022
55c5fe6
Currently "activate" on ui does nothing
Emyrk May 27, 2022
c5f33a5
Linting fixes
Emyrk May 27, 2022
f9a47a9
Account for no status filters sent
Emyrk May 27, 2022
71ba332
Linting fix eslint
Emyrk May 27, 2022
54f44d9
Shfmt
Emyrk May 27, 2022
8dbf464
Fix BE error message
Emyrk May 27, 2022
60ac7e4
Add correct error message
Emyrk May 27, 2022
f738fa2
Merge remote-tracking branch 'origin/main' into stevenmasley/suspende…
Emyrk May 27, 2022
df96f3d
change 'active' route to 'activate'
Emyrk May 31, 2022
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
Prev Previous commit
Next Next commit
cleanup
  • Loading branch information
@Emyrk
Emyrk committed May 27, 2022
commit 8654dd164a98a10727426e1f4f1afab62d0bac8d
10 changes: 5 additions & 5 deletions cli/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,16 +648,16 @@ func newProvisionerDaemon(ctx context.Context, coderAPI *coderd.API,
func printLogo(cmd *cobra.Command, spooky bool) {
if spooky {
_, _ = fmt.Fprintf(cmd.OutOrStdout(), `
▄████▄ ▒█████ ▓█████▄ ▓█████ ██▀███
▄████▄ ▒█████ ▓█████▄ ▓█████ ██▀███
▒██▀ ▀█ ▒██▒ ██▒▒██▀ ██▌▓█ ▀ ▓██ ▒ ██▒
▒▓█ ▄ ▒██░ ██▒░██ █▌▒███ ▓██ ░▄█ ▒
▒▓▓▄ ▄██▒▒██ ██░░▓█▄ ▌▒▓█ ▄ ▒██▀▀█▄
▒▓▓▄ ▄██▒▒██ ██░░▓█▄ ▌▒▓█ ▄ ▒██▀▀█▄
▒ ▓███▀ ░░ ████▓▒░░▒████▓ ░▒████▒░██▓ ▒██▒
░ ░▒ ▒ ░░ ▒░▒░▒░ ▒▒▓ ▒ ░░ ▒░ ░░ ▒▓ ░▒▓░
░ ▒ ░ ▒ ▒░ ░ ▒ ▒ ░ ░ ░ ░▒ ░ ▒░
░ ░ ░ ░ ▒ ░ ░ ░ ░ ░░ ░
░ ░ ░ ░ ░ ░ ░ ░
░ ░
░ ░ ░ ░ ▒ ░ ░ ░ ░ ░░ ░
░ ░ ░ ░ ░ ░ ░ ░
░ ░

`)
return
Expand Down
1 change: 0 additions & 1 deletion coderd/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,6 @@ func (api *API) postLogin(rw http.ResponseWriter, r *http.Request) {

// If the user logged into a suspended account, reject the login request.
if user.Status != database.UserStatusActive {

httpapi.Write(rw, http.StatusUnauthorized, httpapi.Response{
Message: "You are suspended, contact an admin to reactivate your account",
})
Expand Down
2 changes: 0 additions & 2 deletions scripts/develop.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ echo '== Without these binaries, workspaces will fail to start!'
# Use static credentials for development
export CODER_DEV_ADMIN_EMAIL=admin@coder.com
export CODER_DEV_ADMIN_PASSWORD=password
export CODER_DEV_MEMBER_EMAIL=member@coder.com
export CODER_DEV_MEMBER_PASSWORD=password

# This is a way to run multiple processes in parallel, and have Ctrl-C work correctly
# to kill both at the same time. For more details, see:
Expand Down
4 changes: 0 additions & 4 deletions site/src/pages/LoginPage/LoginPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ export const LoginPage: React.FC = () => {
const [authState, authSend] = useActor(xServices.authXService)
const isLoading = authState.hasTag("loading")
const redirectTo = retrieveRedirect(location.search)
//{
// "message": "user is not active (status = \"suspended\"), contact an admin to reactivate your account"
// }

const authErrorMessage = isApiError(authState.context.authError) ? authState.context.authError.response.data.message : undefined
const getMethodsError = authState.context.getMethodsError
? (authState.context.getMethodsError as Error).message
Expand Down