EDUCATIC
/
digitaldemocratic
mirror of https://gitlab.com/digitaldemocratic/digitaldemocratic
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into 'master' 

Develop to Master

See merge request isard/isard-sso!30
Josep Maria Viñolas Auquer 2021-06-11 10:34:37 +00:00
parent 36562d6ac0 e3fe14efbc
commit fae1558342
4 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/src/admin/lib/admin.py
View File

@ -184,7 +184,7 @@ class Admin():
try: try:
log.warning('KEYCLOAK: Adding user ddadmin and adding to group and role admin') log.warning('KEYCLOAK: Adding user ddadmin and adding to group and role admin')
## Assign group admin to this dduser for nextcloud ## Assign group admin to this dduser for nextcloud
uid=self.keycloak.add_user(dduser,'DD','Admin',ddmail,ddpassword,group='admin') uid=self.keycloak.add_user(dduser,'DD','Admin',ddmail,ddpassword,group='admin',temporary=False)
## Assign role admin to this user for keycloak, moodle and wordpress ## Assign role admin to this user for keycloak, moodle and wordpress
self.keycloak.assign_realm_roles(uid,'admin') self.keycloak.assign_realm_roles(uid,'admin')
log.warning('KEYCLOAK: OK') log.warning('KEYCLOAK: OK')
@ -194,11 +194,11 @@ class Admin():
try: try:
log.warning('KEYCLOAK: Adding default users system_teacher, system_manager and system_student users') log.warning('KEYCLOAK: Adding default users system_teacher, system_manager and system_student users')
uid=self.keycloak.add_user('system_manager','Manager','System','fakemanager@fake.com','m@n@g3r',group='manager') uid=self.keycloak.add_user('system_manager','Manager','System','fakemanager@fake.com','m@n@g3r',group='manager',temporary=False)
self.keycloak.assign_realm_roles(uid,'manager') self.keycloak.assign_realm_roles(uid,'manager')
uid=self.keycloak.add_user('system_teacher','Teacher','System','faketeacher@fake.com','t3@ch3r',group='teacher') uid=self.keycloak.add_user('system_teacher','Teacher','System','faketeacher@fake.com','t3@ch3r',group='teacher',temporary=False)
self.keycloak.assign_realm_roles(uid,'teacher') self.keycloak.assign_realm_roles(uid,'teacher')
uid=self.keycloak.add_user('system_student','Student','System','fakestudent@fake.com','stud3nt',group='student') uid=self.keycloak.add_user('system_student','Student','System','fakestudent@fake.com','stud3nt',group='student',temporary=False)
self.keycloak.assign_realm_roles(uid,'student') self.keycloak.assign_realm_roles(uid,'student')
log.warning('KEYCLOAK: OK') log.warning('KEYCLOAK: OK')
except: except:

12
docker/api/default.conf
View File

@ -13,12 +13,12 @@ server {
add_header Access-Control-Allow-Origin *; add_header Access-Control-Allow-Origin *;
# location /header/json { location /avatar {
# proxy_pass http://127.0.0.1:7039/header/json; proxy_pass http://127.0.0.1:7039/avatar;
# expires max; expires max;
# log_not_found off; log_not_found off;
# access_log off; access_log off;
# } }
location /json { location /json {
alias /api/api/static/templates/header.json; alias /api/api/static/templates/header.json;

28
docker/api/src/api/lib/avatars.py
View File

@ -9,21 +9,33 @@ import logging
import traceback import traceback
import yaml, json import yaml, json
from jinja2 import Environment, FileSystemLoader import os
from keycloak import KeycloakAdmin from keycloak import KeycloakAdmin
class Avatars(): class Avatars():
def __init__(self): def __init__(self,
self.keycloak_admin = KeycloakAdmin(server_url="http://isard-sso-keycloak:8080/auth/", url="http://isard-sso-keycloak:8080/auth/",
username='admin', username=os.environ['KEYCLOAK_USER'],
password='keycloakkeycloak', password=os.environ['KEYCLOAK_PASSWORD'],
realm_name="master", realm='master',
verify=True) verify=True):
self.url=url
self.username=username
self.password=password
self.realm=realm
self.verify=verify
def connect(self):
self.keycloak_admin = KeycloakAdmin(server_url=self.url,
username=self.username,
password=self.password,
realm_name=self.realm,
verify=self.verify)
def get_user_avatar(self,username): def get_user_avatar(self,username):
self.connect()
return self.keycloak_admin.get_user_id(username) return self.keycloak_admin.get_user_id(username)

5
init/keycloak/keycloak.sh
View File

@ -18,3 +18,8 @@
# get-roles --cclientid test-client --rolename operations # get-roles --cclientid test-client --rolename operations
docker exec -ti isard-sso-keycloak sh -c "
/opt/jboss/keycloak/bin/kcadm.sh config credentials --server http://localhost:8080/auth --realm master --user admin --password keycloakkeycloak \
&& /opt/jboss/keycloak/bin/kcadm.sh get clients/bef873f0-2079-4876-8657-067de27d01b7 -r master"""