ashpie/rainbox.email
ashpie/rainbox.email
1
0
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Alice Gaudon 2020-07-29 16:21:31 +02:00
commit 6dbd9079fb
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "aldap", "name": "aldap",
"version": "1.0.0", "version": "1.0.1",
"description": "Authentication LDAP server", "description": "Authentication LDAP server",
"repository": "git@gitlab.com:ArisuOngaku/aldap.git", "repository": "git@gitlab.com:ArisuOngaku/aldap.git",
"author": "Alice Gaudon <alice@gaudon.pro>", "author": "Alice Gaudon <alice@gaudon.pro>",

6
src/models/UserPasswordComponent.ts
View File

@ -75,7 +75,11 @@ export class PasswordAuthProof implements AuthProof<User> {
} }
public async isValid(): Promise<boolean> { public async isValid(): Promise<boolean> {
return await this.isAuthorized() || typeof this.userID === 'number'; if (typeof this.userID === 'number') {
return Boolean(await this.getResource());
} else {
return await this.isAuthorized();
}
} }
public async revoke(): Promise<void> { public async revoke(): Promise<void> {

2
views/account.njk
View File

@ -110,7 +110,7 @@
</tr> </tr>
{% else %} {% else %}
<tr> <tr>
<td colspan="3"><i data-feather="shield-off"></i> No recovery email address.</td> <td colspan="3">No identity (yet).</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>

6
yarn.lock
View File

@ -9886,9 +9886,9 @@ widest-line@^3.1.0:
string-width "^4.0.0" string-width "^4.0.0"
wms-core@^0: wms-core@^0:
version "0.20.0" version "0.20.1"
resolved "https://registry.toot.party/wms-core/-/wms-core-0.20.0.tgz#679c0a1076a96d4a03cc4eeafba900e6a5a9b30f" resolved "https://registry.toot.party/wms-core/-/wms-core-0.20.1.tgz#c63a1b6b5cd4669e97fa0b651cd5fa6496f6305c"
integrity sha512-UplsZCR4Dm85Qy22JbDPBkOhp+nUN8KYtbpMipqmo/F9t3M+qtLNGktoy/at0dBc6vR+/8WCuR1aRBeuMINR5A== integrity sha512-JZkrLgxoPBSOf8P5KB9Fc5IoEoWyw6qMoSukpCIi14iue/rm/rW5M9D0Y3dy6tio3w7ZRsrcQdYbIkXW228lzQ==
dependencies: dependencies:
argon2 "^0.26.2" argon2 "^0.26.2"
compression "^1.7.4" compression "^1.7.4"