Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 3 additions & 11 deletions .bacon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,21 @@ test_suites:
timeout: '10'
script_name: e2e
criteria: MERGE
queue_name: ci-queue-productionJenga-AL2023
queue_name: al2023

- name: e2e-oie
script_path: /root/okta/samples-js-angular/scripts
sort_order: '1'
timeout: '10'
script_name: e2e-oie
criteria: MERGE
queue_name: ci-queue-productionJenga-AL2023

- name: semgrep
script_path: /root/okta/samples-js-angular/scripts
sort_order: '3'
timeout: '10'
script_name: semgrep
criteria: MERGE
queue_name: ci-queue-productionJenga-AL2023
queue_name: al2023

- name: snyk
script_path: /root/okta/samples-js-angular/scripts
script_name: snyk
sort_order: '3'
timeout: '200'
criteria: MAINLINE
queue_name: ci-queue-productionJenga-AL2023
queue_name: al2023
trigger: AUTO
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ testenv
yalc.lock
.env
.idea/
.angular/
.angular/
package-lock.json
17 changes: 0 additions & 17 deletions custom-login/.browserslistrc

This file was deleted.

6 changes: 3 additions & 3 deletions custom-login/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,19 @@
"serve": {
"builder": "@angular-builders/custom-webpack:dev-server",
"options": {
"browserTarget": "custom-login:build:production",
"buildTarget": "custom-login:build:production",
"port": 8080
},
"configurations": {
"production": {
"browserTarget": "custom-login:build:production"
"buildTarget": "custom-login:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "custom-login:build"
"buildTarget": "custom-login:build"
}
},
"test": {
Expand Down
37 changes: 18 additions & 19 deletions custom-login/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,27 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~15.2.0",
"@angular/common": "~15.2.0",
"@angular/compiler": "~15.2.0",
"@angular/core": "~15.2.0",
"@angular/forms": "~15.2.0",
"@angular/platform-browser": "~15.2.0",
"@angular/platform-browser-dynamic": "~15.2.0",
"@angular/router": "~15.2.0",
"@giomamaladze/ng2-semantic-ui": "^1.0.1",
"@okta/okta-angular": "^6.0.0",
"@okta/okta-auth-js": "7.9.0",
"@okta/okta-signin-widget": "7.26.1",
"rxjs": "~6.6.7",
"@angular/animations": "~19.2.17",
"@angular/common": "~19.2.17",
"@angular/compiler": "~19.2.17",
"@angular/core": "~19.2.17",
"@angular/forms": "~19.2.17",
"@angular/platform-browser": "~19.2.17",
"@angular/platform-browser-dynamic": "~19.2.17",
"@angular/router": "~19.2.17",
"@okta/okta-angular": "^7.0.0",
"@okta/okta-auth-js": "7.14.1",
"@okta/okta-signin-widget": "~7.39.0",
"rxjs": "~7.4.0",
"semantic-ui-css": "^2.4.1",
"tslib": "^2.4.0",
"zone.js": "~0.11.4"
"zone.js": "~0.15.0"
},
"devDependencies": {
"@angular-builders/custom-webpack": "^15.0.0",
"@angular-devkit/build-angular": "~15.2.11",
"@angular/cli": "~15.2.0",
"@angular/compiler-cli": "~15.2.0",
"@angular-builders/custom-webpack": "^19.0.1",
"@angular-devkit/build-angular": "~19.2.17",
"@angular/cli": "~19.2.17",
"@angular/compiler-cli": "~19.2.17",
"@types/jasmine": "~3.6.0",
"@types/node": "^12.11.1",
"@types/text-encoding": "0.0.36",
Expand All @@ -43,6 +42,6 @@
"text-encoding": "^0.7.0",
"ts-node": "~10.9.1",
"tslint": "~6.1.3",
"typescript": "~4.8.3"
"typescript": "~5.5.4"
}
}
1 change: 1 addition & 0 deletions custom-login/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { OktaAuth } from '@okta/okta-auth-js';

@Component({
selector: 'app-root',
standalone: false,
templateUrl: './app.component.html',
styleUrls: ['./app.component.css']
})
Expand Down
14 changes: 4 additions & 10 deletions custom-login/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { Injector, NgModule } from '@angular/core';
import { HttpClientModule } from '@angular/common/http';
import { APP_BASE_HREF } from '@angular/common';
import { Routes, RouterModule, Router } from '@angular/router';
import { SuiModalService, SuiModalModule } from '@giomamaladze/ng2-semantic-ui';
import { OktaAuth } from '@okta/okta-auth-js';
import {
OKTA_CONFIG,
Expand All @@ -33,7 +32,7 @@ import { HomeComponent } from './home/home.component';
import { LoginComponent } from './login/login.component';
import { MessagesComponent } from './messages/messages.component';
import { ProfileComponent } from './profile/profile.component';
import { ConfirmModalComponent, ConfirmModal } from './modal/confirm.component';


const appRoutes: Routes = [
{
Expand Down Expand Up @@ -67,14 +66,12 @@ const appRoutes: Routes = [
ProfileComponent,
MessagesComponent,
LoginComponent,
ConfirmModalComponent,
],
imports: [
BrowserModule,
HttpClientModule,
RouterModule.forRoot(appRoutes),
OktaAuthModule,
SuiModalModule,
],
providers: [
{
Expand All @@ -94,11 +91,9 @@ const appRoutes: Routes = [
triggerLogin();
} else {
// Ask the user to trigger the login process during token autoRenew process
const modalService = injector.get(SuiModalService);
modalService
.open(new ConfirmModal("Do you want to re-authenticate?", "Auth required", "Yes", "No"))
.onApprove(triggerLogin)
.onDeny(() => {});
if (window.confirm('Do you want to re-authenticate?')) {
triggerLogin();
}
}
}
}
Expand All @@ -107,6 +102,5 @@ const appRoutes: Routes = [
{ provide: APP_BASE_HREF, useValue: environment.appBaseHref },
],
bootstrap: [AppComponent],
entryComponents: [ConfirmModalComponent],
})
export class AppModule { }
1 change: 1 addition & 0 deletions custom-login/src/app/home/home.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ interface ResourceServerExample {

@Component({
selector: 'app-home',
standalone: false,
templateUrl: './home.component.html',
styleUrls: ['./home.component.css']
})
Expand Down
1 change: 1 addition & 0 deletions custom-login/src/app/login/login.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const DEFAULT_ORIGINAL_URI = window.location.origin;

@Component({
selector: 'app-login',
standalone: false,
templateUrl: './login.component.html',
styleUrls: ['./login.component.css']
})
Expand Down
1 change: 1 addition & 0 deletions custom-login/src/app/messages/messages.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ interface Message {

@Component({
selector: 'app-messages',
standalone: false,
templateUrl: './messages.component.html',
styleUrls: ['./messages.component.css']
})
Expand Down
48 changes: 0 additions & 48 deletions custom-login/src/app/modal/confirm.component.ts

This file was deleted.

1 change: 1 addition & 0 deletions custom-login/src/app/profile/profile.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ interface Claim {

@Component({
selector: 'app-profile',
standalone: false,
templateUrl: './profile.component.html',
styleUrls: ['./profile.component.css']
})
Expand Down
2 changes: 1 addition & 1 deletion custom-login/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
/***************************************************************************************************
* Zone JS is required by default for Angular itself.
*/
import 'zone.js/dist/zone'; // Included with Angular CLI.
import 'zone.js'; // Included with Angular CLI.


/***************************************************************************************************
Expand Down
1 change: 0 additions & 1 deletion custom-login/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"es2018",
"dom"
],
"useDefineForClassFields": false
},
"angularCompilerOptions": {
"enableI18nLegacyMessageIdFormat": false,
Expand Down
17 changes: 0 additions & 17 deletions okta-hosted-login/.browserslistrc

This file was deleted.

8 changes: 4 additions & 4 deletions okta-hosted-login/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,22 +89,22 @@
"serve": {
"builder": "@angular-builders/custom-webpack:dev-server",
"options": {
"browserTarget": "okta-hosted-login:build:develop",
"buildTarget": "okta-hosted-login:build:develop",
"port": 8080
},
"configurations": {
"production": {
"browserTarget": "okta-hosted-login:build:production"
"buildTarget": "okta-hosted-login:build:production"
},
"develop": {
"browserTarget": "okta-hosted-login:build:develop"
"buildTarget": "okta-hosted-login:build:develop"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "okta-hosted-login:build"
"buildTarget": "okta-hosted-login:build"
}
},
"test": {
Expand Down
35 changes: 17 additions & 18 deletions okta-hosted-login/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,26 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~15.2.0",
"@angular/common": "~15.2.0",
"@angular/compiler": "~15.2.0",
"@angular/core": "~15.2.0",
"@angular/forms": "~15.2.0",
"@angular/platform-browser": "~15.2.0",
"@angular/platform-browser-dynamic": "~15.2.0",
"@angular/router": "~15.2.0",
"@giomamaladze/ng2-semantic-ui": "^1.0.1",
"@okta/okta-angular": "^6.0.0",
"@okta/okta-auth-js": "^7.9.0",
"rxjs": "~6.6.7",
"@angular/animations": "~19.2.17",
"@angular/common": "~19.2.17",
"@angular/compiler": "~19.2.17",
"@angular/core": "~19.2.17",
"@angular/forms": "~19.2.17",
"@angular/platform-browser": "~19.2.17",
"@angular/platform-browser-dynamic": "~19.2.17",
"@angular/router": "~19.2.17",
"@okta/okta-angular": "^7.0.0",
"@okta/okta-auth-js": "7.14.1",
"rxjs": "~7.4.0",
"semantic-ui-css": "^2.4.1",
"tslib": "^2.4.0",
"zone.js": "~0.11.4"
"zone.js": "~0.15.0"
},
"devDependencies": {
"@angular-builders/custom-webpack": "^15.0.0",
"@angular-devkit/build-angular": "~15.2.11",
"@angular/cli": "~15.2.0",
"@angular/compiler-cli": "~15.2.0",
"@angular-builders/custom-webpack": "^19.0.1",
"@angular-devkit/build-angular": "~19.2.17",
"@angular/cli": "~19.2.17",
"@angular/compiler-cli": "~19.2.17",
"@types/jasmine": "~3.6.0",
"@types/node": "^12.11.1",
"@types/text-encoding": "0.0.36",
Expand All @@ -42,6 +41,6 @@
"text-encoding": "^0.7.0",
"ts-node": "~10.9.1",
"tslint": "~6.1.3",
"typescript": "~4.8.3"
"typescript": "~5.5.4"
}
}
Loading