diff --git a/.prettierignore b/.prettierignore index a8d4530db99..45ba88688da 100644 --- a/.prettierignore +++ b/.prettierignore @@ -3,3 +3,4 @@ CHANGELOG.md spec fixtures +internal/httpclient/ diff --git a/Makefile b/Makefile index bdf10634d32..b3a37b5fc87 100644 --- a/Makefile +++ b/Makefile @@ -41,8 +41,8 @@ docs/cli: .bin/clidoc curl https://raw.githubusercontent.com/ory/ci/master/licenses/install | sh .bin/ory: Makefile - bash <(curl https://raw.githubusercontent.com/ory/meta/master/install.sh) -d -b .bin ory v0.1.22 - touch -a -m .bin/ory + curl https://raw.githubusercontent.com/ory/meta/master/install.sh | bash -s -- -b .bin ory v0.1.47 + touch .bin/ory .PHONY: lint lint: .bin/golangci-lint @@ -94,7 +94,8 @@ quicktest-hsm: # Formats the code .PHONY: format -format: .bin/goimports node_modules +format: .bin/goimports .bin/ory node_modules + .bin/ory dev headers license --exclude=internal/httpclient .bin/goimports -w --local github.com/ory . npm exec -- prettier --write . diff --git a/client/client.go b/client/client.go index ec65623d2d8..0a56836253c 100644 --- a/client/client.go +++ b/client/client.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package client diff --git a/client/client_test.go b/client/client_test.go index fc546a30c6a..b51527a050c 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package client diff --git a/client/error.go b/client/error.go index b1cc5f12fae..45fd03925cf 100644 --- a/client/error.go +++ b/client/error.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package client import ( diff --git a/client/handler.go b/client/handler.go index 7215f17485e..5f020f23b4e 100644 --- a/client/handler.go +++ b/client/handler.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package client diff --git a/client/handler_test.go b/client/handler_test.go index 4e1288758ab..e8d060495ed 100644 --- a/client/handler_test.go +++ b/client/handler_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package client_test import ( diff --git a/client/manager.go b/client/manager.go index 16150eb51ad..ad8cca7df51 100644 --- a/client/manager.go +++ b/client/manager.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package client diff --git a/client/manager_test_helpers.go b/client/manager_test_helpers.go index 5b820be66ae..c3394ecf2d0 100644 --- a/client/manager_test_helpers.go +++ b/client/manager_test_helpers.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package client diff --git a/client/registry.go b/client/registry.go index 7d515475a5d..707be5c9f7e 100644 --- a/client/registry.go +++ b/client/registry.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package client import ( diff --git a/client/sdk_test.go b/client/sdk_test.go index e2f909fe213..f0458c44681 100644 --- a/client/sdk_test.go +++ b/client/sdk_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package client_test diff --git a/client/validator.go b/client/validator.go index 9b4b5204acb..a2d032cec1c 100644 --- a/client/validator.go +++ b/client/validator.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package client diff --git a/client/validator_test.go b/client/validator_test.go index cdda2da1247..98be4ab4f94 100644 --- a/client/validator_test.go +++ b/client/validator_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package client_test diff --git a/cmd/cli/error.go b/cmd/cli/error.go index 7beb154c236..2354273119f 100644 --- a/cmd/cli/error.go +++ b/cmd/cli/error.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cli import ( diff --git a/cmd/cli/handler.go b/cmd/cli/handler.go index 9116b5aa04f..bc452ab15d6 100644 --- a/cmd/cli/handler.go +++ b/cmd/cli/handler.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cli diff --git a/cmd/cli/handler_helper.go b/cmd/cli/handler_helper.go index a24e7076946..836f2322792 100644 --- a/cmd/cli/handler_helper.go +++ b/cmd/cli/handler_helper.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cli diff --git a/cmd/cli/handler_janitor.go b/cmd/cli/handler_janitor.go index 07cc6061aeb..bec0401fe36 100644 --- a/cmd/cli/handler_janitor.go +++ b/cmd/cli/handler_janitor.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cli import ( diff --git a/cmd/cli/handler_janitor_test.go b/cmd/cli/handler_janitor_test.go index 4413f2a2bac..c99440c23b1 100644 --- a/cmd/cli/handler_janitor_test.go +++ b/cmd/cli/handler_janitor_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cli_test import ( diff --git a/cmd/cli/handler_jwk.go b/cmd/cli/handler_jwk.go index d314b926241..0845fe5c1fe 100644 --- a/cmd/cli/handler_jwk.go +++ b/cmd/cli/handler_jwk.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cli diff --git a/cmd/cli/handler_jwk_test.go b/cmd/cli/handler_jwk_test.go index 5eb97ccdb2b..ea83d9dfc5f 100644 --- a/cmd/cli/handler_jwk_test.go +++ b/cmd/cli/handler_jwk_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cli import ( diff --git a/cmd/cli/handler_migrate.go b/cmd/cli/handler_migrate.go index 6252d22ecf8..23d3c8ad925 100644 --- a/cmd/cli/handler_migrate.go +++ b/cmd/cli/handler_migrate.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cli import ( diff --git a/cmd/cliclient/client.go b/cmd/cliclient/client.go index dd85cec24ee..41057cb5e39 100644 --- a/cmd/cliclient/client.go +++ b/cmd/cliclient/client.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cliclient import ( diff --git a/cmd/clidoc/main.go b/cmd/clidoc/main.go index 37ea88b3e40..4987677e34d 100644 --- a/cmd/clidoc/main.go +++ b/cmd/clidoc/main.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package main import ( diff --git a/cmd/cmd_create_client.go b/cmd/cmd_create_client.go index f7589beb37f..84a1a61c6c0 100644 --- a/cmd/cmd_create_client.go +++ b/cmd/cmd_create_client.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/cmd_create_client_test.go b/cmd/cmd_create_client_test.go index 38587840e72..8e21f4f221d 100644 --- a/cmd/cmd_create_client_test.go +++ b/cmd/cmd_create_client_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd_test import ( diff --git a/cmd/cmd_create_jwks.go b/cmd/cmd_create_jwks.go index d0f98ee63bf..57138555147 100644 --- a/cmd/cmd_create_jwks.go +++ b/cmd/cmd_create_jwks.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/cmd_create_jwks_test.go b/cmd/cmd_create_jwks_test.go index 191cdbae682..d9e07d51d24 100644 --- a/cmd/cmd_create_jwks_test.go +++ b/cmd/cmd_create_jwks_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd_test import ( diff --git a/cmd/cmd_delete.go b/cmd/cmd_delete.go index 56b2a75732c..e1694cb461a 100644 --- a/cmd/cmd_delete.go +++ b/cmd/cmd_delete.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/cmd_delete_client.go b/cmd/cmd_delete_client.go index 19697f3a295..ad129c74eb6 100644 --- a/cmd/cmd_delete_client.go +++ b/cmd/cmd_delete_client.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/cmd_delete_client_test.go b/cmd/cmd_delete_client_test.go index 439545a56fe..4acc8f850a5 100644 --- a/cmd/cmd_delete_client_test.go +++ b/cmd/cmd_delete_client_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd_test import ( diff --git a/cmd/cmd_delete_jwks.go b/cmd/cmd_delete_jwks.go index deddb16a814..d9165422103 100644 --- a/cmd/cmd_delete_jwks.go +++ b/cmd/cmd_delete_jwks.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/cmd_delete_jwks_test.go b/cmd/cmd_delete_jwks_test.go index a56f6a7c84f..91fe3feee4a 100644 --- a/cmd/cmd_delete_jwks_test.go +++ b/cmd/cmd_delete_jwks_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd_test import ( diff --git a/cmd/cmd_delete_tokens.go b/cmd/cmd_delete_tokens.go index 149245aab6b..59c9d917fc2 100644 --- a/cmd/cmd_delete_tokens.go +++ b/cmd/cmd_delete_tokens.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/cmd_delete_tokens_test.go b/cmd/cmd_delete_tokens_test.go index d52dc0eb520..f965aa7cbf5 100644 --- a/cmd/cmd_delete_tokens_test.go +++ b/cmd/cmd_delete_tokens_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd_test import ( diff --git a/cmd/cmd_get.go b/cmd/cmd_get.go index b4d66cf19f8..9969b94a5cd 100644 --- a/cmd/cmd_get.go +++ b/cmd/cmd_get.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/cmd_get_client.go b/cmd/cmd_get_client.go index 46d83821601..e2d4c1471dd 100644 --- a/cmd/cmd_get_client.go +++ b/cmd/cmd_get_client.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/cmd_get_client_test.go b/cmd/cmd_get_client_test.go index 87b98c84ed1..05b0686cfc0 100644 --- a/cmd/cmd_get_client_test.go +++ b/cmd/cmd_get_client_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd_test import ( diff --git a/cmd/cmd_get_jwks.go b/cmd/cmd_get_jwks.go index 67d57935bb6..327fc8420c9 100644 --- a/cmd/cmd_get_jwks.go +++ b/cmd/cmd_get_jwks.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/cmd_get_jwks_test.go b/cmd/cmd_get_jwks_test.go index f36f1e6c417..8b37e61ecd9 100644 --- a/cmd/cmd_get_jwks_test.go +++ b/cmd/cmd_get_jwks_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd_test import ( diff --git a/cmd/cmd_helper_client.go b/cmd/cmd_helper_client.go index 42aedc46614..d625731b407 100644 --- a/cmd/cmd_helper_client.go +++ b/cmd/cmd_helper_client.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/cmd_helper_test.go b/cmd/cmd_helper_test.go index 73a3dea1ea2..bec0041e023 100644 --- a/cmd/cmd_helper_test.go +++ b/cmd/cmd_helper_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd_test import ( diff --git a/cmd/cmd_import.go b/cmd/cmd_import.go index c29d93a624c..fbb3606b3ef 100644 --- a/cmd/cmd_import.go +++ b/cmd/cmd_import.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/cmd_import_client.go b/cmd/cmd_import_client.go index df64793443b..9415862410b 100644 --- a/cmd/cmd_import_client.go +++ b/cmd/cmd_import_client.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/cmd_import_client_test.go b/cmd/cmd_import_client_test.go index 3753ff37f4b..d979aa57fed 100644 --- a/cmd/cmd_import_client_test.go +++ b/cmd/cmd_import_client_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd_test import ( diff --git a/cmd/cmd_import_jwk.go b/cmd/cmd_import_jwk.go index 10d5c155cf9..c597257c211 100644 --- a/cmd/cmd_import_jwk.go +++ b/cmd/cmd_import_jwk.go @@ -1,16 +1,5 @@ -// Copyright © 2018 NAME HERE -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/cmd_import_jwk_test.go b/cmd/cmd_import_jwk_test.go index c2da97fd5a5..c7584489dd8 100644 --- a/cmd/cmd_import_jwk_test.go +++ b/cmd/cmd_import_jwk_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd_test import ( diff --git a/cmd/cmd_introspect.go b/cmd/cmd_introspect.go index a799f342f35..f5fcba63d1e 100644 --- a/cmd/cmd_introspect.go +++ b/cmd/cmd_introspect.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/cmd_introspect_token.go b/cmd/cmd_introspect_token.go index 3e4299bba34..8b64dcda7dc 100644 --- a/cmd/cmd_introspect_token.go +++ b/cmd/cmd_introspect_token.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/cmd_introspect_token_test.go b/cmd/cmd_introspect_token_test.go index f154db3c355..77f32275caa 100644 --- a/cmd/cmd_introspect_token_test.go +++ b/cmd/cmd_introspect_token_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd_test import ( diff --git a/cmd/cmd_list.go b/cmd/cmd_list.go index 4bb3086281a..f6669c8474c 100644 --- a/cmd/cmd_list.go +++ b/cmd/cmd_list.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/cmd_list_clients.go b/cmd/cmd_list_clients.go index 1c716f68b41..f848a5c1dfd 100644 --- a/cmd/cmd_list_clients.go +++ b/cmd/cmd_list_clients.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/cmd_list_clients_test.go b/cmd/cmd_list_clients_test.go index 3dabc562e06..87f875d7a3f 100644 --- a/cmd/cmd_list_clients_test.go +++ b/cmd/cmd_list_clients_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd_test import ( diff --git a/cmd/cmd_perform.go b/cmd/cmd_perform.go index 37b1773fdd3..d00d6a630bd 100644 --- a/cmd/cmd_perform.go +++ b/cmd/cmd_perform.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/cmd_perform_authorization_code.go b/cmd/cmd_perform_authorization_code.go index 12e17c32f47..f077efda32c 100644 --- a/cmd/cmd_perform_authorization_code.go +++ b/cmd/cmd_perform_authorization_code.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/cmd_perform_client_credentials.go b/cmd/cmd_perform_client_credentials.go index d08e1093d2c..ac645b30532 100644 --- a/cmd/cmd_perform_client_credentials.go +++ b/cmd/cmd_perform_client_credentials.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/cmd_perform_client_credentials_test.go b/cmd/cmd_perform_client_credentials_test.go index ec979247f06..6026e352944 100644 --- a/cmd/cmd_perform_client_credentials_test.go +++ b/cmd/cmd_perform_client_credentials_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd_test import ( diff --git a/cmd/cmd_revoke.go b/cmd/cmd_revoke.go index f4cc1bd7368..62c5ff92878 100644 --- a/cmd/cmd_revoke.go +++ b/cmd/cmd_revoke.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/cmd_revoke_token.go b/cmd/cmd_revoke_token.go index 1671045e036..cbb30c99e6c 100644 --- a/cmd/cmd_revoke_token.go +++ b/cmd/cmd_revoke_token.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/cmd_revoke_token_test.go b/cmd/cmd_revoke_token_test.go index 1db075c7185..fec8078386e 100644 --- a/cmd/cmd_revoke_token_test.go +++ b/cmd/cmd_revoke_token_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd_test import ( diff --git a/cmd/cmd_update.go b/cmd/cmd_update.go index 3ca00d4e392..b3efa64d06a 100644 --- a/cmd/cmd_update.go +++ b/cmd/cmd_update.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/cmd_update_client.go b/cmd/cmd_update_client.go index 6414b111c84..1067b861b1d 100644 --- a/cmd/cmd_update_client.go +++ b/cmd/cmd_update_client.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/cmd_update_client_test.go b/cmd/cmd_update_client_test.go index 7145bd9d1c7..e52638ace73 100644 --- a/cmd/cmd_update_client_test.go +++ b/cmd/cmd_update_client_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd_test import ( diff --git a/cmd/create.go b/cmd/create.go index cee73ad10f1..9e4d1712c03 100644 --- a/cmd/create.go +++ b/cmd/create.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/helper.go b/cmd/helper.go index 30ddf45beef..1a0520c19e6 100644 --- a/cmd/helper.go +++ b/cmd/helper.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/helper_test.go b/cmd/helper_test.go index 78b722a8833..ac4e0364815 100644 --- a/cmd/helper_test.go +++ b/cmd/helper_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/janitor.go b/cmd/janitor.go index 16588cebc22..31ffd4e7a63 100644 --- a/cmd/janitor.go +++ b/cmd/janitor.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/migrate.go b/cmd/migrate.go index 799fb81b055..60756f5e635 100644 --- a/cmd/migrate.go +++ b/cmd/migrate.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/migrate_gen.go b/cmd/migrate_gen.go index 2fbb8586b9f..05a46fa6c87 100644 --- a/cmd/migrate_gen.go +++ b/cmd/migrate_gen.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/migrate_sql.go b/cmd/migrate_sql.go index 223454009ca..4b03588cf04 100644 --- a/cmd/migrate_sql.go +++ b/cmd/migrate_sql.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/output_client.go b/cmd/output_client.go index d4ca7ca5000..f10c52951b8 100644 --- a/cmd/output_client.go +++ b/cmd/output_client.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/output_introspection.go b/cmd/output_introspection.go index cdd658c6891..c2236c5baa2 100644 --- a/cmd/output_introspection.go +++ b/cmd/output_introspection.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/output_jwks.go b/cmd/output_jwks.go index d5fc3a7885b..ac85c84246e 100644 --- a/cmd/output_jwks.go +++ b/cmd/output_jwks.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/output_token.go b/cmd/output_token.go index 07db51c6be0..c91add12cb5 100644 --- a/cmd/output_token.go +++ b/cmd/output_token.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/root.go b/cmd/root.go index 8ef4c80348c..082e9553877 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/root_test.go b/cmd/root_test.go index dd5d1c1b74c..3ff077493d9 100644 --- a/cmd/root_test.go +++ b/cmd/root_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cmd/serve.go b/cmd/serve.go index 992bcddc50c..a122e09a0c7 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/serve_admin.go b/cmd/serve_admin.go index 79eb20d936d..28de0576ac7 100644 --- a/cmd/serve_admin.go +++ b/cmd/serve_admin.go @@ -1,16 +1,5 @@ -// Copyright © 2018 NAME HERE -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/serve_all.go b/cmd/serve_all.go index 1f92fafc8d8..229c919d7b3 100644 --- a/cmd/serve_all.go +++ b/cmd/serve_all.go @@ -1,16 +1,5 @@ -// Copyright © 2018 NAME HERE -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/serve_public.go b/cmd/serve_public.go index 2f82a42a486..e09311b16fe 100644 --- a/cmd/serve_public.go +++ b/cmd/serve_public.go @@ -1,16 +1,5 @@ -// Copyright © 2018 NAME HERE -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/cmd/server/banner.go b/cmd/server/banner.go index af726d5c2db..230420b798c 100644 --- a/cmd/server/banner.go +++ b/cmd/server/banner.go @@ -1,29 +1,12 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package server func banner(version string) string { return `Thank you for using Ory Hydra ` + version + `! -Take security seriously and subscribe to the Ory Security Newsletter. Stay on top of new patches and security insights. +Take security seriously and subscribe to the Ory Security Newsletter. Stay on top of new patches and security insights. >> Subscribe now: http://eepurl.com/di390P <<` } diff --git a/cmd/server/handler.go b/cmd/server/handler.go index 80125659a51..79d25bab550 100644 --- a/cmd/server/handler.go +++ b/cmd/server/handler.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package server diff --git a/cmd/server/helper_cert.go b/cmd/server/helper_cert.go index ddbd5293b88..e85f27ea296 100644 --- a/cmd/server/helper_cert.go +++ b/cmd/server/helper_cert.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package server diff --git a/cmd/server/helper_cert_test.go b/cmd/server/helper_cert_test.go index 06afcac6ee6..c9e2a24fd0d 100644 --- a/cmd/server/helper_cert_test.go +++ b/cmd/server/helper_cert_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package server_test import ( diff --git a/cmd/version.go b/cmd/version.go index ae6e287a4f9..0caf3a315dd 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package cmd diff --git a/consent/handler.go b/consent/handler.go index 4490e019811..f91e1222e9d 100644 --- a/consent/handler.go +++ b/consent/handler.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package consent diff --git a/consent/handler_test.go b/consent/handler_test.go index 66423ecf39b..e4ec92c354f 100644 --- a/consent/handler_test.go +++ b/consent/handler_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package consent_test diff --git a/consent/helper.go b/consent/helper.go index 4e136b9c767..42ed8963a6b 100644 --- a/consent/helper.go +++ b/consent/helper.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package consent diff --git a/consent/helper_test.go b/consent/helper_test.go index 2c5c805609b..86fcc15940c 100644 --- a/consent/helper_test.go +++ b/consent/helper_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package consent diff --git a/consent/janitor_consent_test_helper.go b/consent/janitor_consent_test_helper.go index 7d45c35adff..6467eb1a63d 100644 --- a/consent/janitor_consent_test_helper.go +++ b/consent/janitor_consent_test_helper.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package consent import ( diff --git a/consent/manager.go b/consent/manager.go index 88a06e5e5d7..15ab9785bea 100644 --- a/consent/manager.go +++ b/consent/manager.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package consent diff --git a/consent/manager_test_helpers.go b/consent/manager_test_helpers.go index cc9fffd7029..85a0f8b2b71 100644 --- a/consent/manager_test_helpers.go +++ b/consent/manager_test_helpers.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package consent diff --git a/consent/registry.go b/consent/registry.go index 2f9ed0387db..aa5fae8b758 100644 --- a/consent/registry.go +++ b/consent/registry.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package consent import ( diff --git a/consent/sdk_test.go b/consent/sdk_test.go index 250706f4b24..f4066c02bd1 100644 --- a/consent/sdk_test.go +++ b/consent/sdk_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package consent_test diff --git a/consent/strategy.go b/consent/strategy.go index cfd4cafbeee..3ae24d0172a 100644 --- a/consent/strategy.go +++ b/consent/strategy.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package consent diff --git a/consent/strategy_default.go b/consent/strategy_default.go index 2ba2cbf086b..d7edbf9fb69 100644 --- a/consent/strategy_default.go +++ b/consent/strategy_default.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package consent diff --git a/consent/strategy_default_test.go b/consent/strategy_default_test.go index 54038d38b87..123271fca8c 100644 --- a/consent/strategy_default_test.go +++ b/consent/strategy_default_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package consent_test diff --git a/consent/strategy_logout_test.go b/consent/strategy_logout_test.go index d228082232b..247720b18bb 100644 --- a/consent/strategy_logout_test.go +++ b/consent/strategy_logout_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package consent_test import ( diff --git a/consent/strategy_oauth_test.go b/consent/strategy_oauth_test.go index 564a62e673d..d85ac608673 100644 --- a/consent/strategy_oauth_test.go +++ b/consent/strategy_oauth_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package consent_test import ( diff --git a/consent/subject_identifier_algorithm.go b/consent/subject_identifier_algorithm.go index f0b77d8d65a..343ab7d458e 100644 --- a/consent/subject_identifier_algorithm.go +++ b/consent/subject_identifier_algorithm.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package consent diff --git a/consent/subject_identifier_algorithm_pairwise.go b/consent/subject_identifier_algorithm_pairwise.go index 45900c1a75d..b27f7690bb2 100644 --- a/consent/subject_identifier_algorithm_pairwise.go +++ b/consent/subject_identifier_algorithm_pairwise.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package consent diff --git a/consent/subject_identifier_algorithm_public.go b/consent/subject_identifier_algorithm_public.go index 150ebd28642..a73062f3d64 100644 --- a/consent/subject_identifier_algorithm_public.go +++ b/consent/subject_identifier_algorithm_public.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package consent diff --git a/consent/types.go b/consent/types.go index cb4f4587712..80fa2c6e88b 100644 --- a/consent/types.go +++ b/consent/types.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package consent diff --git a/consent/types_test.go b/consent/types_test.go index bfe91c77f2c..6366404d9e9 100644 --- a/consent/types_test.go +++ b/consent/types_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package consent import ( diff --git a/contrib/quickstart/gitlab/config/gitlab.rb b/contrib/quickstart/gitlab/config/gitlab.rb index ff3fbbf4c11..9540469d3bd 100644 --- a/contrib/quickstart/gitlab/config/gitlab.rb +++ b/contrib/quickstart/gitlab/config/gitlab.rb @@ -1,3 +1,6 @@ +# Copyright © 2022 Ory Corp +# SPDX-License-Identifier: Apache-2.0 + ## GitLab configuration settings ##! This file is generated during initial installation and **is not** modified ##! during upgrades. diff --git a/cypress/helpers/index.js b/cypress/helpers/index.js index 4dde323f12a..e8f11a9251f 100644 --- a/cypress/helpers/index.js +++ b/cypress/helpers/index.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + import { v4 as uuidv4 } from "uuid" export const prng = () => uuidv4() diff --git a/cypress/integration/admin/client_create.js b/cypress/integration/admin/client_create.js index 71795a447a2..34053c7fc00 100644 --- a/cypress/integration/admin/client_create.js +++ b/cypress/integration/admin/client_create.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + import { prng } from "../../helpers" describe("The Clients Admin Interface", function () { diff --git a/cypress/integration/admin/grant_jwtbearer.js b/cypress/integration/admin/grant_jwtbearer.js index bb45e12b010..d741f0a78a0 100644 --- a/cypress/integration/admin/grant_jwtbearer.js +++ b/cypress/integration/admin/grant_jwtbearer.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + const dayjs = require("dayjs") const isBetween = require("dayjs/plugin/isBetween") const utc = require("dayjs/plugin/utc") diff --git a/cypress/integration/oauth2/authorize_code.js b/cypress/integration/oauth2/authorize_code.js index 2c26c44eb6d..e204adc72ae 100644 --- a/cypress/integration/oauth2/authorize_code.js +++ b/cypress/integration/oauth2/authorize_code.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + import { prng } from "../../helpers" describe("The OAuth 2.0 Authorization Code Grant", function () { diff --git a/cypress/integration/oauth2/authorize_error.js b/cypress/integration/oauth2/authorize_error.js index e854f80283e..c537aa920dd 100644 --- a/cypress/integration/oauth2/authorize_error.js +++ b/cypress/integration/oauth2/authorize_error.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + import { createClient, prng } from "../../helpers" import qs from "querystring" diff --git a/cypress/integration/oauth2/client_creds.js b/cypress/integration/oauth2/client_creds.js index 1bb70da3281..a1419e8b1bd 100644 --- a/cypress/integration/oauth2/client_creds.js +++ b/cypress/integration/oauth2/client_creds.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + import { createClient, prng } from "../../helpers" describe("The OAuth 2.0 Authorization Code Grant", function () { diff --git a/cypress/integration/oauth2/consent.js b/cypress/integration/oauth2/consent.js index 093b8db5256..5e9829312d2 100644 --- a/cypress/integration/oauth2/consent.js +++ b/cypress/integration/oauth2/consent.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + import { createClient, prng } from "../../helpers" describe("OAuth 2.0 End-User Authorization", () => { diff --git a/cypress/integration/oauth2/grant_jwtbearer.js b/cypress/integration/oauth2/grant_jwtbearer.js index 7fda8e930c4..ccb2aac87aa 100644 --- a/cypress/integration/oauth2/grant_jwtbearer.js +++ b/cypress/integration/oauth2/grant_jwtbearer.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + import { createClient, createGrant, diff --git a/cypress/integration/oauth2/introspect.js b/cypress/integration/oauth2/introspect.js index 27a33b9dc7f..655b7fb4cfc 100644 --- a/cypress/integration/oauth2/introspect.js +++ b/cypress/integration/oauth2/introspect.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + import { prng } from "../../helpers" describe("OpenID Connect Token Introspection", () => { diff --git a/cypress/integration/oauth2/jwt.js b/cypress/integration/oauth2/jwt.js index f98ecaeb405..5054cfee0f2 100644 --- a/cypress/integration/oauth2/jwt.js +++ b/cypress/integration/oauth2/jwt.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + import { createClient, prng } from "../../helpers" describe("OAuth 2.0 JSON Web Token Access Tokens", () => { diff --git a/cypress/integration/oauth2/refresh_token.js b/cypress/integration/oauth2/refresh_token.js index e7f470f168c..a3b1c6282bf 100644 --- a/cypress/integration/oauth2/refresh_token.js +++ b/cypress/integration/oauth2/refresh_token.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + import { createClient, prng } from "../../helpers" describe("The OAuth 2.0 Refresh Token Grant", function () { diff --git a/cypress/integration/openid/authorize_code.js b/cypress/integration/openid/authorize_code.js index 77860bd46d8..96d2a594578 100644 --- a/cypress/integration/openid/authorize_code.js +++ b/cypress/integration/openid/authorize_code.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + import { prng } from "../../helpers" describe("OpenID Connect Authorize Code Grant", () => { diff --git a/cypress/integration/openid/dynamic_client_registration.js b/cypress/integration/openid/dynamic_client_registration.js index b304b364995..711e9fa6120 100644 --- a/cypress/integration/openid/dynamic_client_registration.js +++ b/cypress/integration/openid/dynamic_client_registration.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + describe("OAuth2 / OpenID Connect Dynamic Client Registration", function () { it("should return same client_secret given in request for newly created clients with client_secret specified", function () { cy.request({ diff --git a/cypress/integration/openid/logout.js b/cypress/integration/openid/logout.js index aa4249f3455..4495198d109 100644 --- a/cypress/integration/openid/logout.js +++ b/cypress/integration/openid/logout.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + import { deleteClients, prng } from "../../helpers" const nc = () => ({ diff --git a/cypress/integration/openid/prompt.js b/cypress/integration/openid/prompt.js index 7276128ae53..111784c982e 100644 --- a/cypress/integration/openid/prompt.js +++ b/cypress/integration/openid/prompt.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + import { createClient, prng } from "../../helpers" import qs from "querystring" diff --git a/cypress/integration/openid/revoke.js b/cypress/integration/openid/revoke.js index f50320f2baa..08c6bf29a1c 100644 --- a/cypress/integration/openid/revoke.js +++ b/cypress/integration/openid/revoke.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + import { prng } from "../../helpers" describe("OpenID Connect Token Revokation", () => { diff --git a/cypress/integration/openid/userinfo.js b/cypress/integration/openid/userinfo.js index 079d7d7e2a1..7df40c65772 100644 --- a/cypress/integration/openid/userinfo.js +++ b/cypress/integration/openid/userinfo.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + import { prng } from "../../helpers" describe("OpenID Connect Userinfo", () => { diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js index fd170fba691..e7641c8537f 100644 --- a/cypress/plugins/index.js +++ b/cypress/plugins/index.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + // *********************************************************** // This example plugins/index.js can be used to load plugins // diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 9b0095509f4..2f75293404d 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + // *********************************************** // This example commands.js shows you how to // create various custom commands and overwrite diff --git a/cypress/support/index.js b/cypress/support/index.js index a80764cb2cb..463e656ec22 100644 --- a/cypress/support/index.js +++ b/cypress/support/index.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + // *********************************************************** // This example support/index.js is processed and // loaded automatically before your test files. diff --git a/doc.go b/doc.go index 00e4a3c5f59..79c65fb44b0 100644 --- a/doc.go +++ b/doc.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 // Package main ORY Hydra package main diff --git a/driver/config/buildinfo.go b/driver/config/buildinfo.go index bd26334403b..54a89438783 100644 --- a/driver/config/buildinfo.go +++ b/driver/config/buildinfo.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package config var ( diff --git a/driver/config/config.go b/driver/config/config.go index 88f9b319e39..19f7e43afc4 100644 --- a/driver/config/config.go +++ b/driver/config/config.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package config type Provider interface { diff --git a/driver/config/helper.go b/driver/config/helper.go index e06bac84764..658143f6853 100644 --- a/driver/config/helper.go +++ b/driver/config/helper.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package config import ( diff --git a/driver/config/provider.go b/driver/config/provider.go index fcfd8fab19d..c0b07e3e2bf 100644 --- a/driver/config/provider.go +++ b/driver/config/provider.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package config import ( diff --git a/driver/config/provider_fosite.go b/driver/config/provider_fosite.go index 91938930477..07ba8d7c858 100644 --- a/driver/config/provider_fosite.go +++ b/driver/config/provider_fosite.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package config import ( diff --git a/driver/config/provider_test.go b/driver/config/provider_test.go index c9e556d40c7..e4911386f71 100644 --- a/driver/config/provider_test.go +++ b/driver/config/provider_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package config import ( diff --git a/driver/config/serve.go b/driver/config/serve.go index a07070e70f8..f37dcde41eb 100644 --- a/driver/config/serve.go +++ b/driver/config/serve.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package config import ( diff --git a/driver/config/tls.go b/driver/config/tls.go index 51ea8b054e2..078ef6ec26d 100644 --- a/driver/config/tls.go +++ b/driver/config/tls.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package config import ( diff --git a/driver/config/types.go b/driver/config/types.go index 190be1a35bf..717bd9db847 100644 --- a/driver/config/types.go +++ b/driver/config/types.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package config import ( diff --git a/driver/config/types_test.go b/driver/config/types_test.go index a8c38461ff3..e7fe500f91e 100644 --- a/driver/config/types_test.go +++ b/driver/config/types_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package config import ( diff --git a/driver/factory.go b/driver/factory.go index f83f5a6c331..8f7a09928a6 100644 --- a/driver/factory.go +++ b/driver/factory.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package driver import ( diff --git a/driver/registry.go b/driver/registry.go index 0ddbb1c47f0..f12dc429f0d 100644 --- a/driver/registry.go +++ b/driver/registry.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package driver import ( diff --git a/driver/registry_base.go b/driver/registry_base.go index 322d46b51e3..f7f204263ff 100644 --- a/driver/registry_base.go +++ b/driver/registry_base.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package driver import ( diff --git a/driver/registry_base_test.go b/driver/registry_base_test.go index bd281e5758b..ded3dcd1e56 100644 --- a/driver/registry_base_test.go +++ b/driver/registry_base_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package driver import ( diff --git a/driver/registry_nosqlite.go b/driver/registry_nosqlite.go index c13c5abf759..bd57c32359c 100644 --- a/driver/registry_nosqlite.go +++ b/driver/registry_nosqlite.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + //go:build !sqlite // +build !sqlite diff --git a/driver/registry_sql.go b/driver/registry_sql.go index a211fe3ce4c..8162b5c13c0 100644 --- a/driver/registry_sql.go +++ b/driver/registry_sql.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package driver import ( diff --git a/driver/registry_sql_test.go b/driver/registry_sql_test.go index b0417f9bcd9..3cd7cd33742 100644 --- a/driver/registry_sql_test.go +++ b/driver/registry_sql_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package driver import ( diff --git a/driver/registry_sqlite.go b/driver/registry_sqlite.go index 476c5ac07a1..bb39281b481 100644 --- a/driver/registry_sqlite.go +++ b/driver/registry_sqlite.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + //go:build sqlite // +build sqlite diff --git a/flow/flow.go b/flow/flow.go index 053a8736f8a..9915ed40719 100644 --- a/flow/flow.go +++ b/flow/flow.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package flow import ( diff --git a/flow/flow_test.go b/flow/flow_test.go index 9792cef28d1..86a0c757afd 100644 --- a/flow/flow_test.go +++ b/flow/flow_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package flow import ( diff --git a/fositex/config.go b/fositex/config.go index 3034b8f1cd8..db512574f94 100644 --- a/fositex/config.go +++ b/fositex/config.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package fositex import ( diff --git a/fositex/token_strategy.go b/fositex/token_strategy.go index 859a0d75f62..865451ac9ce 100644 --- a/fositex/token_strategy.go +++ b/fositex/token_strategy.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package fositex import ( diff --git a/go_mod_indirect_pins.go b/go_mod_indirect_pins.go index b25e8ff12bd..405389eee81 100644 --- a/go_mod_indirect_pins.go +++ b/go_mod_indirect_pins.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + //go:build go_mod_indirect_pins // +build go_mod_indirect_pins diff --git a/health/doc.go b/health/doc.go index 2ada4571212..bad9c42139c 100644 --- a/health/doc.go +++ b/health/doc.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package health // Alive returns an ok status if the instance is ready to handle HTTP requests. diff --git a/health/handler_test.go b/health/handler_test.go index e91fcaa32ff..ed0a91b0d37 100644 --- a/health/handler_test.go +++ b/health/handler_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package health import ( diff --git a/hsm/crypto11_mock_test.go b/hsm/crypto11_mock_test.go index d1828c51bba..72487f64782 100644 --- a/hsm/crypto11_mock_test.go +++ b/hsm/crypto11_mock_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + //go:build hsm // +build hsm diff --git a/hsm/hsm.go b/hsm/hsm.go index 56427650d06..38304962c9d 100644 --- a/hsm/hsm.go +++ b/hsm/hsm.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + //go:build hsm // +build hsm diff --git a/hsm/hsm_mock_test.go b/hsm/hsm_mock_test.go index 65502cf21c9..4a14243b973 100644 --- a/hsm/hsm_mock_test.go +++ b/hsm/hsm_mock_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + //go:build hsm // +build hsm diff --git a/hsm/manager_hsm.go b/hsm/manager_hsm.go index 7ac233f34e5..61dceb2b086 100644 --- a/hsm/manager_hsm.go +++ b/hsm/manager_hsm.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + //go:build hsm // +build hsm diff --git a/hsm/manager_hsm_test.go b/hsm/manager_hsm_test.go index 752cb1b30af..006459d9572 100644 --- a/hsm/manager_hsm_test.go +++ b/hsm/manager_hsm_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + //go:build hsm // +build hsm diff --git a/hsm/manager_nohsm.go b/hsm/manager_nohsm.go index 11460a79498..01e3a98b32a 100644 --- a/hsm/manager_nohsm.go +++ b/hsm/manager_nohsm.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + //go:build !hsm // +build !hsm diff --git a/internal/driver.go b/internal/driver.go index 89a3ab431a4..23dea1b66ca 100644 --- a/internal/driver.go +++ b/internal/driver.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package internal import ( diff --git a/internal/fosite_store.go b/internal/fosite_store.go index f820762bd9c..0960b0423c6 100644 --- a/internal/fosite_store.go +++ b/internal/fosite_store.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package internal import ( diff --git a/internal/mock/config_cookie.go b/internal/mock/config_cookie.go index 16c9c2bb323..5fab6d1d7dc 100644 --- a/internal/mock/config_cookie.go +++ b/internal/mock/config_cookie.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/hydra/x (interfaces: CookieConfigProvider) diff --git a/internal/mock_generator_rs256.go b/internal/mock_generator_rs256.go index ec1117356b2..c9c5bd9d526 100644 --- a/internal/mock_generator_rs256.go +++ b/internal/mock_generator_rs256.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package internal diff --git a/internal/testhelpers/certs.go b/internal/testhelpers/certs.go index ca6fd9970c8..372e4391f7b 100644 --- a/internal/testhelpers/certs.go +++ b/internal/testhelpers/certs.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package testhelpers import ( diff --git a/internal/testhelpers/janitor_test_helper.go b/internal/testhelpers/janitor_test_helper.go index 06194c0828f..5dc04e1e747 100644 --- a/internal/testhelpers/janitor_test_helper.go +++ b/internal/testhelpers/janitor_test_helper.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package testhelpers import ( diff --git a/internal/testhelpers/lifespans.go b/internal/testhelpers/lifespans.go index dda9244de3b..a3d24e42806 100644 --- a/internal/testhelpers/lifespans.go +++ b/internal/testhelpers/lifespans.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package testhelpers import ( diff --git a/internal/testhelpers/oauth2.go b/internal/testhelpers/oauth2.go index 07300456ca2..96a8d87761a 100644 --- a/internal/testhelpers/oauth2.go +++ b/internal/testhelpers/oauth2.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package testhelpers import ( diff --git a/internal/testhelpers/server.go b/internal/testhelpers/server.go index 7f2e605713a..108f21c69cf 100644 --- a/internal/testhelpers/server.go +++ b/internal/testhelpers/server.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package testhelpers import ( diff --git a/internal/testhelpers/uuid/uuid.go b/internal/testhelpers/uuid/uuid.go index 8488e08fe59..8fae25139ab 100644 --- a/internal/testhelpers/uuid/uuid.go +++ b/internal/testhelpers/uuid/uuid.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package uuid import ( diff --git a/jwk/aead.go b/jwk/aead.go index 92ce01344f8..3ca09979f32 100644 --- a/jwk/aead.go +++ b/jwk/aead.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package jwk diff --git a/jwk/aead_test.go b/jwk/aead_test.go index 3d8eb3de35a..7b69a644f77 100644 --- a/jwk/aead_test.go +++ b/jwk/aead_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package jwk_test diff --git a/jwk/cast.go b/jwk/cast.go index e16e5408110..7fc2b2c8906 100644 --- a/jwk/cast.go +++ b/jwk/cast.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package jwk diff --git a/jwk/cast_test.go b/jwk/cast_test.go index 8de67b52408..d55b81ba518 100644 --- a/jwk/cast_test.go +++ b/jwk/cast_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package jwk diff --git a/jwk/generate.go b/jwk/generate.go index d6c12ad82c0..e5a30592cc7 100644 --- a/jwk/generate.go +++ b/jwk/generate.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package jwk import ( diff --git a/jwk/generate_test.go b/jwk/generate_test.go index 0e930af424c..01a47d4ec67 100644 --- a/jwk/generate_test.go +++ b/jwk/generate_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package jwk import ( diff --git a/jwk/generator.go b/jwk/generator.go index 74b63c0fa18..03bdbd6a82d 100644 --- a/jwk/generator.go +++ b/jwk/generator.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package jwk diff --git a/jwk/handler.go b/jwk/handler.go index 10b25e5d122..07a7667db11 100644 --- a/jwk/handler.go +++ b/jwk/handler.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package jwk diff --git a/jwk/handler_test.go b/jwk/handler_test.go index 862c4a2ccba..67140e7dc25 100644 --- a/jwk/handler_test.go +++ b/jwk/handler_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package jwk_test diff --git a/jwk/helper.go b/jwk/helper.go index 5248bafcd29..2506074764b 100644 --- a/jwk/helper.go +++ b/jwk/helper.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package jwk diff --git a/jwk/helper_test.go b/jwk/helper_test.go index cd17b3ae80b..fa77b917cbd 100644 --- a/jwk/helper_test.go +++ b/jwk/helper_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package jwk_test diff --git a/jwk/jwt_strategy.go b/jwk/jwt_strategy.go index 4f685e97261..76792578e24 100644 --- a/jwk/jwt_strategy.go +++ b/jwk/jwt_strategy.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package jwk diff --git a/jwk/jwt_strategy_test.go b/jwk/jwt_strategy_test.go index 25a9fda10d8..5a71febb89c 100644 --- a/jwk/jwt_strategy_test.go +++ b/jwk/jwt_strategy_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package jwk_test diff --git a/jwk/manager.go b/jwk/manager.go index 2a5ec35a401..3ab298b43e5 100644 --- a/jwk/manager.go +++ b/jwk/manager.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package jwk diff --git a/jwk/manager_mock_test.go b/jwk/manager_mock_test.go index b91641dedee..4e3dc82f03f 100644 --- a/jwk/manager_mock_test.go +++ b/jwk/manager_mock_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + // Code generated by MockGen. DO NOT EDIT. // Source: jwk/manager.go diff --git a/jwk/manager_strategy.go b/jwk/manager_strategy.go index 8fc9cab25a0..0119d9eeecf 100644 --- a/jwk/manager_strategy.go +++ b/jwk/manager_strategy.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package jwk import ( diff --git a/jwk/manager_strategy_test.go b/jwk/manager_strategy_test.go index 2f7fac444fb..452273a123b 100644 --- a/jwk/manager_strategy_test.go +++ b/jwk/manager_strategy_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package jwk_test import ( diff --git a/jwk/manager_test_helpers.go b/jwk/manager_test_helpers.go index d61cc51e9b5..26f94cd5539 100644 --- a/jwk/manager_test_helpers.go +++ b/jwk/manager_test_helpers.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package jwk diff --git a/jwk/registry.go b/jwk/registry.go index b7981a7c9e2..1fa8ae42d51 100644 --- a/jwk/registry.go +++ b/jwk/registry.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package jwk import ( diff --git a/jwk/registry_mock_test.go b/jwk/registry_mock_test.go index 28881c2b891..7188054e5c7 100644 --- a/jwk/registry_mock_test.go +++ b/jwk/registry_mock_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + // Code generated by MockGen. DO NOT EDIT. // Source: jwk/registry.go diff --git a/jwk/sdk_test.go b/jwk/sdk_test.go index aaf059bbf7a..39bcfa2892f 100644 --- a/jwk/sdk_test.go +++ b/jwk/sdk_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package jwk_test diff --git a/main.go b/main.go index ce11492bec2..9697e46b2ad 100644 --- a/main.go +++ b/main.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/oauth2/equalKeys.go b/oauth2/equalKeys.go index c5357aff32e..e16568e078a 100644 --- a/oauth2/equalKeys.go +++ b/oauth2/equalKeys.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package oauth2 diff --git a/oauth2/equalKeys_test.go b/oauth2/equalKeys_test.go index 25304a4b5c7..13243a94bf3 100644 --- a/oauth2/equalKeys_test.go +++ b/oauth2/equalKeys_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package oauth2 diff --git a/oauth2/fosite_store_helpers.go b/oauth2/fosite_store_helpers.go index a14b96723ac..d17f5fa25ea 100644 --- a/oauth2/fosite_store_helpers.go +++ b/oauth2/fosite_store_helpers.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package oauth2 diff --git a/oauth2/fosite_store_test.go b/oauth2/fosite_store_test.go index 45c550c7b9a..c8fb8d52618 100644 --- a/oauth2/fosite_store_test.go +++ b/oauth2/fosite_store_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package oauth2_test diff --git a/oauth2/handler.go b/oauth2/handler.go index e26b758e792..c65fc8e74da 100644 --- a/oauth2/handler.go +++ b/oauth2/handler.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package oauth2 diff --git a/oauth2/handler_fallback_endpoints.go b/oauth2/handler_fallback_endpoints.go index abac29164ff..5f2830b1790 100644 --- a/oauth2/handler_fallback_endpoints.go +++ b/oauth2/handler_fallback_endpoints.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package oauth2 diff --git a/oauth2/handler_fallback_endpoints_test.go b/oauth2/handler_fallback_endpoints_test.go index de57f53a027..b72f1452ab6 100644 --- a/oauth2/handler_fallback_endpoints_test.go +++ b/oauth2/handler_fallback_endpoints_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package oauth2_test diff --git a/oauth2/handler_test.go b/oauth2/handler_test.go index 4524945fffe..ef76c861897 100644 --- a/oauth2/handler_test.go +++ b/oauth2/handler_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package oauth2_test diff --git a/oauth2/helper_test.go b/oauth2/helper_test.go index e923cad3577..74c25bdcfb0 100644 --- a/oauth2/helper_test.go +++ b/oauth2/helper_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package oauth2_test import ( diff --git a/oauth2/hook.go b/oauth2/hook.go index 721e50f3f8e..10985466d98 100644 --- a/oauth2/hook.go +++ b/oauth2/hook.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package oauth2 import ( diff --git a/oauth2/introspector.go b/oauth2/introspector.go index 1788e4c0149..11da6b75ef9 100644 --- a/oauth2/introspector.go +++ b/oauth2/introspector.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package oauth2 diff --git a/oauth2/introspector_test.go b/oauth2/introspector_test.go index 1200a5a785c..94899a4acba 100644 --- a/oauth2/introspector_test.go +++ b/oauth2/introspector_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package oauth2_test diff --git a/oauth2/oauth2_auth_code_test.go b/oauth2/oauth2_auth_code_test.go index 93ac2b81034..d570eead995 100644 --- a/oauth2/oauth2_auth_code_test.go +++ b/oauth2/oauth2_auth_code_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package oauth2_test diff --git a/oauth2/oauth2_client_credentials_test.go b/oauth2/oauth2_client_credentials_test.go index 4974f3b58c6..cb1ad8d6ec2 100644 --- a/oauth2/oauth2_client_credentials_test.go +++ b/oauth2/oauth2_client_credentials_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package oauth2_test diff --git a/oauth2/oauth2_helper_test.go b/oauth2/oauth2_helper_test.go index f12555868ba..a1d4f5ad9bb 100644 --- a/oauth2/oauth2_helper_test.go +++ b/oauth2/oauth2_helper_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package oauth2_test diff --git a/oauth2/oauth2_jwt_bearer_test.go b/oauth2/oauth2_jwt_bearer_test.go index c4b097d5d87..755dc883a36 100644 --- a/oauth2/oauth2_jwt_bearer_test.go +++ b/oauth2/oauth2_jwt_bearer_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package oauth2_test diff --git a/oauth2/oauth2_provider_mock_test.go b/oauth2/oauth2_provider_mock_test.go index 2173a11e3b6..83d584eb12f 100644 --- a/oauth2/oauth2_provider_mock_test.go +++ b/oauth2/oauth2_provider_mock_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite (interfaces: OAuth2Provider) diff --git a/oauth2/oauth2_refresh_token_test.go b/oauth2/oauth2_refresh_token_test.go index 3ad95667e21..1d40e0af4d1 100644 --- a/oauth2/oauth2_refresh_token_test.go +++ b/oauth2/oauth2_refresh_token_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package oauth2_test import ( diff --git a/oauth2/registry.go b/oauth2/registry.go index f94de17f935..53a9e84cf80 100644 --- a/oauth2/registry.go +++ b/oauth2/registry.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package oauth2 import ( diff --git a/oauth2/revocator_test.go b/oauth2/revocator_test.go index 3596eb9e784..a5607abca14 100644 --- a/oauth2/revocator_test.go +++ b/oauth2/revocator_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package oauth2_test diff --git a/oauth2/session.go b/oauth2/session.go index adb71209a2a..e543a1e123f 100644 --- a/oauth2/session.go +++ b/oauth2/session.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package oauth2 diff --git a/oauth2/session_custom_claims_test.go b/oauth2/session_custom_claims_test.go index b776d5c4846..c9b72af534d 100644 --- a/oauth2/session_custom_claims_test.go +++ b/oauth2/session_custom_claims_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package oauth2_test import ( diff --git a/oauth2/session_test.go b/oauth2/session_test.go index 18177de2614..146f018db7b 100644 --- a/oauth2/session_test.go +++ b/oauth2/session_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package oauth2 import ( diff --git a/oauth2/trust/doc.go b/oauth2/trust/doc.go index cb1f000fd19..c30e9521ac0 100644 --- a/oauth2/trust/doc.go +++ b/oauth2/trust/doc.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 // Package trust implements jwt-bearer grant management capabilities // diff --git a/oauth2/trust/error.go b/oauth2/trust/error.go index 5a2f5f9f2fb..eee9d0e5fb1 100644 --- a/oauth2/trust/error.go +++ b/oauth2/trust/error.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package trust import ( diff --git a/oauth2/trust/grant.go b/oauth2/trust/grant.go index 1205ee65592..9d5986415ab 100644 --- a/oauth2/trust/grant.go +++ b/oauth2/trust/grant.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package trust import ( diff --git a/oauth2/trust/handler.go b/oauth2/trust/handler.go index 16d702b86f0..7b236eaef13 100644 --- a/oauth2/trust/handler.go +++ b/oauth2/trust/handler.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package trust import ( diff --git a/oauth2/trust/handler_test.go b/oauth2/trust/handler_test.go index 922bd441856..0ce09aca86a 100644 --- a/oauth2/trust/handler_test.go +++ b/oauth2/trust/handler_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package trust_test import ( diff --git a/oauth2/trust/manager.go b/oauth2/trust/manager.go index 65b6f05b120..3e822b60d3c 100644 --- a/oauth2/trust/manager.go +++ b/oauth2/trust/manager.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package trust import ( diff --git a/oauth2/trust/manager_test_helpers.go b/oauth2/trust/manager_test_helpers.go index 8e1c98c5307..e51407b905b 100644 --- a/oauth2/trust/manager_test_helpers.go +++ b/oauth2/trust/manager_test_helpers.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package trust diff --git a/oauth2/trust/registry.go b/oauth2/trust/registry.go index de7f17238d1..6184f8e9072 100644 --- a/oauth2/trust/registry.go +++ b/oauth2/trust/registry.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package trust import ( diff --git a/oauth2/trust/request.go b/oauth2/trust/request.go index d9920eafcb3..3ba7be2655b 100644 --- a/oauth2/trust/request.go +++ b/oauth2/trust/request.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package trust import ( diff --git a/oauth2/trust/validator.go b/oauth2/trust/validator.go index dddc3684068..ad113a4df84 100644 --- a/oauth2/trust/validator.go +++ b/oauth2/trust/validator.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package trust import ( diff --git a/oauth2/trust/validator_test.go b/oauth2/trust/validator_test.go index cea0a04bfb3..1d07b5def05 100644 --- a/oauth2/trust/validator_test.go +++ b/oauth2/trust/validator_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package trust import ( diff --git a/persistence/definitions.go b/persistence/definitions.go index 3324a12e4ce..88e6c444662 100644 --- a/persistence/definitions.go +++ b/persistence/definitions.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package persistence import ( diff --git a/persistence/sql/migratest/assertion_helpers.go b/persistence/sql/migratest/assertion_helpers.go index e7849c19efb..faa32ff9b9f 100644 --- a/persistence/sql/migratest/assertion_helpers.go +++ b/persistence/sql/migratest/assertion_helpers.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package migratest import ( diff --git a/persistence/sql/migratest/migration_test.go b/persistence/sql/migratest/migration_test.go index 32d71783fa7..6ca2cf1d543 100644 --- a/persistence/sql/migratest/migration_test.go +++ b/persistence/sql/migratest/migration_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package migratest import ( diff --git a/persistence/sql/persister.go b/persistence/sql/persister.go index e4e4e5cfac9..2f1b2adf3be 100644 --- a/persistence/sql/persister.go +++ b/persistence/sql/persister.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package sql import ( diff --git a/persistence/sql/persister_client.go b/persistence/sql/persister_client.go index 7a7fc473957..9f82843dc53 100644 --- a/persistence/sql/persister_client.go +++ b/persistence/sql/persister_client.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package sql import ( diff --git a/persistence/sql/persister_consent.go b/persistence/sql/persister_consent.go index 75f33985827..6372a99f5e1 100644 --- a/persistence/sql/persister_consent.go +++ b/persistence/sql/persister_consent.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package sql import ( diff --git a/persistence/sql/persister_grant_jwk.go b/persistence/sql/persister_grant_jwk.go index 89c888cbcfd..3c1c668cfb7 100644 --- a/persistence/sql/persister_grant_jwk.go +++ b/persistence/sql/persister_grant_jwk.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package sql import ( diff --git a/persistence/sql/persister_jwk.go b/persistence/sql/persister_jwk.go index 1e714f34525..ad4e8dc3bde 100644 --- a/persistence/sql/persister_jwk.go +++ b/persistence/sql/persister_jwk.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package sql import ( diff --git a/persistence/sql/persister_migration.go b/persistence/sql/persister_migration.go index f36c58652ec..f82605c90b4 100644 --- a/persistence/sql/persister_migration.go +++ b/persistence/sql/persister_migration.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package sql import ( diff --git a/persistence/sql/persister_nid_test.go b/persistence/sql/persister_nid_test.go index 44a73c6a077..ae4410a4af4 100644 --- a/persistence/sql/persister_nid_test.go +++ b/persistence/sql/persister_nid_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package sql_test import ( diff --git a/persistence/sql/persister_oauth2.go b/persistence/sql/persister_oauth2.go index f807d7bab51..5d3acc585af 100644 --- a/persistence/sql/persister_oauth2.go +++ b/persistence/sql/persister_oauth2.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package sql import ( diff --git a/persistence/sql/persister_test.go b/persistence/sql/persister_test.go index 6322ddef51b..f870e4a81dc 100644 --- a/persistence/sql/persister_test.go +++ b/persistence/sql/persister_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package sql_test import ( diff --git a/spec/api.go b/spec/api.go index 27b9cb38581..d1bbbdad671 100644 --- a/spec/api.go +++ b/spec/api.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package spec import _ "embed" diff --git a/spec/config.go b/spec/config.go index 73255f29407..36fda6188dd 100644 --- a/spec/config.go +++ b/spec/config.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package spec import ( diff --git a/spec/schemas_test.go b/spec/schemas_test.go index b7f6e2e6c14..d9499e3c9c5 100644 --- a/spec/schemas_test.go +++ b/spec/schemas_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package spec import ( diff --git a/test/conformance/run_test.go b/test/conformance/run_test.go index 863f55eb6db..cb06cf460c5 100644 --- a/test/conformance/run_test.go +++ b/test/conformance/run_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + //go:build conformity // +build conformity diff --git a/test/e2e/oauth2-client/src/index.js b/test/e2e/oauth2-client/src/index.js index e1e6ba3f19e..b27512bedeb 100644 --- a/test/e2e/oauth2-client/src/index.js +++ b/test/e2e/oauth2-client/src/index.js @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + const express = require("express") const session = require("express-session") const uuid = require("node-uuid") diff --git a/test/mock-cb/main.go b/test/mock-cb/main.go index 75c67c1d717..9fd341d03ef 100644 --- a/test/mock-cb/main.go +++ b/test/mock-cb/main.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/test/mock-client/main.go b/test/mock-client/main.go index a0d860a823d..264b165f3fd 100644 --- a/test/mock-client/main.go +++ b/test/mock-client/main.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/test/mock-lcp/main.go b/test/mock-lcp/main.go index 21347f28c13..66a6d055c65 100644 --- a/test/mock-lcp/main.go +++ b/test/mock-lcp/main.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/x/audit.go b/x/audit.go index 78683bad1ad..edfb50210b6 100644 --- a/x/audit.go +++ b/x/audit.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x import ( diff --git a/x/audit_test.go b/x/audit_test.go index 252abe56996..6eecc8dcbf7 100644 --- a/x/audit_test.go +++ b/x/audit_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x import ( diff --git a/x/authenticator.go b/x/authenticator.go index 62e441c232d..193cc0d922e 100644 --- a/x/authenticator.go +++ b/x/authenticator.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x import ( diff --git a/x/basic_auth.go b/x/basic_auth.go index bf97a77fd5d..92a46e87ca4 100644 --- a/x/basic_auth.go +++ b/x/basic_auth.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package x diff --git a/x/clean_sql.go b/x/clean_sql.go index 39a2d06a60d..59628fb3f97 100644 --- a/x/clean_sql.go +++ b/x/clean_sql.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x import ( diff --git a/x/config.go b/x/config.go index 4dbdc21dbe4..a6943e52263 100644 --- a/x/config.go +++ b/x/config.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + //go:generate ../.bin/mockgen -package mock -destination ../internal/mock/config_cookie.go . CookieConfigProvider package x diff --git a/x/const.go b/x/const.go index 4256939a8cd..30858fb9108 100644 --- a/x/const.go +++ b/x/const.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x const ( diff --git a/x/doc.go b/x/doc.go index 88312e68ee7..2ade0fc5fb2 100644 --- a/x/doc.go +++ b/x/doc.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 // ORY Hydra // diff --git a/x/doc_swagger.go b/x/doc_swagger.go index f7324e0054e..af7944ca09d 100644 --- a/x/doc_swagger.go +++ b/x/doc_swagger.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package x diff --git a/x/error_enhancer.go b/x/error_enhancer.go index a1d81c364f4..b5b6d7dd1ec 100644 --- a/x/error_enhancer.go +++ b/x/error_enhancer.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x import ( diff --git a/x/error_enhancer_test.go b/x/error_enhancer_test.go index 01ec719c7b6..a86a0281603 100644 --- a/x/error_enhancer_test.go +++ b/x/error_enhancer_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package x diff --git a/x/errors.go b/x/errors.go index 237bbe4999a..229884a5d51 100644 --- a/x/errors.go +++ b/x/errors.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package x diff --git a/x/errors_test.go b/x/errors_test.go index 6437295e44a..71de4e8d3fe 100644 --- a/x/errors_test.go +++ b/x/errors_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package x diff --git a/x/fosite_storer.go b/x/fosite_storer.go index 4ca3677b1cf..1afec037710 100644 --- a/x/fosite_storer.go +++ b/x/fosite_storer.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package x diff --git a/x/hasher.go b/x/hasher.go index 639516c976e..1e7bd37a6b0 100644 --- a/x/hasher.go +++ b/x/hasher.go @@ -1,23 +1,6 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - * - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x import ( diff --git a/x/hasher_test.go b/x/hasher_test.go index c57a1a52aff..a91b9daa2a3 100644 --- a/x/hasher_test.go +++ b/x/hasher_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x import ( diff --git a/x/jwt.go b/x/jwt.go index fe3fefdf588..0204c2250bc 100644 --- a/x/jwt.go +++ b/x/jwt.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x import ( diff --git a/x/oauth2cors/cors.go b/x/oauth2cors/cors.go index ab41270a6a0..2069c2b8cd0 100644 --- a/x/oauth2cors/cors.go +++ b/x/oauth2cors/cors.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package oauth2cors diff --git a/x/oauth2cors/cors_test.go b/x/oauth2cors/cors_test.go index ac4c1469707..d083dc5f6bd 100644 --- a/x/oauth2cors/cors_test.go +++ b/x/oauth2cors/cors_test.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @Copyright 2017-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package oauth2cors_test diff --git a/x/pagination.go b/x/pagination.go index e74dfec532d..37717bf4db1 100644 --- a/x/pagination.go +++ b/x/pagination.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x import ( diff --git a/x/pointer.go b/x/pointer.go index a30bfd953af..b415ad115da 100644 --- a/x/pointer.go +++ b/x/pointer.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x // ToPointer returns the pointer to the value. diff --git a/x/redirect_uri.go b/x/redirect_uri.go index ecb8d126f1c..d4c01a3e6a2 100644 --- a/x/redirect_uri.go +++ b/x/redirect_uri.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x import ( diff --git a/x/redirect_uri_test.go b/x/redirect_uri_test.go index 32133093b74..19f18d17b8e 100644 --- a/x/redirect_uri_test.go +++ b/x/redirect_uri_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x import ( diff --git a/x/registry.go b/x/registry.go index 54e47beb143..84317cfad45 100644 --- a/x/registry.go +++ b/x/registry.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x import ( diff --git a/x/router.go b/x/router.go index e60c5f948be..aefe82a6a6c 100644 --- a/x/router.go +++ b/x/router.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x import ( diff --git a/x/secret.go b/x/secret.go index fcc4ab6c211..9d207f9d564 100644 --- a/x/secret.go +++ b/x/secret.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package x diff --git a/x/sqlx.go b/x/sqlx.go index 5b2665fe958..7ca0e5a727d 100644 --- a/x/sqlx.go +++ b/x/sqlx.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x import ( diff --git a/x/swagger.go b/x/swagger.go index 6b86fc77c27..259bc41f7a0 100644 --- a/x/swagger.go +++ b/x/swagger.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x // swagger:model jsonWebKey diff --git a/x/test_helpers.go b/x/test_helpers.go index 5089305b3ef..65312cd5da3 100644 --- a/x/test_helpers.go +++ b/x/test_helpers.go @@ -1,22 +1,5 @@ -/* - * Copyright © 2015-2018 Aeneas Rekkas - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @author Aeneas Rekkas - * @copyright 2015-2018 Aeneas Rekkas - * @license Apache-2.0 - */ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 package x diff --git a/x/tls_termination.go b/x/tls_termination.go index c9ba18b8281..6d93494b9ba 100644 --- a/x/tls_termination.go +++ b/x/tls_termination.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x import ( diff --git a/x/tls_termination_test.go b/x/tls_termination_test.go index f59d17fabcd..92f2fd6f27b 100644 --- a/x/tls_termination_test.go +++ b/x/tls_termination_test.go @@ -1,3 +1,6 @@ +// Copyright © 2022 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + package x_test import (