Skip to content

Commit

Permalink
Merge branch 'release/v0.7.8' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
musicEnfanthen committed Oct 13, 2020
2 parents 6491292 + dde4889 commit 20bc785
Show file tree
Hide file tree
Showing 7 changed files with 111 additions and 13 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
name: CI Tests

on:
push:
workflow_run:
workflows: ['CodeQL']
branches:
- '**'
- '!master' # do not run on master
tags-ignore:
- '*'
paths-ignore:
- '**.md' # ignore changes to markdown files
types:
- completed

jobs:
test:
Expand Down
71 changes: 71 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
name: 'CodeQL'

on:
push:
branches:
- '**'
tags-ignore:
- '*'
paths-ignore:
- '**.md' # ignore changes to markdown files

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
# Override automatic language detection by changing the below list
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
language: ['javascript']
# Learn more...
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
8 changes: 5 additions & 3 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
name: Deployment

on:
push:
branches:
- master # generally, only deploy if we are on 'master'
workflow_run:
workflows: ['CI Tests']
branches: [master] # generally, only deploy on 'master'
types:
- completed

jobs:
build:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [0.7.8](https://github.com/webern-unibas-ch/awg-app/compare/v0.7.7...v0.7.8) (2020-10-13)

### Bug Fixes

- **core:** make postmessaging in GndService more restrict ([69120b6](https://github.com/webern-unibas-ch/awg-app/commit/69120b674d4718dc439b6a7923c8a0df11182e7d))

### [0.7.7](https://github.com/webern-unibas-ch/awg-app/compare/v0.7.6...v0.7.7) (2020-10-09)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "awg-app",
"version": "0.7.7",
"version": "0.7.8",
"license": "MIT",
"author": {
"name": "Stefan Münnich",
Expand Down
6 changes: 3 additions & 3 deletions src/app/app.globals.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// THIS IS AN AUTO-GENERATED FILE. DO NOT CHANGE IT MANUALLY!
// Generated last time on Fri Oct 9 14:23:30 CEST 2020
// Generated last time on Tue Oct 13 15:32:01 CEST 2020

/**
* The latest version of the AWG App
*/
export const appVersion = '0.7.7';
export const appVersion = '0.7.8';

/**
* The release date of the latest version of the AWG App
*/
export const appVersionReleaseDate = '09. Oktober 2020';
export const appVersionReleaseDate = '13. Oktober 2020';

/**
* The URL of the AWG App
Expand Down
25 changes: 21 additions & 4 deletions src/app/core/services/gnd-service/gnd.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,27 @@ export class GndService extends StorageService {
* @return {void} Sends the postMessage to the parent window.
*/
private exposeGndMessageToParent(value: string): void {
const parentTargets = [AppConfig.LOCALHOST_URL, AppConfig.INSERI_TEST_URL];

for (const target of parentTargets) {
window.parent.window.postMessage({ gnd: value }, target);
const localTarget = AppConfig.LOCALHOST_URL;
const nieTarget = AppConfig.INSERI_TEST_URL;
const parentTargets = [localTarget, nieTarget];
const LOCAL_DOMAINS = ['localhost', '127.0.0.1', ''];

if (window.location !== window.parent.location || window.self !== window.top) {
/*
* the page is running in an iFrame,
* posting will be only allowed to localhost (develop) or NIE-INE (production)
*/
for (const target of parentTargets) {
window.parent.window.postMessage({ gnd: value }, target);
}
} else {
/*
* the page is not running in an iFrame,
* posting will be only allowed from and to localhost
*/
if (LOCAL_DOMAINS.includes(window.location.hostname)) {
window.postMessage({ gnd: value }, localTarget);
}
}
}

Expand Down

0 comments on commit 20bc785

Please sign in to comment.