Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-jams
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-jams
Commits
11ca2fae
Commit
11ca2fae
authored
4 years ago
by
William Enright
Committed by
Adrien Béraud
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Restored user revocation
Change-Id: I1b2272b6c2312c3ec109304e8c706320940e7f77
parent
e820cf72
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/user/UserServlet.java
+9
-1
9 additions, 1 deletion
.../jami/jams/server/servlets/api/auth/user/UserServlet.java
jams-server/src/main/resources/webapp/js/api.js
+3
-0
3 additions, 0 deletions
jams-server/src/main/resources/webapp/js/api.js
with
12 additions
and
1 deletion
jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/user/UserServlet.java
+
9
−
1
View file @
11ca2fae
...
...
@@ -35,8 +35,10 @@ import net.jami.jams.common.dao.StatementList;
import
net.jami.jams.common.objects.user.AccessLevel
;
import
net.jami.jams.common.objects.user.User
;
import
net.jami.jams.common.utils.PasswordGenerator
;
import
org.bouncycastle.openssl.PEMWriter
;
import
java.io.IOException
;
import
java.io.StringWriter
;
import
static
net
.
jami
.
jams
.
server
.
Server
.
certificateAuthority
;
import
static
net
.
jami
.
jams
.
server
.
Server
.
dataStore
;
...
...
@@ -45,7 +47,7 @@ import static net.jami.jams.server.Server.nameServer;
@WebServlet
(
"/api/auth/user"
)
public
class
UserServlet
extends
HttpServlet
{
//User can "read" hi
s own profile
.
//User can "read" hi
mself
.
/**
* @apiVersion 1.0.0
* @api {get} /api/auth/user Get JAMS user info
...
...
@@ -94,6 +96,12 @@ public class UserServlet extends HttpServlet {
resp
.
setHeader
(
"needspasswordreset"
,
(
user
.
getNeedsPasswordReset
()).
toString
());
resp
.
setHeader
(
"password"
,
password
);
if
(
certificateAuthority
.
getLatestCRL
().
get
()
.
getRevokedCertificate
(
user
.
getCertificate
().
getSerialNumber
())
==
null
)
resp
.
setHeader
(
"revoked"
,
"false"
);
else
resp
.
setHeader
(
"revoked"
,
"true"
);
}
//The user can update 3 fields: password,privatekey,publickey
...
...
This diff is collapsed.
Click to expand it.
jams-server/src/main/resources/webapp/js/api.js
+
3
−
0
View file @
11ca2fae
...
...
@@ -46,10 +46,13 @@ var api_path_get_directories = '/api/auth/directories';
var
api_path_get_needs_update
=
'
/api/admin/update
'
;
var
api_path_get_start_update
=
'
/api/admin/update
'
;
var
api_path_post_create_user
=
'
/api/admin/user
'
;
var
api_path_get_user
=
'
/api/auth/user
'
;
var
api_path_post_update_user
=
'
/api/auth/user
'
;
var
api_path_get_exists_user
=
'
/api/admin/user
'
;
var
api_path_get_user_directory_search
=
'
/api/auth/directory/search
'
;
var
api_path_post_create_user_profile
=
'
/api/admin/directory/entry
'
;
var
api_path_put_update_user_profile
=
'
/api/admin/directory/entry
'
;
var
api_path_get_user_search
=
'
/api/admin/users
'
;
function
ajaxApiCall
(
api_path
,
request_type
,
data
,
credentials
,
callBackFunction
,
async
)
{
// build AJAX call
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment