Skip to content
This repository was archived by the owner on Dec 14, 2023. It is now read-only.

Commit 35476b3

Browse files
authored
Merge pull request #304 from CoderDojo/revert-303-revert-301-remove-zen-auth
Revert "Revert "Remove zen auth""
2 parents 0a7b1f9 + 6439bd4 commit 35476b3

27 files changed

+26
-1664
lines changed

.circleci/config.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,17 +140,18 @@ jobs:
140140
git config --global user.name "CoderDojo Foundation"
141141
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
142142
yarn config set version-git-message "[skip ci] Update to %s" # Skip CI or infinite loop
143-
yarn config set version-commit-hooks false # We're after the tests
143+
yarn config set version-commit-hooks false # We're after the tests
144144
- run:
145145
name: publish to git and npm
146146
command: |
147-
yarn version --patch
147+
yarn version --patch
148148
git push
149149
yarn publish --non-interactive
150-
- run: {
151-
"name": "update_platform",
152-
"command": "sh .circleci/update_platform.sh $(node build/get-version.js) master"
153-
}
150+
# disable this for now. 18/05/2020
151+
# - run: {
152+
# "name": "update_platform",
153+
# "command": "sh .circleci/update_platform.sh $(node build/get-version.js) master"
154+
# }
154155
workflows:
155156
version: 2
156157
build-test-and-deploy:

cypress-e2e.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

cypress-spa-server.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ const app = express();
77
// serve static assets normally
88
app.use(express.static(path.resolve(__dirname, 'dist')));
99

10-
// block known api route causing looping redirect
11-
app.get('/rpi/*', (request, response) => {
10+
// block known api routes causing looping redirect
11+
app.get(['/rpi/*', '/login', '/logout', '/register'], (request, response) => {
1212
response.send('fin.');
1313
});
1414

cypress/fixtures/loginFail.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

cypress/fixtures/loginRaspberryFail.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

cypress/fixtures/loginSuccess.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

cypress/integration/authentication/login_spec.js

Lines changed: 0 additions & 141 deletions
This file was deleted.

cypress/integration_e2e/authentication/login_out_journey_spec.js

Lines changed: 0 additions & 40 deletions
This file was deleted.

cypress/integration_e2e/authentication/register_login_out_journey_spec.js

Lines changed: 0 additions & 51 deletions
This file was deleted.

cypress/pages/login.js

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)