keycloak-memoizeit
Changes
examples/demo-template/angular2-product-app/src/main/frontend/src/app/app.component.html 67(+20 -47)
examples/demo-template/angular2-product-app/src/main/frontend/src/app/app.component.spec.ts 66(+66 -0)
examples/demo-template/angular2-product-app/src/main/frontend/src/app/keycloak/keycloak.http.spec.ts 47(+47 -0)
examples/demo-template/angular2-product-app/src/main/frontend/src/app/keycloak/keycloak.http.ts 42(+42 -0)
examples/demo-template/angular2-product-app/src/main/frontend/src/app/keycloak/keycloak.service.ts 42(+27 -15)
examples/demo-template/angular2-product-app/src/main/frontend/src/environments/environment.prod.ts 5(+5 -0)
examples/demo-template/angular2-product-app/src/main/frontend/src/environments/environment.ts 10(+10 -0)
examples/demo-template/angular2-product-app/src/main/frontend/src/environments/environment.war.ts 5(+5 -0)
testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java 2(+1 -1)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountTest.java 2(+1 -1)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ProfileTest.java 66(+56 -10)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/AbstractJSConsoleExampleAdapterTest.java 6(+3 -3)
Details
diff --git a/examples/demo-template/angular2-product-app/pom.xml b/examples/demo-template/angular2-product-app/pom.xml
index f8fe80f..54854b8 100644
--- a/examples/demo-template/angular2-product-app/pom.xml
+++ b/examples/demo-template/angular2-product-app/pom.xml
@@ -48,6 +48,54 @@
<skip>false</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <!-- this is relative to the pom.xml directory -->
+ <directory>src/main/frontend/dist</directory>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>1.3</version>
+ <configuration>
+ <nodeVersion>v6.10.0</nodeVersion>
+ <workingDirectory>src/main/frontend</workingDirectory>
+ <installDirectory>target</installDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>install node and npm</id>
+ <goals>
+ <goal>install-node-and-npm</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>npm install</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <configuration>
+ <arguments>install</arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>npm run build</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <configuration>
+ <arguments>run ng -- build --base-href /angular2-product/ --env=war</arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/.angular-cli.json b/examples/demo-template/angular2-product-app/src/main/frontend/.angular-cli.json
new file mode 100644
index 0000000..1d5d927
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/.angular-cli.json
@@ -0,0 +1,57 @@
+{
+ "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+ "project": {
+ "version": "1.0.0-beta.32.3",
+ "name": "angular2-product-app"
+ },
+ "apps": [
+ {
+ "root": "src",
+ "outDir": "dist",
+ "assets": [
+ "assets",
+ "favicon.ico"
+ ],
+ "index": "index.html",
+ "main": "main.ts",
+ "polyfills": "polyfills.ts",
+ "test": "test.ts",
+ "tsconfig": "tsconfig.json",
+ "prefix": "app",
+ "styles": [
+ "styles.css"
+ ],
+ "scripts": [],
+ "environmentSource": "environments/environment.ts",
+ "environments": {
+ "dev": "environments/environment.ts",
+ "war": "environments/environment.war.ts",
+ "prod": "environments/environment.prod.ts"
+ }
+ }
+ ],
+ "e2e": {
+ "protractor": {
+ "config": "./protractor.conf.js"
+ }
+ },
+ "lint": [
+ {
+ "files": "src/**/*.ts",
+ "project": "src/tsconfig.json"
+ },
+ {
+ "files": "e2e/**/*.ts",
+ "project": "e2e/tsconfig.json"
+ }
+ ],
+ "test": {
+ "karma": {
+ "config": "./karma.conf.js"
+ }
+ },
+ "defaults": {
+ "styleExt": "css",
+ "component": {}
+ }
+}
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/.editorconfig b/examples/demo-template/angular2-product-app/src/main/frontend/.editorconfig
new file mode 100644
index 0000000..6e87a00
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/.editorconfig
@@ -0,0 +1,13 @@
+# Editor configuration, see http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/.gitignore b/examples/demo-template/angular2-product-app/src/main/frontend/.gitignore
new file mode 100644
index 0000000..8ce8738
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/.gitignore
@@ -0,0 +1,41 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+
+# dependencies
+/node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage/*
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+#System Files
+.DS_Store
+Thumbs.db
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/e2e/app.e2e-spec.ts b/examples/demo-template/angular2-product-app/src/main/frontend/e2e/app.e2e-spec.ts
new file mode 100644
index 0000000..83246f1
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/e2e/app.e2e-spec.ts
@@ -0,0 +1,20 @@
+import { Angular2ProductAppPage } from './app.po';
+
+describe('angular2-product-app App', () => {
+ let page: Angular2ProductAppPage;
+
+ beforeEach(() => {
+ page = new Angular2ProductAppPage();
+ });
+
+ it('should display message saying Angular2 Product', () => {
+ page.navigateTo();
+ expect(page.getParagraphText()).toEqual('Angular2 Product');
+ });
+
+ it('should load Products', () => {
+ page.navigateTo();
+ const products = page.loadProducts();
+ ['iphone', 'ipad', 'ipod'].forEach(e => expect(products).toContain(e));
+ });
+});
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/e2e/app.po.ts b/examples/demo-template/angular2-product-app/src/main/frontend/e2e/app.po.ts
new file mode 100644
index 0000000..8ebb121
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/e2e/app.po.ts
@@ -0,0 +1,28 @@
+import { browser, element, by } from 'protractor';
+
+export class Angular2ProductAppPage {
+ navigateTo() {
+ browser.ignoreSynchronization = true;
+ browser.get('/');
+ browser.getCurrentUrl().then(url => {
+ if (url.includes('/auth/realms/demo')) {
+ element(by.id('username')).sendKeys('bburke@redhat.com');
+ element(by.id('password')).sendKeys('password');
+ element(by.id('kc-login')).click();
+ }
+ browser.ignoreSynchronization = false;
+
+ });
+ }
+
+ getParagraphText() {
+ return element(by.css('app-root h1')).getText();
+ }
+
+ loadProducts() {
+ const click = element(by.id('reload-data')).click();
+ browser.wait(click, 2000, 'Products should load within 2 seconds');
+ return element.all(by.css('table.table td')).getText();
+ }
+
+}
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/karma.conf.js b/examples/demo-template/angular2-product-app/src/main/frontend/karma.conf.js
new file mode 100644
index 0000000..b0052c5
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/karma.conf.js
@@ -0,0 +1,45 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/0.13/config/configuration-file.html
+
+module.exports = function (config) {
+ config.set({
+ basePath: '',
+ frameworks: ['jasmine', '@angular/cli'],
+ plugins: [
+ require('karma-jasmine'),
+ require('karma-chrome-launcher'),
+ require('karma-jasmine-html-reporter'),
+ require('karma-coverage-istanbul-reporter'),
+ require('@angular/cli/plugins/karma')
+ ],
+ client:{
+ clearContext: false // leave Jasmine Spec Runner output visible in browser
+ },
+ files: [
+ { pattern: './src/test.ts', watched: false }
+ ],
+ preprocessors: {
+ './src/test.ts': ['@angular/cli']
+ },
+ mime: {
+ 'text/x-typescript': ['ts','tsx']
+ },
+ coverageIstanbulReporter: {
+ reports: [ 'html', 'lcovonly' ],
+ fixWebpackSourcePaths: true
+ },
+ angularCli: {
+ config: './.angular-cli.json',
+ environment: 'dev'
+ },
+ reporters: config.angularCli && config.angularCli.codeCoverage
+ ? ['progress', 'coverage-istanbul']
+ : ['progress', 'kjhtml'],
+ port: 9876,
+ colors: true,
+ logLevel: config.LOG_INFO,
+ autoWatch: true,
+ browsers: ['Chrome'],
+ singleRun: false
+ });
+};
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/package.json b/examples/demo-template/angular2-product-app/src/main/frontend/package.json
new file mode 100644
index 0000000..91223e5
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/package.json
@@ -0,0 +1,46 @@
+{
+ "name": "angular2-product-app",
+ "version": "0.0.0",
+ "license": "Apache-2.0",
+ "angular-cli": {},
+ "scripts": {
+ "ng": "ng",
+ "start": "ng serve",
+ "test": "ng test",
+ "lint": "ng lint",
+ "e2e": "ng e2e"
+ },
+ "private": true,
+ "dependencies": {
+ "@angular/common": "^2.4.0",
+ "@angular/compiler": "^2.4.0",
+ "@angular/core": "^2.4.0",
+ "@angular/forms": "^2.4.0",
+ "@angular/http": "^2.4.0",
+ "@angular/platform-browser": "^2.4.0",
+ "@angular/platform-browser-dynamic": "^2.4.0",
+ "@angular/router": "^3.4.0",
+ "core-js": "^2.4.1",
+ "rxjs": "^5.1.0",
+ "zone.js": "^0.7.6"
+ },
+ "devDependencies": {
+ "@angular/cli": "1.0.0-beta.32.3",
+ "@angular/compiler-cli": "^2.4.0",
+ "@types/jasmine": "2.5.38",
+ "@types/node": "~6.0.60",
+ "codelyzer": "~2.0.0-beta.4",
+ "jasmine-core": "~2.5.2",
+ "jasmine-spec-reporter": "~3.2.0",
+ "karma": "~1.4.1",
+ "karma-chrome-launcher": "~2.0.0",
+ "karma-cli": "~1.0.1",
+ "karma-jasmine": "~1.1.0",
+ "karma-jasmine-html-reporter": "^0.2.2",
+ "karma-coverage-istanbul-reporter": "^0.2.0",
+ "protractor": "~5.1.0",
+ "ts-node": "~2.0.0",
+ "tslint": "~4.4.2",
+ "typescript": "~2.0.0"
+ }
+}
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/protractor.conf.js b/examples/demo-template/angular2-product-app/src/main/frontend/protractor.conf.js
new file mode 100644
index 0000000..c819669
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/protractor.conf.js
@@ -0,0 +1,31 @@
+// Protractor configuration file, see link for more information
+// https://github.com/angular/protractor/blob/master/lib/config.ts
+
+/*global jasmine */
+const { SpecReporter } = require('jasmine-spec-reporter');
+
+exports.config = {
+ allScriptsTimeout: 11000,
+ specs: [
+ './e2e/**/*.e2e-spec.ts'
+ ],
+ capabilities: {
+ 'browserName': 'chrome'
+ },
+ directConnect: true,
+ baseUrl: 'http://localhost:4200/',
+ framework: 'jasmine',
+ jasmineNodeOpts: {
+ showColors: true,
+ defaultTimeoutInterval: 30000,
+ print: function() {}
+ },
+ beforeLaunch: function() {
+ require('ts-node').register({
+ project: 'e2e'
+ });
+ },
+ onPrepare() {
+ jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+ }
+};
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/README.md b/examples/demo-template/angular2-product-app/src/main/frontend/README.md
new file mode 100644
index 0000000..f0520d7
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/README.md
@@ -0,0 +1,36 @@
+# Angular2ProductApp
+
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.0.0-beta.32.3. Keycloak integration is based on Angular
+
+## Development server
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+
+This application depends on `database-service` application API deployed at `http://localhost:8080/database-service` so you will have to make sure it allows cross-origin requests. It can be enabled for `database-service` in it's `keycloak.json`:
+
+ {
+ "realm" : "demo",
+ "resource" : "database-service",
+ ...
+ "enable-cors": true
+ }
+
+## Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive/pipe/service/class/module`.
+
+## Build
+
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
+
+## Running unit tests
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+Before running the tests make sure you are serving the app via `ng serve` and Keycloak and `database-service` is up and running at `http://localhost:8080`.
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/src/app/app.component.css b/examples/demo-template/angular2-product-app/src/main/frontend/src/app/app.component.css
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/src/app/app.component.css
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/src/app/app.component.spec.ts b/examples/demo-template/angular2-product-app/src/main/frontend/src/app/app.component.spec.ts
new file mode 100644
index 0000000..f5fc6c1
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/src/app/app.component.spec.ts
@@ -0,0 +1,66 @@
+import { TestBed, async } from '@angular/core/testing';
+import { AppComponent } from './app.component';
+import { KeycloakService } from './keycloak/keycloak.service';
+import {
+ HttpModule,
+ XHRBackend,
+ ResponseOptions,
+ Response,
+ RequestMethod
+} from '@angular/http';
+import {
+ MockBackend,
+ MockConnection
+} from '@angular/http/testing/mock_backend';
+
+
+describe('AppComponent', () => {
+ beforeEach(() => {
+ TestBed.configureTestingModule({
+ imports: [HttpModule],
+ providers: [
+ {
+ provide: XHRBackend,
+ useClass: MockBackend
+ },
+ {
+ provide: KeycloakService
+ }
+ ],
+ declarations: [
+ AppComponent
+ ],
+ });
+ TestBed.compileComponents();
+ });
+
+ it('should create the app', async(() => {
+ const fixture = TestBed.createComponent(AppComponent);
+ const app = fixture.debugElement.componentInstance;
+ expect(app).toBeTruthy();
+ }));
+
+ it(`should have as title 'Angular2 Product'`, async(() => {
+ const fixture = TestBed.createComponent(AppComponent);
+ const app = fixture.debugElement.componentInstance;
+ expect(app.title).toEqual('Angular2 Product');
+ }));
+
+ it('should render title in a h1 tag', async(() => {
+ const fixture = TestBed.createComponent(AppComponent);
+ fixture.detectChanges();
+ const compiled = fixture.debugElement.nativeElement;
+ expect(compiled.querySelector('h1').textContent).toContain('Angular2 Product');
+ }));
+
+ it('should render product list', async(() => {
+ const fixture = TestBed.createComponent(AppComponent);
+ fixture.componentInstance.products = ['iphone', 'ipad', 'ipod'];
+ fixture.detectChanges();
+ const compiled = fixture.debugElement.nativeElement;
+ expect(compiled.querySelector('table thead tr th').textContent).toContain('Product Listing');
+ expect(compiled.querySelectorAll('table tbody tr td')[0].textContent).toContain('iphone');
+ expect(compiled.querySelectorAll('table tbody tr td')[1].textContent).toContain('ipad');
+ expect(compiled.querySelectorAll('table tbody tr td')[2].textContent).toContain('ipod');
+ }));
+});
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/src/app/app.component.ts b/examples/demo-template/angular2-product-app/src/main/frontend/src/app/app.component.ts
new file mode 100644
index 0000000..28b9b98
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/src/app/app.component.ts
@@ -0,0 +1,32 @@
+import { Component } from '@angular/core';
+
+import {Http, Headers, RequestOptions, Response} from '@angular/http';
+import {Observable} from 'rxjs/Observable';
+import 'rxjs/add/operator/map';
+import {KeycloakService} from './keycloak/keycloak.service';
+
+import { environment } from '../environments/environment';
+
+@Component({
+ selector: 'app-root',
+ templateUrl: './app.component.html',
+ styleUrls: ['./app.component.css']
+})
+export class AppComponent {
+ title = 'Angular2 Product';
+
+ products: string[] = [];
+
+ constructor(private http: Http, private kc: KeycloakService) {}
+
+ logout() {
+ this.kc.logout();
+ }
+
+ reloadData() {
+ this.http.get(environment.serviceBaseUrl + '/products')
+ .map(res => res.json())
+ .subscribe(prods => this.products = prods,
+ error => console.log(error));
+ }
+}
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/src/app/app.module.ts b/examples/demo-template/angular2-product-app/src/main/frontend/src/app/app.module.ts
new file mode 100644
index 0000000..99a60f9
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/src/app/app.module.ts
@@ -0,0 +1,24 @@
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { HttpModule } from '@angular/http';
+import { KeycloakService } from './keycloak/keycloak.service';
+import { KeycloakHttp, KEYCLOAK_HTTP_PROVIDER } from './keycloak/keycloak.http';
+import { AppComponent } from './app.component';
+
+@NgModule({
+ declarations: [
+ AppComponent
+ ],
+ imports: [
+ BrowserModule,
+ FormsModule,
+ HttpModule
+ ],
+ providers: [
+ KeycloakService,
+ KEYCLOAK_HTTP_PROVIDER
+ ],
+ bootstrap: [AppComponent]
+})
+export class AppModule { }
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/src/app/keycloak/keycloak.http.spec.ts b/examples/demo-template/angular2-product-app/src/main/frontend/src/app/keycloak/keycloak.http.spec.ts
new file mode 100644
index 0000000..7ea175e
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/src/app/keycloak/keycloak.http.spec.ts
@@ -0,0 +1,47 @@
+import {Injectable, ReflectiveInjector} from '@angular/core';
+import {async, fakeAsync, tick} from '@angular/core/testing';
+import {BaseRequestOptions, ConnectionBackend, Http, RequestOptions} from '@angular/http';
+import {Response, ResponseOptions} from '@angular/http';
+import {MockBackend, MockConnection} from '@angular/http/testing';
+
+import { KeycloakHttp, KEYCLOAK_HTTP_PROVIDER, keycloakHttpFactory } from './keycloak.http';
+import { KeycloakService } from './keycloak.service';
+
+@Injectable()
+class MockKeycloakService extends KeycloakService {
+ getToken(): Promise<string> {
+ return Promise.resolve('hello');
+ }
+}
+
+describe('KeycloakHttp', () => {
+
+ let injector: ReflectiveInjector;
+ let backend: MockBackend;
+ let lastConnection: MockConnection;
+ let http: Http;
+
+ beforeEach(() => {
+ injector = ReflectiveInjector.resolveAndCreate([
+ {provide: ConnectionBackend, useClass: MockBackend},
+ {provide: RequestOptions, useClass: BaseRequestOptions},
+ {provide: KeycloakService, useClass: MockKeycloakService},
+ {
+ provide: Http,
+ useFactory: keycloakHttpFactory,
+ deps: [ConnectionBackend, RequestOptions, KeycloakService]
+ }
+ ]);
+ http = injector.get(Http);
+ backend = injector.get(ConnectionBackend) as MockBackend;
+ backend.connections.subscribe((c: MockConnection) => lastConnection = c);
+ });
+
+ it('should set Authorization header', fakeAsync(() => {
+ http.get('foo').subscribe(r => console.log(r));
+ tick();
+ expect(lastConnection).toBeDefined('no http service connection at all?');
+ expect(lastConnection.request.headers.get('Authorization')).toBe('Bearer hello');
+ }));
+
+});
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/src/app/keycloak/keycloak.http.ts b/examples/demo-template/angular2-product-app/src/main/frontend/src/app/keycloak/keycloak.http.ts
new file mode 100644
index 0000000..07887bd
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/src/app/keycloak/keycloak.http.ts
@@ -0,0 +1,42 @@
+import {Injectable} from '@angular/core';
+import {Http, Request, XHRBackend, ConnectionBackend, RequestOptions, RequestOptionsArgs, Response, Headers} from '@angular/http';
+
+import {KeycloakService} from './keycloak.service';
+import {Observable} from 'rxjs/Rx';
+
+/**
+ * This provides a wrapper over the ng2 Http class that insures tokens are refreshed on each request.
+ */
+@Injectable()
+export class KeycloakHttp extends Http {
+ constructor(_backend: ConnectionBackend, _defaultOptions: RequestOptions, private _keycloakService: KeycloakService) {
+ super(_backend, _defaultOptions);
+ }
+
+ request(url: string | Request, options?: RequestOptionsArgs): Observable<Response> {
+ const tokenPromise: Promise<string> = this._keycloakService.getToken();
+ const tokenObservable: Observable<string> = Observable.fromPromise(tokenPromise);
+
+ if (typeof url === 'string') {
+ return tokenObservable.map(token => {
+ const authOptions = new RequestOptions({headers: new Headers({'Authorization': 'Bearer ' + token})});
+ return new RequestOptions().merge(options).merge(authOptions);
+ }).concatMap(opts => super.request(url, opts));
+ } else if (url instanceof Request) {
+ return tokenObservable.map(token => {
+ url.headers.set('Authorization', 'Bearer ' + token);
+ return url;
+ }).concatMap(request => super.request(request));
+ }
+ }
+}
+
+export function keycloakHttpFactory(backend: XHRBackend, defaultOptions: RequestOptions, keycloakService: KeycloakService) {
+ return new KeycloakHttp(backend, defaultOptions, keycloakService);
+}
+
+export const KEYCLOAK_HTTP_PROVIDER = {
+ provide: Http,
+ useFactory: keycloakHttpFactory,
+ deps: [XHRBackend, RequestOptions, KeycloakService]
+};
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/src/assets/.gitkeep b/examples/demo-template/angular2-product-app/src/main/frontend/src/assets/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/src/assets/.gitkeep
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/src/environments/environment.prod.ts b/examples/demo-template/angular2-product-app/src/main/frontend/src/environments/environment.prod.ts
new file mode 100644
index 0000000..57a8df3
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/src/environments/environment.prod.ts
@@ -0,0 +1,5 @@
+export const environment = {
+ production: true,
+ keykloakBaseUrl: 'http://localhost:8080/auth',
+ serviceBaseUrl: 'http://localhost:8080/database'
+};
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/src/environments/environment.ts b/examples/demo-template/angular2-product-app/src/main/frontend/src/environments/environment.ts
new file mode 100644
index 0000000..f93bdd5
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/src/environments/environment.ts
@@ -0,0 +1,10 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// The list of which env maps to which file can be found in `.angular-cli.json`.
+
+export const environment = {
+ production: false,
+ keykloakBaseUrl: 'http://localhost:8080/auth',
+ serviceBaseUrl: 'http://localhost:8080/database'
+};
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/src/environments/environment.war.ts b/examples/demo-template/angular2-product-app/src/main/frontend/src/environments/environment.war.ts
new file mode 100644
index 0000000..6bb464d
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/src/environments/environment.war.ts
@@ -0,0 +1,5 @@
+export const environment = {
+ production: false,
+ keykloakBaseUrl: '/auth',
+ serviceBaseUrl: '/database'
+};
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/src/favicon.ico b/examples/demo-template/angular2-product-app/src/main/frontend/src/favicon.ico
new file mode 100644
index 0000000..8081c7c
Binary files /dev/null and b/examples/demo-template/angular2-product-app/src/main/frontend/src/favicon.ico differ
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/src/index.html b/examples/demo-template/angular2-product-app/src/main/frontend/src/index.html
new file mode 100644
index 0000000..5b15f36
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/src/index.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>Angular2ProductApp</title>
+ <base href="/">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link rel="icon" type="image/x-icon" href="favicon.ico">
+ <script src="http://localhost:8080/auth/js/keycloak.js"></script>
+</head>
+<body>
+ <app-root>Loading...</app-root>
+</body>
+</html>
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/src/main.ts b/examples/demo-template/angular2-product-app/src/main/frontend/src/main.ts
new file mode 100644
index 0000000..8bd5ab5
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/src/main.ts
@@ -0,0 +1,14 @@
+import { enableProdMode } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app/app.module';
+import { environment } from './environments/environment';
+import { KeycloakService } from './app/keycloak/keycloak.service';
+
+if (environment.production) {
+ enableProdMode();
+}
+
+KeycloakService.init()
+ .then(() => platformBrowserDynamic().bootstrapModule(AppModule))
+ .catch(e => window.location.reload());
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/src/polyfills.ts b/examples/demo-template/angular2-product-app/src/main/frontend/src/polyfills.ts
new file mode 100644
index 0000000..53bdaf1
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/src/polyfills.ts
@@ -0,0 +1,68 @@
+/**
+ * This file includes polyfills needed by Angular and is loaded before the app.
+ * You can add your own extra polyfills to this file.
+ *
+ * This file is divided into 2 sections:
+ * 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
+ * 2. Application imports. Files imported after ZoneJS that should be loaded before your main
+ * file.
+ *
+ * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
+ * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
+ * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
+ *
+ * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
+ */
+
+/***************************************************************************************************
+ * BROWSER POLYFILLS
+ */
+
+/** IE9, IE10 and IE11 requires all of the following polyfills. **/
+// import 'core-js/es6/symbol';
+// import 'core-js/es6/object';
+// import 'core-js/es6/function';
+// import 'core-js/es6/parse-int';
+// import 'core-js/es6/parse-float';
+// import 'core-js/es6/number';
+// import 'core-js/es6/math';
+// import 'core-js/es6/string';
+// import 'core-js/es6/date';
+// import 'core-js/es6/array';
+// import 'core-js/es6/regexp';
+// import 'core-js/es6/map';
+// import 'core-js/es6/set';
+
+/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+// import 'classlist.js'; // Run `npm install --save classlist.js`.
+
+/** IE10 and IE11 requires the following to support `@angular/animation`. */
+// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
+
+
+/** Evergreen browsers require these. **/
+import 'core-js/es6/reflect';
+import 'core-js/es7/reflect';
+
+
+/** ALL Firefox browsers require the following to support `@angular/animation`. **/
+// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
+
+
+
+/***************************************************************************************************
+ * Zone JS is required by Angular itself.
+ */
+import 'zone.js/dist/zone'; // Included with Angular CLI.
+
+
+
+/***************************************************************************************************
+ * APPLICATION IMPORTS
+ */
+
+/**
+ * Date, currency, decimal and percent pipes.
+ * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
+ */
+// import 'intl'; // Run `npm install --save intl`.
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/src/styles.css b/examples/demo-template/angular2-product-app/src/main/frontend/src/styles.css
new file mode 100644
index 0000000..90d4ee0
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/src/styles.css
@@ -0,0 +1 @@
+/* You can add global styles to this file, and also import other style files */
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/src/test.ts b/examples/demo-template/angular2-product-app/src/main/frontend/src/test.ts
new file mode 100644
index 0000000..9bf7226
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/src/test.ts
@@ -0,0 +1,32 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/dist/long-stack-trace-zone';
+import 'zone.js/dist/proxy.js';
+import 'zone.js/dist/sync-test';
+import 'zone.js/dist/jasmine-patch';
+import 'zone.js/dist/async-test';
+import 'zone.js/dist/fake-async-test';
+import { getTestBed } from '@angular/core/testing';
+import {
+ BrowserDynamicTestingModule,
+ platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+
+// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
+declare var __karma__: any;
+declare var require: any;
+
+// Prevent Karma from running prematurely.
+__karma__.loaded = function () {};
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+ BrowserDynamicTestingModule,
+ platformBrowserDynamicTesting()
+);
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);
+// Finally, start Karma to run the tests.
+__karma__.start();
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/src/tsconfig.json b/examples/demo-template/angular2-product-app/src/main/frontend/src/tsconfig.json
new file mode 100644
index 0000000..40fe5c0
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/src/tsconfig.json
@@ -0,0 +1,21 @@
+{
+ "compilerOptions": {
+ "baseUrl": "",
+ "declaration": false,
+ "emitDecoratorMetadata": true,
+ "experimentalDecorators": true,
+ "lib": [
+ "es2016",
+ "dom"
+ ],
+ "mapRoot": "./",
+ "module": "es2015",
+ "moduleResolution": "node",
+ "outDir": "../dist/out-tsc",
+ "sourceMap": true,
+ "target": "es5",
+ "typeRoots": [
+ "../node_modules/@types"
+ ]
+ }
+}
diff --git a/examples/demo-template/angular2-product-app/src/main/frontend/tslint.json b/examples/demo-template/angular2-product-app/src/main/frontend/tslint.json
new file mode 100644
index 0000000..9113f13
--- /dev/null
+++ b/examples/demo-template/angular2-product-app/src/main/frontend/tslint.json
@@ -0,0 +1,116 @@
+{
+ "rulesDirectory": [
+ "node_modules/codelyzer"
+ ],
+ "rules": {
+ "callable-types": true,
+ "class-name": true,
+ "comment-format": [
+ true,
+ "check-space"
+ ],
+ "curly": true,
+ "eofline": true,
+ "forin": true,
+ "import-blacklist": [true, "rxjs"],
+ "import-spacing": true,
+ "indent": [
+ true,
+ "spaces"
+ ],
+ "interface-over-type-literal": true,
+ "label-position": true,
+ "max-line-length": [
+ true,
+ 140
+ ],
+ "member-access": false,
+ "member-ordering": [
+ true,
+ "static-before-instance",
+ "variables-before-functions"
+ ],
+ "no-arg": true,
+ "no-bitwise": true,
+ "no-console": [
+ true,
+ "debug",
+ "info",
+ "time",
+ "timeEnd",
+ "trace"
+ ],
+ "no-construct": true,
+ "no-debugger": true,
+ "no-duplicate-variable": true,
+ "no-empty": false,
+ "no-empty-interface": true,
+ "no-eval": true,
+ "no-inferrable-types": [true, "ignore-params"],
+ "no-shadowed-variable": true,
+ "no-string-literal": false,
+ "no-string-throw": true,
+ "no-switch-case-fall-through": true,
+ "no-trailing-whitespace": true,
+ "no-unused-expression": true,
+ "no-use-before-declare": true,
+ "no-var-keyword": true,
+ "object-literal-sort-keys": false,
+ "one-line": [
+ true,
+ "check-open-brace",
+ "check-catch",
+ "check-else",
+ "check-whitespace"
+ ],
+ "prefer-const": true,
+ "quotemark": [
+ true,
+ "single"
+ ],
+ "radix": true,
+ "semicolon": [
+ "always"
+ ],
+ "triple-equals": [
+ true,
+ "allow-null-check"
+ ],
+ "typedef-whitespace": [
+ true,
+ {
+ "call-signature": "nospace",
+ "index-signature": "nospace",
+ "parameter": "nospace",
+ "property-declaration": "nospace",
+ "variable-declaration": "nospace"
+ }
+ ],
+ "typeof-compare": true,
+ "unified-signatures": true,
+ "variable-name": false,
+ "whitespace": [
+ true,
+ "check-branch",
+ "check-decl",
+ "check-operator",
+ "check-separator",
+ "check-type"
+ ],
+
+ "directive-selector": [true, "attribute", "app", "camelCase"],
+ "component-selector": [true, "element", "app", "kebab-case"],
+ "use-input-property-decorator": true,
+ "use-output-property-decorator": true,
+ "use-host-property-decorator": true,
+ "no-input-rename": true,
+ "no-output-rename": true,
+ "use-life-cycle-interface": true,
+ "use-pipe-transform-interface": true,
+ "component-class-suffix": true,
+ "directive-class-suffix": true,
+ "no-access-missing-member": true,
+ "templates-use-public": true,
+ "invoke-injectable": true
+ }
+}
diff --git a/services/src/main/java/org/keycloak/services/resources/AccountService.java b/services/src/main/java/org/keycloak/services/resources/AccountService.java
index 9b36a45..a3c3fcb 100755
--- a/services/src/main/java/org/keycloak/services/resources/AccountService.java
+++ b/services/src/main/java/org/keycloak/services/resources/AccountService.java
@@ -60,12 +60,7 @@ import org.keycloak.services.validation.Validation;
import org.keycloak.storage.ReadOnlyException;
import org.keycloak.util.JsonSerialization;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.OPTIONS;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.QueryParam;
+import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
@@ -259,27 +254,33 @@ public class AccountService extends AbstractSecuredLocalService {
*/
@Path("/")
@GET
+ @Produces(MediaType.TEXT_HTML)
public Response accountPage() {
- List<MediaType> types = headers.getAcceptableMediaTypes();
- if (types.contains(MediaType.WILDCARD_TYPE) || (types.contains(MediaType.TEXT_HTML_TYPE))) {
- return forwardToPage(null, AccountPages.ACCOUNT);
- } else if (types.contains(MediaType.APPLICATION_JSON_TYPE)) {
- requireOneOf(AccountRoles.MANAGE_ACCOUNT, AccountRoles.VIEW_PROFILE);
-
- UserRepresentation rep = ModelToRepresentation.toRepresentation(session, realm, auth.getUser());
- if (rep.getAttributes() != null) {
- Iterator<String> itr = rep.getAttributes().keySet().iterator();
- while (itr.hasNext()) {
- if (itr.next().startsWith("keycloak.")) {
- itr.remove();
- }
+ return forwardToPage(null, AccountPages.ACCOUNT);
+ }
+
+ /**
+ * Get account information.
+ *
+ * @return
+ */
+ @Path("/")
+ @GET
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response accountPageJson() {
+ requireOneOf(AccountRoles.MANAGE_ACCOUNT, AccountRoles.VIEW_PROFILE);
+
+ UserRepresentation rep = ModelToRepresentation.toRepresentation(session, realm, auth.getUser());
+ if (rep.getAttributes() != null) {
+ Iterator<String> itr = rep.getAttributes().keySet().iterator();
+ while (itr.hasNext()) {
+ if (itr.next().startsWith("keycloak.")) {
+ itr.remove();
}
}
-
- return Cors.add(request, Response.ok(rep)).auth().allowedOrigins(auth.getToken()).build();
- } else {
- return Response.notAcceptable(Variant.VariantListBuilder.newInstance().mediaTypes(MediaType.TEXT_HTML_TYPE, MediaType.APPLICATION_JSON_TYPE).build()).build();
}
+
+ return Cors.add(request, Response.ok(rep)).auth().allowedOrigins(auth.getToken()).build();
}
public static UriBuilder totpUrl(UriBuilder base) {
@@ -377,6 +378,8 @@ public class AccountService extends AbstractSecuredLocalService {
UserModel user = auth.getUser();
+ event.event(EventType.UPDATE_PROFILE).client(auth.getClient()).user(auth.getUser());
+
List<FormMessage> errors = Validation.validateUpdateProfileForm(realm.isEditUsernameAllowed(), formData);
if (errors != null && !errors.isEmpty()) {
setReferrerOnPage();
@@ -384,49 +387,15 @@ public class AccountService extends AbstractSecuredLocalService {
}
try {
- if (realm.isEditUsernameAllowed()) {
- String username = formData.getFirst("username");
-
- UserModel existing = session.users().getUserByUsername(username, realm);
- if (existing != null && !existing.getId().equals(user.getId())) {
- throw new ModelDuplicateException(Messages.USERNAME_EXISTS);
- }
+ updateUsername(formData.getFirst("username"), user);
+ updateEmail(formData.getFirst("email"), user);
- user.setUsername(username);
- }
user.setFirstName(formData.getFirst("firstName"));
user.setLastName(formData.getFirst("lastName"));
- String email = formData.getFirst("email");
- String oldEmail = user.getEmail();
- boolean emailChanged = oldEmail != null ? !oldEmail.equals(email) : email != null;
- if (emailChanged && !realm.isDuplicateEmailsAllowed()) {
- UserModel existing = session.users().getUserByEmail(email, realm);
- if (existing != null && !existing.getId().equals(user.getId())) {
- throw new ModelDuplicateException(Messages.EMAIL_EXISTS);
- }
- }
-
- user.setEmail(email);
-
AttributeFormDataProcessor.process(formData, realm, user);
- event.event(EventType.UPDATE_PROFILE).client(auth.getClient()).user(auth.getUser()).success();
-
- if (emailChanged) {
- user.setEmailVerified(false);
- event.clone().event(EventType.UPDATE_EMAIL).detail(Details.PREVIOUS_EMAIL, oldEmail).detail(Details.UPDATED_EMAIL, email).success();
- }
-
- if (realm.isRegistrationEmailAsUsername()) {
- if (!realm.isDuplicateEmailsAllowed()) {
- UserModel existing = session.users().getUserByEmail(email, realm);
- if (existing != null && !existing.getId().equals(user.getId())) {
- throw new ModelDuplicateException(Messages.USERNAME_EXISTS);
- }
- }
- user.setUsername(email);
- }
+ event.success();
setReferrerOnPage();
return account.setSuccess(Messages.ACCOUNT_UPDATED).createResponse(AccountPages.ACCOUNT);
@@ -439,6 +408,82 @@ public class AccountService extends AbstractSecuredLocalService {
}
}
+ @Path("/")
+ @POST
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response processAccountUpdateJson(UserRepresentation userRep) {
+ require(AccountRoles.MANAGE_ACCOUNT);
+ if (auth.isCookieAuthenticated()) {
+ throw new ForbiddenException();
+ }
+
+ UserModel user = auth.getUser();
+
+ event.event(EventType.UPDATE_PROFILE).client(auth.getClient()).user(auth.getUser());
+
+ updateUsername(userRep.getUsername(), user);
+ updateEmail(userRep.getEmail(), user);
+
+ user.setFirstName(userRep.getFirstName());
+ user.setLastName(userRep.getLastName());
+
+ if (userRep.getAttributes() != null) {
+ for (String k : user.getAttributes().keySet()) {
+ if (!userRep.getAttributes().containsKey(k)) {
+ user.removeAttribute(k);
+ }
+ }
+
+ for (Map.Entry<String, List<String>> e : userRep.getAttributes().entrySet()) {
+ user.setAttribute(e.getKey(), e.getValue());
+ }
+ }
+
+ event.success();
+
+ return Cors.add(request, Response.ok()).build();
+ }
+
+ private void updateUsername(String username, UserModel user) {
+ if (realm.isEditUsernameAllowed() && username != null) {
+ UserModel existing = session.users().getUserByUsername(username, realm);
+ if (existing != null && !existing.getId().equals(user.getId())) {
+ throw new ModelDuplicateException(Messages.USERNAME_EXISTS);
+ }
+
+ user.setUsername(username);
+ }
+ }
+
+ private void updateEmail(String email, UserModel user) {
+ String oldEmail = user.getEmail();
+ boolean emailChanged = oldEmail != null ? !oldEmail.equals(email) : email != null;
+ if (emailChanged && !realm.isDuplicateEmailsAllowed()) {
+ UserModel existing = session.users().getUserByEmail(email, realm);
+ if (existing != null && !existing.getId().equals(user.getId())) {
+ throw new ModelDuplicateException(Messages.EMAIL_EXISTS);
+ }
+ }
+
+ user.setEmail(email);
+
+ if (emailChanged) {
+ user.setEmailVerified(false);
+ event.clone().event(EventType.UPDATE_EMAIL).detail(Details.PREVIOUS_EMAIL, oldEmail).detail(Details.UPDATED_EMAIL, email).success();
+ }
+
+ if (realm.isRegistrationEmailAsUsername()) {
+ if (!realm.isDuplicateEmailsAllowed()) {
+ UserModel existing = session.users().getUserByEmail(email, realm);
+ if (existing != null && !existing.getId().equals(user.getId())) {
+ throw new ModelDuplicateException(Messages.USERNAME_EXISTS);
+ }
+ }
+ user.setUsername(email);
+ }
+ }
+
@Path("totp-remove")
@GET
public Response processTotpRemove(@QueryParam("stateChecker") String stateChecker) {
diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java
index d02ed75..f5690a5 100755
--- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java
+++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java
@@ -65,7 +65,7 @@ public class SendUsernameServlet {
return Response.status(Response.Status.FORBIDDEN).entity("Forbidden").build();
}
- return Response.ok(getOutput()).header(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_PLAIN_TYPE + ";charset=UTF-8").build();
+ return Response.ok(getOutput()).header(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_HTML_TYPE + ";charset=UTF-8").build();
}
@POST
diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml
index e74016d..b5698e9 100644
--- a/testsuite/integration-arquillian/tests/base/pom.xml
+++ b/testsuite/integration-arquillian/tests/base/pom.xml
@@ -62,6 +62,11 @@
<version>1.10</version>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-testsuite-providers</artifactId>
<version>${project.version}</version>
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountTest.java
index 3f76556..db5c4ed 100755
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountTest.java
@@ -525,8 +525,8 @@ public class AccountTest extends AbstractTestRealmKeycloakTest {
Assert.assertEquals("New last", profilePage.getLastName());
Assert.assertEquals("new@email.com", profilePage.getEmail());
- events.expectAccount(EventType.UPDATE_PROFILE).assertEvent();
events.expectAccount(EventType.UPDATE_EMAIL).detail(Details.PREVIOUS_EMAIL, "test-user@localhost").detail(Details.UPDATED_EMAIL, "new@email.com").assertEvent();
+ events.expectAccount(EventType.UPDATE_PROFILE).assertEvent();
// reset user for other tests
profilePage.updateProfile("Tom", "Brady", "test-user@localhost");
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ProfileTest.java
index e33447a..63a2315 100755
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ProfileTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ProfileTest.java
@@ -22,6 +22,8 @@ import org.apache.http.HttpHeaders;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import org.jboss.arquillian.drone.api.annotation.Default;
import org.jboss.arquillian.graphene.context.GrapheneContext;
@@ -45,12 +47,14 @@ import org.keycloak.testsuite.pages.AccountApplicationsPage;
import org.keycloak.testsuite.pages.AccountUpdateProfilePage;
import org.keycloak.testsuite.pages.LoginPage;
import org.keycloak.testsuite.pages.OAuthGrantPage;
+import org.keycloak.testsuite.runonserver.SerializationUtil;
import org.keycloak.testsuite.util.ClientBuilder;
import org.keycloak.testsuite.util.OAuthClient;
import org.keycloak.testsuite.util.RealmBuilder;
import org.keycloak.testsuite.util.RealmRepUtil;
import org.keycloak.testsuite.util.UserBuilder;
import org.keycloak.testsuite.util.WaitUtils;
+import org.keycloak.util.JsonSerialization;
import org.openqa.selenium.By;
import org.openqa.selenium.Capabilities;
import org.openqa.selenium.JavascriptExecutor;
@@ -68,6 +72,7 @@ import java.io.IOException;
import java.net.URI;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -146,23 +151,49 @@ public class ProfileTest extends AbstractTestRealmKeycloakTest {
HttpResponse response = doGetProfile(token, null);
assertEquals(200, response.getStatusLine().getStatusCode());
- JSONObject profile = new JSONObject(IOUtils.toString(response.getEntity().getContent()));
+ UserRepresentation profile = JsonSerialization.readValue(IOUtils.toString(response.getEntity().getContent()), UserRepresentation.class);
- assertEquals("test-user@localhost", profile.getString("username"));
- assertEquals("test-user@localhost", profile.getString("email"));
- assertEquals("First", profile.getString("firstName"));
- assertEquals("Last", profile.getString("lastName"));
+ assertEquals("test-user@localhost", profile.getUsername());
+ assertEquals("test-user@localhost", profile.getEmail());
+ assertEquals("First", profile.getFirstName());
+ assertEquals("Last", profile.getLastName());
- JSONObject attributes = profile.getJSONObject("attributes");
- JSONArray attrValue = attributes.getJSONArray("key1");
- assertEquals(1, attrValue.length());
+ Map<String, List<String>> attributes = profile.getAttributes();
+ List<String> attrValue = attributes.get("key1");
+ assertEquals(1, attrValue.size());
assertEquals("value1", attrValue.get(0));
- attrValue = attributes.getJSONArray("key2");
- assertEquals(1, attrValue.length());
+ attrValue = attributes.get("key2");
+ assertEquals(1, attrValue.size());
assertEquals("value2", attrValue.get(0));
}
@Test
+ public void updateProfile() throws Exception {
+ oauth.doLogin("test-user@localhost", "password");
+
+ String code = oauth.getCurrentQuery().get(OAuth2Constants.CODE);
+ String token = oauth.doAccessTokenRequest(code, "password").getAccessToken();
+
+ UserRepresentation user = new UserRepresentation();
+ user.setUsername("test-user@localhost");
+ user.setFirstName("NewFirst");
+ user.setLastName("NewLast");
+ user.setEmail("NewEmail@localhost");
+
+ HttpResponse response = doUpdateProfile(token, null, JsonSerialization.writeValueAsString(user));
+ assertEquals(200, response.getStatusLine().getStatusCode());
+
+ response = doGetProfile(token, null);
+
+ UserRepresentation profile = JsonSerialization.readValue(IOUtils.toString(response.getEntity().getContent()), UserRepresentation.class);
+
+ assertEquals("test-user@localhost", profile.getUsername());
+ assertEquals("newemail@localhost", profile.getEmail());
+ assertEquals("NewFirst", profile.getFirstName());
+ assertEquals("NewLast", profile.getLastName());
+ }
+
+ @Test
public void getProfileCors() throws Exception {
oauth.doLogin("test-user@localhost", "password");
@@ -274,6 +305,21 @@ public class ProfileTest extends AbstractTestRealmKeycloakTest {
return client.execute(get);
}
+ private HttpResponse doUpdateProfile(String token, String origin, String value) throws IOException {
+ HttpClient client = new DefaultHttpClient();
+ HttpPost post = new HttpPost(UriBuilder.fromUri(getAccountURI()).build());
+ if (token != null) {
+ post.setHeader(HttpHeaders.AUTHORIZATION, "bearer " + token);
+ }
+ if (origin != null) {
+ post.setHeader("Origin", origin);
+ }
+ post.setHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON);
+ post.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
+ post.setEntity(new StringEntity(value));
+ return client.execute(post);
+ }
+
private String[] doGetProfileJs(String authServerRoot, String token) {
UriBuilder uriBuilder = UriBuilder.fromUri(authServerRoot)
.path(TestApplicationResource.class)
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/AbstractJSConsoleExampleAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/AbstractJSConsoleExampleAdapterTest.java
index d0eeec6..4e4cb85 100755
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/AbstractJSConsoleExampleAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/AbstractJSConsoleExampleAdapterTest.java
@@ -43,8 +43,8 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.*;
import static org.keycloak.testsuite.auth.page.AuthRealm.EXAMPLE;
import static org.keycloak.testsuite.util.IOUtil.loadRealm;
import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlDoesntStartWith;
@@ -479,7 +479,7 @@ public abstract class AbstractJSConsoleExampleAdapterTest extends AbstractExampl
private void assertResponseError(String errorDescription) {
jsConsoleTestAppPage.showErrorResponse();
- assertTrue(jsConsoleTestAppPage.getOutputElement().getText().contains(errorDescription));
+ assertThat(jsConsoleTestAppPage.getOutputElement().getText(), containsString(errorDescription));
}
}
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractDemoServletsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractDemoServletsAdapterTest.java
index 6b561d7..85c6a5e 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractDemoServletsAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractDemoServletsAdapterTest.java
@@ -50,7 +50,7 @@ import org.keycloak.testsuite.auth.page.account.Applications;
import org.keycloak.testsuite.auth.page.login.OAuthGrant;
import org.keycloak.testsuite.console.page.events.Config;
import org.keycloak.testsuite.console.page.events.LoginEvents;
-import org.keycloak.testsuite.util.URLUtils;
+import org.keycloak.testsuite.util.*;
import org.keycloak.util.BasicAuthHelper;
import org.openqa.selenium.By;
@@ -74,16 +74,13 @@ import java.util.regex.Pattern;
import static org.junit.Assert.*;
-import org.keycloak.testsuite.util.Matchers;
-
import javax.ws.rs.core.Response.Status;
import static org.hamcrest.Matchers.*;
import static org.keycloak.testsuite.auth.page.AuthRealm.DEMO;
import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlEquals;
import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWithLoginUrlOf;
-import static org.keycloak.testsuite.util.WaitUtils.pause;
-import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement;
+import static org.keycloak.testsuite.util.WaitUtils.*;
/**
*
@@ -199,7 +196,9 @@ public abstract class AbstractDemoServletsAdapterTest extends AbstractServletsAd
assertCurrentUrlStartsWithLoginUrlOf(testRealmPage);
testRealmLoginPage.form().login("bburke@redhat.com", "password");
assertCurrentUrlEquals(driver, inputPortal + "/secured/post");
- waitUntilElement(By.xpath("//body")).text().contains("parameter=hello");
+ waitForPageToLoad(driver);
+ String pageSource = driver.getPageSource();
+ assertThat(pageSource, containsString("parameter=hello"));
String logoutUri = OIDCLoginProtocolService.logoutUrl(authServerPage.createUriBuilder())
.queryParam(OAuth2Constants.REDIRECT_URI, customerPortal.toString())
@@ -621,8 +620,10 @@ public abstract class AbstractDemoServletsAdapterTest extends AbstractServletsAd
oAuthGrantPage.accept();
- waitUntilElement(By.xpath("//body")).text().contains("Bill Burke");
- waitUntilElement(By.xpath("//body")).text().contains("Stian Thorgersen");
+ String pageSource = driver.getPageSource();
+ waitForPageToLoad(driver);
+ assertThat(pageSource, containsString("Bill Burke"));
+ assertThat(pageSource, containsString("Stian Thorgersen"));
String userId = ApiUtil.findUserByUsername(testRealmResource(), "bburke@redhat.com").getId();
@@ -673,8 +674,10 @@ public abstract class AbstractDemoServletsAdapterTest extends AbstractServletsAd
testRealmLoginPage.form().login("bburke@redhat.com", "password");
- waitUntilElement(By.xpath("//body")).text().contains("Bill Burke");
- waitUntilElement(By.xpath("//body")).text().contains("Stian Thorgersen");
+ waitForPageToLoad(driver);
+ String pageSource = driver.getPageSource();
+ assertThat(pageSource, containsString("Bill Burke"));
+ assertThat(pageSource, containsString("Stian Thorgersen"));
String userId = ApiUtil.findUserByUsername(testRealmResource(), "bburke@redhat.com").getId();
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletsAdapterTest.java
index 8fc9053..10d3ab7 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletsAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletsAdapterTest.java
@@ -84,9 +84,7 @@ import org.keycloak.testsuite.admin.ApiUtil;
import org.keycloak.testsuite.auth.page.login.Login;
import org.keycloak.testsuite.auth.page.login.SAMLIDPInitiatedLogin;
import org.keycloak.testsuite.page.AbstractPage;
-import org.keycloak.testsuite.util.IOUtil;
-import org.keycloak.testsuite.util.SamlClient;
-import org.keycloak.testsuite.util.UserBuilder;
+import org.keycloak.testsuite.util.*;
import org.openqa.selenium.By;
import org.w3c.dom.Document;
@@ -133,7 +131,7 @@ import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC;
import static org.keycloak.testsuite.util.SamlClient.idpInitiatedLogin;
import static org.keycloak.testsuite.util.SamlClient.login;
import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith;
-import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement;
+import static org.keycloak.testsuite.util.WaitUtils.*;
/**
* @author mhajas
@@ -384,7 +382,7 @@ public abstract class AbstractSAMLServletsAdapterTest extends AbstractServletsAd
private void checkLoggedOut(AbstractPage page, Login loginPage) {
page.navigateTo();
- waitUntilElement(By.xpath("//body")).is().present();
+ waitForPageToLoad(driver);
assertCurrentUrlStartsWith(loginPage);
}
@@ -862,8 +860,10 @@ public abstract class AbstractSAMLServletsAdapterTest extends AbstractServletsAd
assertCurrentUrlStartsWith(testRealmSAMLPostLoginPage);
testRealmSAMLPostLoginPage.form().login("bburke", "password");
assertCurrentUrlStartsWith(employeeServletPage);
- waitUntilElement(By.xpath("//body")).text().contains("Relay state: " + SamlSPFacade.RELAY_STATE);
- waitUntilElement(By.xpath("//body")).text().not().contains("SAML response: null");
+ waitForPageToLoad(driver);
+ String pageSource = driver.getPageSource();
+ assertThat(pageSource, containsString("Relay state: " + SamlSPFacade.RELAY_STATE));
+ assertThat(pageSource, not(containsString("SAML response: null")));
}
@Test