Skip to content

Merge updates from master into dev #37

New issue

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

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

Already on GitHub? # to your account

Merged
merged 7 commits into from
Aug 28, 2020
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
30 changes: 30 additions & 0 deletions .github/workflows/manual.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# This is a basic workflow that is manually triggered

name: Send Review Message

# Controls when the action will run. Workflow runs when manually triggered using the UI
# or API.
on:
workflow_dispatch:
# Inputs the workflow accepts.
inputs:
name:
# Friendly description to be shown in the UI instead of 'name'
description: 'Release name'
# Default value if no value is explicitly provided
default: '100'
# Input has to be provided for the workflow to run
required: true

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "greet"
reviewMessage:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Runs a single command using the runners shell
- name: Send review message
run: echo "This PR for release ${{ github.event.inputs.name }} needs review from the community. Check out the changelog and provide your feedback!"
19 changes: 19 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Mark stale issues and pull requests

on:
schedule:
- cron: "30 1 * * *"

jobs:
stale:

runs-on: ubuntu-latest

steps:
- uses: actions/stale@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'Closing this issue due to no activity. Feel free to reopen.'
stale-pr-message: 'Closing this PR due to no activity. Feel free to reopen.'
stale-issue-label: 'no-issue-activity'
stale-pr-label: 'no-pr-activity'
2 changes: 1 addition & 1 deletion companion-packages/meteorrn-local/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const Local = {
else {
await _storeLocalCol();
}
}
};

const loadData = async () => {

Expand Down
4 changes: 2 additions & 2 deletions companion-packages/meteorrn-ndev-mfa/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Meteor, { Accounts } from '@meteorrn/core';

import {authorizeActionChallengeHandler, authorizeActionCompletionHandler, resetPasswordCheckMFARequired, registrationChallengeHandlerTOTP, registrationCompletionHandlerTOTP, resetPasswordChallengeHandler, registrationChallengeHandlerU2F, registerCompletionHandlerU2F, loginChallengeHandler, loginCompletionHandler } from './method-names';
import { loginChallengeHandler, loginCompletionHandler } from './method-names';

let useU2FAuthorizationCode = function (code) {
if(typeof(code) !== "string" || code.length !== 6) {
Expand All @@ -26,7 +26,7 @@ let assembleChallengeCompletionArguments = async function (finishLoginParams, co
assertion = {challengeId, challengeSecret, ...code};
}
else {
assertion = await solveU2FChallenge(res);
throw new Error("Code must be a U2FAuthorizationCode");
}
methodArguments.push(assertion);
}
Expand Down
2 changes: 1 addition & 1 deletion examples/#.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { withTracker, Meteor } from 'meteor-react-native';

class Login extends React.Component {

state = {email:"", password:"", loading:false};
state = {email:"", password:""};

onLogin = () => {
let { email, password } = this.state;
Expand Down
2 changes: 1 addition & 1 deletion lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export function uniqueId() {

export function hashPassword(password) {
return {
digest: SHA256(password).toString(),
digest: SHA256(password).toString(), // lgtm [js/insufficient-password-hash]
algorithm: 'sha-256',
};
}
Expand Down
2 changes: 0 additions & 2 deletions src/Collection.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ export class Collection {
update(id, modifier, options = {}, callback = () => {}) {
if (typeof options == 'function') {
callback = options;
options = {};
}

if (!this._collection.get(id))
Expand Down Expand Up @@ -202,7 +201,6 @@ export class Collection {
}

helpers(helpers) {
var self = this;
let _transform;

if (this._transform && !this._helpers) _transform = this._transform;
Expand Down
2 changes: 0 additions & 2 deletions src/ReactiveDict.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ export default class ReactiveDict {
)
throw new Error('ReactiveDict.equals: value must be scalar');

const serializedValue = stringify(value);

let oldValue = undefined;
if (Object.keys(this.keys).indexOf(key) != -1) {
oldValue = parse(this.keys[key]);
Expand Down