Skip to content

GitLab

Commit c6fc6833 authored by Anuj Gupta's avatar Anuj Gupta
Browse files

Merge branch 'og-master-role-fix' into 'master' 

Latest IBM Code with health check

See merge request !10
parents 69fe7765 fc8507cc
Pipeline #24775 passed with stages
in 11 minutes and 43 seconds
Hide whitespace changes
Inline Side-by-side
README.md
View file @ c6fc6833
......@@ -17,4 +17,6 @@ TODO: Explain how other users and developers can contribute to make your code be
If you want to learn more about creating good readme files then refer the following [guidelines](https://docs.microsoft.com/en-us/azure/devops/repos/git/create-a-readme?view=azure-devops). You can also seek inspiration from the below readme files:
- [ASP.NET Core](https://github.com/aspnet/Home)
- [Visual Studio Code](https://github.com/Microsoft/vscode)
- [Chakra Core](https://github.com/Microsoft/ChakraCore)
\ No newline at end of file
- [Chakra Core](https://github.com/Microsoft/ChakraCore)
# github migration update
src/main/java/org/opengroup/osdu/core/common/model/entitlements/CreateGroup.java
View file @ c6fc6833
/**
* Copyright 2020 IBM Corp. All Rights Reserved.
*
* 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.
*
* begin_generated_IBM_copyright_prolog
*
* *******************************************
* IBM Confidential.
* OCO Source Materials
* 5900-AEB
* © Copyright IBM Corp. 2020
* The source code for this program is not published or otherwise divested of its trade secrets, irrespective of what has
* been deposited with the U.S. Copyright Office.
*
* end_generated_IBM_copyright_prolog
*/
/* Licensed Materials - Property of IBM */
/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
package org.opengroup.osdu.core.common.model.entitlements;
......
src/main/java/org/opengroup/osdu/core/common/model/entitlements/GetMembers.java
View file @ c6fc6833
/**
* Copyright 2020 IBM Corp. All Rights Reserved.
*
* 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.
*
* begin_generated_IBM_copyright_prolog
*
* *******************************************
* IBM Confidential.
* OCO Source Materials
* 5900-AEB
* © Copyright IBM Corp. 2020
* The source code for this program is not published or otherwise divested of its trade secrets, irrespective of what has
* been deposited with the U.S. Copyright Office.
*
* end_generated_IBM_copyright_prolog
*/
/* Licensed Materials - Property of IBM */
/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
package org.opengroup.osdu.core.common.model.entitlements;
......
src/main/java/org/opengroup/osdu/core/common/model/entitlements/GroupInfo.java
View file @ c6fc6833
/**
* Copyright 2020 IBM Corp. All Rights Reserved.
*
* 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.
*
* begin_generated_IBM_copyright_prolog
*
* *******************************************
* IBM Confidential.
* OCO Source Materials
* 5900-AEB
* © Copyright IBM Corp. 2020
* The source code for this program is not published or otherwise divested of its trade secrets, irrespective of what has
* been deposited with the U.S. Copyright Office.
*
* end_generated_IBM_copyright_prolog
*/
/* Licensed Materials - Property of IBM */
/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
package org.opengroup.osdu.core.common.model.entitlements;
......
src/main/java/org/opengroup/osdu/core/common/model/entitlements/MemberInfo.java
View file @ c6fc6833
/**
* Copyright 2020 IBM Corp. All Rights Reserved.
*
* 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.
*
* begin_generated_IBM_copyright_prolog
*
* *******************************************
* IBM Confidential.
* OCO Source Materials
* 5900-AEB
* © Copyright IBM Corp. 2020
* The source code for this program is not published or otherwise divested of its trade secrets, irrespective of what has
* been deposited with the U.S. Copyright Office.
*
* end_generated_IBM_copyright_prolog
*/
/* Licensed Materials - Property of IBM */
/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
package org.opengroup.osdu.core.common.model.entitlements;
......@@ -40,7 +15,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
public class MemberInfo {
String email;
//String role;
String role;
/*public static MemberInfo Owner(String email) {
return MemberInfo.builder().email(email).role(Roles.OWNER).build();
......
src/main/java/org/opengroup/osdu/ibm/entitlements/EntitlementFactory.java
View file @ c6fc6833
/**
* Copyright 2020 IBM Corp. All Rights Reserved.
*
* 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.
*
* begin_generated_IBM_copyright_prolog
*
* *******************************************
* IBM Confidential.
* OCO Source Materials
* 5900-AEB
* © Copyright IBM Corp. 2020
* The source code for this program is not published or otherwise divested of its trade secrets, irrespective of what has
* been deposited with the U.S. Copyright Office.
*
* end_generated_IBM_copyright_prolog
*/
/* Licensed Materials - Property of IBM */
/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
package org.opengroup.osdu.ibm.entitlements;
......
src/main/java/org/opengroup/osdu/ibm/entitlements/EntitlementsApplication.java
View file @ c6fc6833
/**
* Copyright 2020 IBM Corp. All Rights Reserved.
*
* 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.
*
* begin_generated_IBM_copyright_prolog
*
* *******************************************
* IBM Confidential.
* OCO Source Materials
* 5900-AEB
* © Copyright IBM Corp. 2020
* The source code for this program is not published or otherwise divested of its trade secrets, irrespective of what has
* been deposited with the U.S. Copyright Office.
*
* end_generated_IBM_copyright_prolog
*/
/* Licensed Materials - Property of IBM */
/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
package org.opengroup.osdu.ibm.entitlements;
......
src/main/java/org/opengroup/osdu/ibm/entitlements/GlobalExceptionMapper.java
View file @ c6fc6833
/**
* Copyright 2020 IBM Corp. All Rights Reserved.
*
* 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.
*
* begin_generated_IBM_copyright_prolog
*
* *******************************************
* IBM Confidential.
* OCO Source Materials
* 5900-AEB
* © Copyright IBM Corp. 2020
* The source code for this program is not published or otherwise divested of its trade secrets, irrespective of what has
* been deposited with the U.S. Copyright Office.
*
* end_generated_IBM_copyright_prolog
*/
/* Licensed Materials - Property of IBM */
/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
package org.opengroup.osdu.ibm.entitlements;
......
src/main/java/org/opengroup/osdu/ibm/entitlements/api/EntitlementsApi.java
View file @ c6fc6833
/**
* Copyright 2020 IBM Corp. All Rights Reserved.
*
* 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.
*
* begin_generated_IBM_copyright_prolog
*
* *******************************************
* IBM Confidential.
* OCO Source Materials
* 5900-AEB
* © Copyright IBM Corp. 2020
* The source code for this program is not published or otherwise divested of its trade secrets, irrespective of what has
* been deposited with the U.S. Copyright Office.
*
* end_generated_IBM_copyright_prolog
*/
/* Licensed Materials - Property of IBM */
/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
package org.opengroup.osdu.ibm.entitlements.api;
......@@ -107,6 +82,14 @@ public class EntitlementsApi {
@PathVariable("groupEmail") GroupEmail groupEmail,
@RequestBody MemberInfo memberInfo) {
tenantInfo.getName();
if(memberInfo.getRole().trim().isEmpty()) {
throw new AppException(HttpStatus.BAD_REQUEST.value(), "Role cannot be empty", "Role cannot be empty");
}
if(!(memberInfo.getRole().equalsIgnoreCase("MEMBER") || memberInfo.getRole().equalsIgnoreCase("OWNER"))) {
throw new AppException(HttpStatus.BAD_REQUEST.value(), "Role need to be either MEMBER or OWNER", "Role need to be either MEMBER or OWNER");
}
try {
return new ResponseEntity<MemberInfo>(entitlementsIBM.addMember(groupEmail, memberInfo), HttpStatus.OK);
} catch (AppException e) {
......
src/main/java/org/opengroup/osdu/ibm/entitlements/api/HealthCheckApi.java
View file @ c6fc6833
/**
* Copyright 2020 IBM Corp. All Rights Reserved.
*
* 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.
*
* begin_generated_IBM_copyright_prolog
*
* *******************************************
* IBM Confidential.
* OCO Source Materials
* 5900-AEB
* © Copyright IBM Corp. 2020
* The source code for this program is not published or otherwise divested of its trade secrets, irrespective of what has
* been deposited with the U.S. Copyright Office.
*
* end_generated_IBM_copyright_prolog
*/
/* Licensed Materials - Property of IBM */
/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
package org.opengroup.osdu.ibm.entitlements.api;
......
src/main/java/org/opengroup/osdu/ibm/entitlements/api/WhoamiController.java
View file @ c6fc6833
/**
* Copyright 2020 IBM Corp. All Rights Reserved.
*
* 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.
*
* begin_generated_IBM_copyright_prolog
*
* *******************************************
* IBM Confidential.
* OCO Source Materials
* 5900-AEB
* © Copyright IBM Corp. 2020
* The source code for this program is not published or otherwise divested of its trade secrets, irrespective of what has
* been deposited with the U.S. Copyright Office.
*
* end_generated_IBM_copyright_prolog
*/
/* Licensed Materials - Property of IBM */
/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
package org.opengroup.osdu.ibm.entitlements.api;
......
src/main/java/org/opengroup/osdu/ibm/entitlements/di/TenantInfoProvider.java
View file @ c6fc6833
/**
* Copyright 2020 IBM Corp. All Rights Reserved.
*
* 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.
*
* begin_generated_IBM_copyright_prolog
*
* *******************************************
* IBM Confidential.
* OCO Source Materials
* 5900-AEB
* © Copyright IBM Corp. 2020
* The source code for this program is not published or otherwise divested of its trade secrets, irrespective of what has
* been deposited with the U.S. Copyright Office.
*
* end_generated_IBM_copyright_prolog
*/
/* Licensed Materials - Property of IBM */
/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
package org.opengroup.osdu.ibm.entitlements.di;
......
src/main/java/org/opengroup/osdu/ibm/entitlements/model/EntitlementsRole.java
View file @ c6fc6833
/**
* Copyright 2020 IBM Corp. All Rights Reserved.
*
* 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.
*
* begin_generated_IBM_copyright_prolog
*
* *******************************************
* IBM Confidential.
* OCO Source Materials
* 5900-AEB
* © Copyright IBM Corp. 2020
* The source code for this program is not published or otherwise divested of its trade secrets, irrespective of what has
* been deposited with the U.S. Copyright Office.
*
* end_generated_IBM_copyright_prolog
*/
/* Licensed Materials - Property of IBM */
/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
package org.opengroup.osdu.ibm.entitlements.model;
......
src/main/java/org/opengroup/osdu/ibm/entitlements/security/AppKeyValidator.java
View file @ c6fc6833
/**
* Copyright 2020 IBM Corp. All Rights Reserved.
*
* 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.
*
* begin_generated_IBM_copyright_prolog
*
* *******************************************
* IBM Confidential.
* OCO Source Materials
* 5900-AEB
* © Copyright IBM Corp. 2020
* The source code for this program is not published or otherwise divested of its trade secrets, irrespective of what has
* been deposited with the U.S. Copyright Office.
*
* end_generated_IBM_copyright_prolog
*/
/* Licensed Materials - Property of IBM */
/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
package org.opengroup.osdu.ibm.entitlements.security;
......
src/main/java/org/opengroup/osdu/ibm/entitlements/security/EntitlementsAuthenticationProvider.java
View file @ c6fc6833
/**
* Copyright 2020 IBM Corp. All Rights Reserved.
*
* 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.
*
* begin_generated_IBM_copyright_prolog
*
* *******************************************
* IBM Confidential.
* OCO Source Materials
* 5900-AEB
* © Copyright IBM Corp. 2020
* The source code for this program is not published or otherwise divested of its trade secrets, irrespective of what has
* been deposited with the U.S. Copyright Office.
*
* end_generated_IBM_copyright_prolog
*/
/* Licensed Materials - Property of IBM */
/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
package org.opengroup.osdu.ibm.entitlements.security;
......
src/main/java/org/opengroup/osdu/ibm/entitlements/security/SecurityConfig.java
View file @ c6fc6833
/**
* Copyright 2020 IBM Corp. All Rights Reserved.
*
* 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.
*
* begin_generated_IBM_copyright_prolog
*
* *******************************************
* IBM Confidential.
* OCO Source Materials
* 5900-AEB
* © Copyright IBM Corp. 2020
* The source code for this program is not published or otherwise divested of its trade secrets, irrespective of what has
* been deposited with the U.S. Copyright Office.
*
* end_generated_IBM_copyright_prolog
*/
/* Licensed Materials - Property of IBM */
/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
package org.opengroup.osdu.ibm.entitlements.security;
......
src/main/java/org/opengroup/osdu/ibm/entitlements/security/ValidAppKey.java
View file @ c6fc6833
/**
* Copyright 2020 IBM Corp. All Rights Reserved.
*
* 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.
*
* begin_generated_IBM_copyright_prolog
*
* *******************************************
* IBM Confidential.
* OCO Source Materials
* 5900-AEB
* © Copyright IBM Corp. 2020
* The source code for this program is not published or otherwise divested of its trade secrets, irrespective of what has
* been deposited with the U.S. Copyright Office.
*
* end_generated_IBM_copyright_prolog
*/
/* Licensed Materials - Property of IBM */
/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
package org.opengroup.osdu.ibm.entitlements.security;
......
src/main/java/org/opengroup/osdu/ibm/entitlements/service/EntitlementsIBM.java
View file @ c6fc6833
/**
* Copyright 2020 IBM Corp. All Rights Reserved.
*
* 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