8000 Fix adding social link in mongo. Fixed export/import of federationProvid... by mposolda · Pull Request #603 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

Fix adding social link in mongo. Fixed export/import of federationProvid... #603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mposolda merged 1 commit into from
Aug 7, 2014
Merged

Fix adding social link in mongo. Fixed export/import of federationProvid... #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...rt-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ExportUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public static RealmRepresentation exportRealm(KeycloakSession session, RealmMode
List<OAuthClientRepresentation> oauthClientReps = new ArrayList<OAuthClientRepresentation>();
for (OAuthClientModel oauthClient : oauthClients) {
OAuthClientRepresentation clientRep = ModelToRepresentation.toRepresentation(oauthClient);
clientRep.setSecret(oauthClient.getSecret());
oauthClientReps.add(clientRep);
}
rep.setOauthClients(oauthClientReps);
Expand Down
2 changes: 1 addition & 1 deletion ...rt-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ImportUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public static void importUsersFromStream(KeycloakSession session, String realmNa
parser.nextToken();
String currRealmName = parser.getText();
if (!currRealmName.equals(realmName)) {
throw new IllegalStateException("Trying to import users into invalid realm. Realm name: " + realmName + ", Expected realm name: " + realmName);
throw new IllegalStateException("Trying to import users into invalid realm. Realm name: " + realmName + ", Expected realm name: " + currRealmName);
}
} else if ("users".equals(parser.getText())) {
parser.nextToken();
Expand Down
5 changes: 1 addition & 4 deletions ...port/export-import-dir/src/main/java/org/keycloak/exportimport/dir/DirImportProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
import java.io.FilenameFilter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;

import org.jboss.logging.Logger;
Expand Down Expand Up @@ -86,7 +83,7 @@ public void importRealm(KeycloakSessionFactory factory, final String realmName,

@Override
public boolean accept(File dir, String name) {
return (name.startsWith(realmName)) && (name.endsWith(".json")) && (name.substring(realmName.length()).contains("-users-") );
return name.matches(realmName + "-users-[0-9]+\\.json");
}
});

Expand Down
2 changes: 1 addition & 1 deletion ...port/export-import-zip/src/main/java/org/keycloak/exportimport/zip/ZipImportProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public void run(KeycloakSession session) throws IOException {
// Import users
for (ExtZipEntry entry : this.decrypter.getEntryList()) {
String name = entry.getName();
if ( (name.startsWith(realmName)) && (name.endsWith(".json")) && (name.substring(realmName.length()).contains("-users-")) ) {
if (name.matches(realmName + "-users-[0-9]+\\.json")) {
bos = new ByteArrayOutputStream();
this.decrypter.extractEntry(entry, bos, this.password);
final ByteArrayInputStream bis2 = new ByteArrayInputStream(bos.toByteArray());
Expand Down
5 changes: 1 addition & 4 deletions model/api/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,7 @@ public static RealmRepresentation toRepresentation(RealmModel realm) {
if (fedProviderModels.size() > 0) {
List<UserFederationProviderRepresentation> fedProviderReps = new ArrayList<UserFederationProviderRepresentation>();
for (UserFederationProviderModel model : fedProviderModels) {
UserFederationProviderRepresentation fedProvRep = new UserFederationProviderRepresentation();
fedProvRep.setId(model.getId());
fedProvRep.setProviderName(model.getProviderName());
fedProvRep.setConfig(model.getConfig());
UserFederationProviderRepresentation fedProvRep = toRepresentation(model);
fedProviderReps.add(fedProvRep);
}
rep.setUserFederationProviders(fedProviderReps);
Expand Down
1 change: 1 addition & 0 deletions model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MongoUserProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ public boolean removeUser(RealmModel realm, UserModel user) {

@Override
public void addSocialLink(RealmModel realm, UserModel user, SocialLinkModel socialLink) {
user = getUserById(user.getId(), realm);
MongoUserEntity userEntity = ((UserAdapter) user).getUser();
SocialLinkEntity socialLinkEntity = new So 10BC8 cialLinkEntity();
socialLinkEntity.setSocialProvider(socialLink.getSocialProvider());
Expand Down
32 changes: 24 additions & 8 deletions ...suite/integration/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package org.keycloak.testsuite.exportimport;

import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
Expand All @@ -26,10 +28,14 @@
import org.keycloak.models.RealmModel;
import org.keycloak.models.RealmProvider;
import org.keycloak.models.UserCredentialModel;
import org.keycloak.models.UserFederationProviderModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.UserProvider;
import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.testsuite.model.AbstractModelTest;
import org.keycloak.testsuite.model.ImportTest;
import org.keycloak.testsuite.rule.KeycloakRule;

/**
Expand Down Expand Up @@ -92,13 +98,21 @@ protected void after() {

@Override
public void config(RealmManager manager, RealmModel adminstrationRealm, RealmModel appRealm) {
// Create some users in "test" and "master" realms
addUser(manager.getSession().users(), appRealm, "user1", "password");
addUser(manager.getSession().users(), appRealm, "user2", "password");
addUser(manager.getSession().users(), appRealm, "user3", "password");
addUser(manager.getSession().users(), adminstrationRealm, "admin2", "admin2");
}


// Import "test-realm" realm
try {
RealmRepresentation rep = AbstractModelTest.loadJson("model/testrealm.json");
RealmModel demoRealm = manager.createRealm("test-realm", rep.getRealm());
manager.importRealm(rep, demoRealm);
} catch (IOException ioe) {
throw new RuntimeException(ioe);
}
}

}) {
@Override
Expand Down Expand Up @@ -137,8 +151,8 @@ public void testDirFullExportImport() throws Throwable {

testFullExportImport();

// There should be 4 files in target directory (2 realm, 2 user)
Assert.assertEquals(4, new File(targetDirPath).listFiles().length);
// There should be 6 files in target directory (3 realm, 3 user)
Assert.assertEquals(6, new File(targetDirPath).listFiles().length);
}

@Test
Expand Down Expand Up @@ -210,7 +224,7 @@ private void testFullExportImport() {
RealmProvider realmProvider = session.realms();
UserProvider userProvider = session.users();
new RealmManager(session).removeRealm(realmProvider.getRealmByName("test"));
Assert.assertEquals(1, realmProvider.getRealms().size());
Assert.assertEquals(2, realmProvider.getRealms().size());

RealmModel master = realmProvider.getRealmByName(Config.getAdminRealm());
UserModel admin2 = session.users().getUserByUsername("admin2", master);
Expand All @@ -235,14 +249,16 @@ private void testFullExportImport() {
try {
RealmProvider model = session.realms();
UserProvider userProvider = session.users();
Assert.assertEquals(2, model.getRealms().size());
Assert.assertEquals(3, model.getRealms().size());

assertAuthenticated(userProvider, model, Config.getAdminRealm(), "admin2", "admin2");
assertAuthenticated(userProvider, model, "test", "test-user@localhost", "password");
assertAuthenticated(userProvider, model, "test", "user1", "password");
assertAuthenticated(userProvider, model, "test", "user2", "password");
assertAuthenticated(userProvider, model, "test", "user3", "password");

RealmModel testRealmRealm = model.getRealm("test-realm");
ImportTest.assertDataImportedInRealm(session, testRealmRealm);
} finally {
keycloakRule.stopSession(session, true);
}
Expand All @@ -261,7 +277,7 @@ private void testRealmExportImport() {
RealmProvider realmProvider = session.realms();
UserProvider userProvider = session.users();
new RealmManager(session).removeRealm(realmProvider.getRealmByName("test"));
Assert.assertEquals(1, realmProvider.getRealms().size());
Assert.assertEquals(2, realmProvider.getRealms().size());

RealmModel master = realmProvider.getRealmByName(Config.getAdminRealm());
UserModel admin2 = session.users().getUserByUsername("admin2", master);
Expand All @@ -287,7 +303,7 @@ private void testRealmExportImport() {
try {
RealmProvider realmProvider = session.realms();
UserProvider userProvider = session.users();
Assert.assertEquals(2, realmProvider.getRealms().size());
Assert.assertEquals(3, realmProvider.getRealms().size());

assertNotAuthenticated(userProvider, realmProvider, Config.getAdminRealm(), "admin2", "admin2");
assertAuthenticated(userProvider, realmProvider, "test", "test-user@localhost", "password");
Expand Down
1 change: 1 addition & 0 deletions testsuite/integration/src/test/java/org/keycloak/testsuite/model/ImportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ public static void assertDataImportedInRealm(KeycloakSession session, RealmModel
Assert.assertTrue(session.users().removeSocialLink(realm, socialUser, "facebook"));
Assert.assertNull(session.users().getSocialLink(socialUser, "facebook", realm));
Assert.assertFalse(session.users().removeSocialLink(realm, socialUser, "facebook"));
session.users().addSocialLink(realm, socialUser, new SocialLinkModel("facebook", "facebook1", "fbuser1"));

// Test smtp config
Map<String, String> smtpConfig = realm.getSmtpConfig();
Expand Down
0