Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Updates to get basic identity provider running again

Rich Turnercd3bfe2a71b9
diff --git a/container/src/main/resources/org/openremote/container/persistence/schema/basicidentityprovider/V20191202_00__BasicIdentityProvider.sql b/container/src/main/resources/org/openremote/container/persistence/schema/basicidentityprovider/V20191202_00__BasicIdentityProvider.sql
index e03a9e267..47fc83670 100644
--- a/container/src/main/resources/org/openremote/container/persistence/schema/basicidentityprovider/V20191202_00__BasicIdentityProvider.sql
+++ b/container/src/main/resources/org/openremote/container/persistence/schema/basicidentityprovider/V20191202_00__BasicIdentityProvider.sql
@@ -1,10 +1,30 @@
create table PUBLIC.REALM (
- ID varchar(36) not null primary key,
- NAME varchar(255) unique not null,
- ENABLED boolean default false not null,
+ ID varchar(36) not null primary key,
+ NAME varchar(255) unique not null,
+ ENABLED boolean default false not null,
+ RESET_PASSWORD_ALLOWED boolean default true not null,
+ DUPLICATE_EMAILS_ALLOWED boolean default false not null,
+ REMEMBER_ME boolean default false not null,
+ REGISTRATION_ALLOWED boolean default false not null,
+ REG_EMAIL_AS_USERNAME boolean default false not null,
+ VERIFY_EMAIL boolean default false not null,
+ LOGIN_WITH_EMAIL_ALLOWED boolean default false not null,
+ LOGIN_THEME varchar(255) default null,
+ ACCOUNT_THEME varchar(255) default null,
+ ADMIN_THEME varchar(255) default null,
+ EMAIL_THEME varchar(255) default null,
+ ACCESS_TOKEN_LIFESPAN integer default null,
NOT_BEFORE integer
);
+create table PUBLIC.KEYCLOAK_ROLE (
+ ID varchar(36) not null primary key,
+ REALM_ID varchar(36) not null references PUBLIC.REALM,
+ CLIENT varchar(255) default null,
+ NAME varchar(255) not null,
+ DESCRIPTION varchar(255) default null
+);
+
create table PUBLIC.REALM_ATTRIBUTE (
NAME varchar(255) not null,
VALUE varchar(255),
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
index 9518e84e1..eeaa4d3d9 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
@@ -112,7 +112,7 @@ public class ManagerBasicIdentityProvider extends BasicIdentityProvider implemen
persistenceService.doTransaction(em -> em.unwrap(Session.class).doWork(connection -> {
String sql = "insert into PUBLIC.USER_ENTITY(ID, REALM_ID, USERNAME, PASSWORD, FIRST_NAME, LAST_NAME, EMAIL, ENABLED) values (?, ?, ?, ?, ?, ?, ?, ?)" +
"ON CONFLICT (ID) DO UPDATE " +
- "SET username = excluded.username, password = excluded.pasword, first_name = excluded.first_name, last_name = excluded.last_name, email = excluded.email, enabled = excluded.enabled";
+ "SET username = excluded.username, password = excluded.password, first_name = excluded.first_name, last_name = excluded.last_name, email = excluded.email, enabled = excluded.enabled";
try (PreparedStatement st = connection.prepareStatement(sql)) {
st.setString(1, UUID.randomUUID().toString());
st.setString(2, MASTER_REALM); // For master REALM NAME and ID are the same