login: restrict archived users (fixes #7380) (#7382)

Co-authored-by: dogi <[email protected]>
open-learning-exchange · Dec 27, 2023 · efd5d6c · efd5d6c
1 parent 3698bbf
commit efd5d6c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
  "name": "planet",
  "license": "AGPL-3.0",
- "version": "0.14.0",
+ "version": "0.14.1",
  "myplanet": {
- "latest": "v0.12.37",
+ "latest": "v0.12.41",
  "min": "v0.11.60"
  },
  "scripts": {

diff --git a/src/app/login/login-form.component.ts b/src/app/login/login-form.component.ts
@@ -141,9 +141,21 @@ export class LoginFormComponent {
  { withCredentials: true, domain: this.stateService.configuration.parentDomain });
  }
 
+ checkArchiveStatus(name) {
+ this.couchService.get('_users/org.couchdb.user:' + name).subscribe((userData) => {
+ if (userData?.isArchived) {
+ this.errorHandler($localize`Member ${name} is not registered`)();
+ }
+ });
+ return true;
+ }
+
  login({ name, password }: { name: string, password: string }, isCreate: boolean) {
  const configuration = this.stateService.configuration;
  const userId = `org.couchdb.user:${name}`;
+ if (this.checkArchiveStatus(name)) {
+ return;
+ }
  this.pouchAuthService.login(name, password).pipe(
  switchMap(() => isCreate ? from(this.router.navigate([ 'users/update/' + name ])) : from(this.reRoute())),
  switchMap(() => forkJoin(this.pouchService.replicateFromRemoteDBs())),